|

scrappy · scrappy · commit bde34552a279 · 1996-08-14T16:44:51.000Z
|Here is a fix for the psql alignment problem.  It turns out that libpq
|was trying to determine if the column contained only numeric values so
|it could right justify it.  The 'e' values were taked as exponient
|values and all columns were considered numeric.
|
|The patch excludes 'e' and 'E' as being valid first-column numeric
|values.
|

Submitted by: Bruce...
diff --git a/src/interfaces/libpq/fe-exec.c b/src/interfaces/libpq/fe-exec.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.16 1996/08/14 04:56:55 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.17 1996/08/14 16:44:51 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -999,7 +999,8 @@ PQprint(FILE *fout,
 		{
 			if ((fs_len==1 && (*p==*(po->fieldSep))) || *p=='\\')
 				*(o++)='\\';
-			if (po->align && !((*p >='0' && *p<='9') || *p=='.' || *p=='E' || *p=='e' || *p==' ' || *p=='-'))
+			if (po->align && (*pval=='E' || *pval=='e' ||
+				!((*p>='0' && *p<='9') || *p=='.' || *p=='E' || *p=='e' || *p==' ' || *p=='-')))
 				fieldNotNum[j]=1;
 		}
 		*o='\0';

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.16 1996/08/14 04:56:55 scrappy Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.17 1996/08/14 16:44:51 scrappy Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -999,7 +999,8 @@ PQprint(FILE *fout,`
`999`	`999`	`{`
`1000`	`1000`	`if ((fs_len==1 && (p==(po->fieldSep))) \|\| *p=='\\')`
`1001`	`1001`	`*(o++)='\\';`
`1002`		`- if (po->align && !((p >='0' && p<='9') \|\| p=='.' \|\| p=='E' \|\| p=='e' \|\| p==' ' \|\| *p=='-'))`
	`1002`	`+ if (po->align && (pval=='E' \|\| pval=='e' \|\|`
	`1003`	`+ !((p>='0' && p<='9') \|\| p=='.' \|\| p=='E' \|\| p=='e' \|\| p==' ' \|\| *p=='-')))`
`1003`	`1004`	`fieldNotNum[j]=1;`
`1004`	`1005`	`}`
`1005`	`1006`	`*o='\0';`