Support SQL99 embedded double-quote syntax for quoted identifiers.

Thomas G. Lockhart · Thomas G. Lockhart · commit df4023463990 · 2000-08-06T17:50:48.000Z
Allow this in the parser and in pg_dump, but it is probably not enough
 for a complete solution.
Better to have the feature started then never here.
diff --git a/src/backend/parser/scan.l b/src/backend/parser/scan.l
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/scan.l,v 1.73 2000/07/14 15:43:32 thomas Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/scan.l,v 1.74 2000/08/06 17:50:38 thomas Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -136,6 +136,7 @@ xqcat			{quote}{whitespace_with_newline}{quote}
 dquote			\"
 xdstart			{dquote}
 xdstop			{dquote}
+xddouble		{dquote}{dquote}
 xdinside		[^"]+
 
 /* C-style comments
@@ -351,6 +352,9 @@ other			.
 					yylval.str = pstrdup(literalbuf);
 					return IDENT;
 				}
+<xd>{xddouble} {
+					addlit(yytext, yyleng-1);
+				}
 <xd>{xdinside}	{
 					addlit(yytext, yyleng);
 				}
diff --git a/src/bin/pg_dump/common.c b/src/bin/pg_dump/common.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/bin/pg_dump/common.c,v 1.44 2000/07/04 14:25:27 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/bin/pg_dump/common.c,v 1.45 2000/08/06 17:50:48 thomas Exp $
  *
  * Modifications - 6/12/96 - dave@bensoft.com - version 1.13.dhb.2
  *
@@ -517,8 +517,10 @@ fmtId(const char *rawid, bool force_quotes)
 
 	if (!force_quotes)
 	{
+		/* do a quick check on the first character... */
 		if (!islower((int) *rawid))
 			force_quotes = true;
+		/* otherwise check the entire string */
 		else
 			for (cp = rawid; *cp; cp++)
 			{
@@ -541,8 +543,15 @@ fmtId(const char *rawid, bool force_quotes)
 	appendPQExpBufferChar(id_return, '\"');
 	for (cp = rawid; *cp; cp++)
 	{
+		/* Did we find a double-quote in the string?
+		 * Then make this a double double-quote per SQL99.
+		 * Before, we put in a backslash/double-quote pair.
+		 * - thomas 2000-08-05 */
 		if (*cp == '\"')
-			appendPQExpBufferChar(id_return, '\\');
+		{
+			appendPQExpBufferChar(id_return, '\"');
+			appendPQExpBufferChar(id_return, '\"');
+		}
 		appendPQExpBufferChar(id_return, *cp);
 	}
 	appendPQExpBufferChar(id_return, '\"');

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`*`
`10`	`10`	`*`
`11`	`11`	`* IDENTIFICATION`
`12`		`- * $Header: /cvsroot/pgsql/src/backend/parser/scan.l,v 1.73 2000/07/14 15:43:32 thomas Exp $`
	`12`	`+ * $Header: /cvsroot/pgsql/src/backend/parser/scan.l,v 1.74 2000/08/06 17:50:38 thomas Exp $`
`13`	`13`	`*`
`14`	`14`	`*-------------------------------------------------------------------------`
`15`	`15`	`*/`
`@@ -136,6 +136,7 @@ xqcat {quote}{whitespace_with_newline}{quote}`
`136`	`136`	`dquote \"`
`137`	`137`	`xdstart {dquote}`
`138`	`138`	`xdstop {dquote}`
	`139`	`+xddouble {dquote}{dquote}`
`139`	`140`	`xdinside [^"]+`
`140`	`141`
`141`	`142`	`/* C-style comments`
`@@ -351,6 +352,9 @@ other .`
`351`	`352`	`yylval.str = pstrdup(literalbuf);`
`352`	`353`	`return IDENT;`
`353`	`354`	`}`
	`355`	`+<xd>{xddouble} {`
	`356`	`+ addlit(yytext, yyleng-1);`
	`357`	`+ }`
`354`	`358`	`<xd>{xdinside} {`
`355`	`359`	`addlit(yytext, yyleng);`
`356`	`360`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/bin/pg_dump/common.c,v 1.44 2000/07/04 14:25:27 momjian Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/bin/pg_dump/common.c,v 1.45 2000/08/06 17:50:48 thomas Exp $`
`12`	`12`	`*`
`13`	`13`	`* Modifications - 6/12/96 - dave@bensoft.com - version 1.13.dhb.2`
`14`	`14`	`*`
`@@ -517,8 +517,10 @@ fmtId(const char *rawid, bool force_quotes)`
`517`	`517`
`518`	`518`	`if (!force_quotes)`
`519`	`519`	`{`
	`520`	`+ /* do a quick check on the first character... */`
`520`	`521`	`if (!islower((int) *rawid))`
`521`	`522`	`force_quotes = true;`
	`523`	`+ /* otherwise check the entire string */`
`522`	`524`	`else`
`523`	`525`	`for (cp = rawid; *cp; cp++)`
`524`	`526`	`{`
`@@ -541,8 +543,15 @@ fmtId(const char *rawid, bool force_quotes)`
`541`	`543`	`appendPQExpBufferChar(id_return, '\"');`
`542`	`544`	`for (cp = rawid; *cp; cp++)`
`543`	`545`	`{`
	`546`	`+ /* Did we find a double-quote in the string?`
	`547`	`+ * Then make this a double double-quote per SQL99.`
	`548`	`+ * Before, we put in a backslash/double-quote pair.`
	`549`	`+ * - thomas 2000-08-05 */`
`544`	`550`	`if (*cp == '\"')`
`545`		`- appendPQExpBufferChar(id_return, '\\');`
	`551`	`+ {`
	`552`	`+ appendPQExpBufferChar(id_return, '\"');`
	`553`	`+ appendPQExpBufferChar(id_return, '\"');`
	`554`	`+ }`
`546`	`555`	`appendPQExpBufferChar(id_return, *cp);`
`547`	`556`	`}`
`548`	`557`	`appendPQExpBufferChar(id_return, '\"');`