Commit8d507c2

Thomas G. Lockhart

committed

Additional fixes for mixed-case table names from Billy Allie.

1 parent91a6248 commit8d507c2Copy full SHA for 8d507c2

File tree

+13

-5

lines changed

+13

-5

lines changed

Lines changed: 5 additions & 2 deletions

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/backend/catalog/heap.c,v 1.65 1998/11/12 15:39:06 thomas Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.66 1998/11/17 14:26:39 thomas Exp $`
`11`	`11`	`*`
`12`	`12`	`* INTERFACE ROUTINES`
`13`	`13`	`*heap_create()- Create an uncataloged heap relation`
`@@ -1444,7 +1444,10 @@ StoreAttrDefault(Relation rel, AttrDefault *attrdef)`
`1444`	`1444`	`externGlobalMemoryCacheCxt;`
`1445`	`1445`
`1446`	`1446`	`start:;`
`1447`		`-sprintf(str,"select %s%s from %.*s",attrdef->adsrc,cast,`
	`1447`	`+/* Surround table name with double quotes to allow mixed-case and`
	`1448`	`+ * whitespaces in names. - BGA 1998-11-14`
	`1449`	`+ */`
	`1450`	`+sprintf(str,"select %s%s from \"%.*s\"",attrdef->adsrc,cast,`
`1448`	`1451`	`NAMEDATALEN,rel->rd_rel->relname.data);`
`1449`	`1452`	`setheapoverride(true);`
`1450`	`1453`	`planTree_list= (List*)pg_parse_and_plan(str,NULL,0,&queryTree_list,None, FALSE);`

Lines changed: 8 additions & 3 deletions

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/bin/psql/Attic/psql.c,v 1.163 1998/10/26 01:04:37 tgl Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.164 1998/11/17 14:26:31 thomas Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -460,12 +460,17 @@ tableList(PsqlSettings *pset, bool deep_tablelist, char info_type,`
`460`	`460`	`perror("malloc");`
`461`	`461`
`462`	`462`	`/* load table table */`
	`463`	`+/* Put double quotes around the table name to allow for mixed-case`
	`464`	`+ * and whitespaces in the table name. - BGA 1998-11-14`
	`465`	`+ */`
`463`	`466`	`for (i=0;i<nColumns;i++)`
`464`	`467`	`{`
`465`		`-table[i]= (char)malloc(PQgetlength(res,i,1)sizeof(char)+1);`
	`468`	`+table[i]= (char)malloc(PQgetlength(res,i,1)sizeof(char)+3);`
`466`	`469`	`if (table[i]==NULL)`
`467`	`470`	`perror("malloc");`
`468`		`-strcpy(table[i],PQgetvalue(res,i,1));`
	`471`	`+strcpy(table[i],"\"");`
	`472`	`+strcat(table[i],PQgetvalue(res,i,1));`
	`473`	`+strcat(table[i],"\"");`
`469`	`474`	`}`
`470`	`475`
`471`	`476`	`PQclear(res);`

Comments

(0)