Add code to pg_dump to use E'' strings when backslashes are used in dump

bmomjian · bmomjian · commit 539bc9fc91cc · 2005-07-01T21:03:25.000Z
files.
diff --git a/src/bin/pg_dump/dumputils.c b/src/bin/pg_dump/dumputils.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/bin/pg_dump/dumputils.c,v 1.17 2005/04/30 08:08:51 neilc Exp $
+ * $PostgreSQL: pgsql/src/bin/pg_dump/dumputils.c,v 1.18 2005/07/01 21:03:25 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -111,6 +111,27 @@ fmtId(const char *rawid)
 void
 appendStringLiteral(PQExpBuffer buf, const char *str, bool escapeAll)
 {
+	bool has_escapes = false;
+	const char *str2 = str;
+
+	while (*str2)
+	{
+		char		ch = *str2++;
+
+		if (ch == '\\' ||
+		    ((unsigned char) ch < (unsigned char) ' ' &&
+			 (escapeAll ||
+			  (ch != '\t' && ch != '\n' && ch != '\v' &&
+			   ch != '\f' && ch != '\r'))))
+		{
+			has_escapes = true;
+			break;
+		}
+	}
+	
+	if (has_escapes)
+		appendPQExpBufferChar(buf, 'E');
+	
 	appendPQExpBufferChar(buf, '\'');
 	while (*str)
 	{
@@ -122,9 +143,9 @@ appendStringLiteral(PQExpBuffer buf, const char *str, bool escapeAll)
 			appendPQExpBufferChar(buf, ch);
 		}
 		else if ((unsigned char) ch < (unsigned char) ' ' &&
-				 (escapeAll
-				  || (ch != '\t' && ch != '\n' && ch != '\v' && ch != '\f' && ch != '\r')
-				  ))
+				 (escapeAll ||
+				  (ch != '\t' && ch != '\n' && ch != '\v' &&
+				   ch != '\f' && ch != '\r')))
 		{
 			/*
 			 * generate octal escape for control chars other than
diff --git a/src/bin/pg_dump/pg_backup_db.c b/src/bin/pg_dump/pg_backup_db.c
@@ -5,7 +5,7 @@
  *	Implements the basic DB functions used by the archiver.
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_db.c,v 1.62 2005/06/21 20:45:44 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_db.c,v 1.63 2005/07/01 21:03:25 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -597,7 +597,6 @@ _sendSQLLine(ArchiveHandle *AH, char *qry, char *eos)
 					}
 					else
 					{
-
 						if (qry[pos] == '\\')
 						{
 							if (AH->sqlparse.lastChar == '\\')
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
@@ -12,7 +12,7 @@
  *	by PostgreSQL
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.411 2005/06/30 03:02:56 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.412 2005/07/01 21:03:25 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -7767,8 +7767,9 @@ dumpTrigger(Archive *fout, TriggerInfo *tginfo)
 	p = tginfo->tgargs;
 	for (findx = 0; findx < tginfo->tgnargs; findx++)
 	{
-		const char *s = p;
+		const char *s = p, *s2 = p;
 
+		/* Set 'p' to end of arg string. marked by '\000' */
 		for (;;)
 		{
 			p = strchr(p, '\\');
@@ -7781,20 +7782,29 @@ dumpTrigger(Archive *fout, TriggerInfo *tginfo)
 				exit_nicely();
 			}
 			p++;
-			if (*p == '\\')
+			if (*p == '\\')		/* is it '\\'? */
 			{
 				p++;
 				continue;
 			}
-			if (p[0] == '0' && p[1] == '0' && p[2] == '0')
+			if (p[0] == '0' && p[1] == '0' && p[2] == '0')  /* is it '\000'? */
 				break;
 		}
 		p--;
+
+		/* do we need E''? */
+		while (s2 < p)
+			if (*s2++ == '\\')
+			{
+				appendPQExpBufferChar(query, 'E');
+				break;
+			}
+
 		appendPQExpBufferChar(query, '\'');
 		while (s < p)
 		{
 			if (*s == '\'')
-				appendPQExpBufferChar(query, '\\');
+				appendPQExpBufferChar(query, '\'');
 			appendPQExpBufferChar(query, *s++);
 		}
 		appendPQExpBufferChar(query, '\'');

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`* Implements the basic DB functions used by the archiver.`
`6`	`6`	`*`
`7`	`7`	`* IDENTIFICATION`
`8`		`- * $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_db.c,v 1.62 2005/06/21 20:45:44 tgl Exp $`
	`8`	`+ * $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_db.c,v 1.63 2005/07/01 21:03:25 momjian Exp $`
`9`	`9`	`*`
`10`	`10`	`*-------------------------------------------------------------------------`
`11`	`11`	`*/`
`@@ -597,7 +597,6 @@ _sendSQLLine(ArchiveHandle AH, char qry, char *eos)`
`597`	`597`	`}`
`598`	`598`	`else`
`599`	`599`	`{`
`600`		`-`
`601`	`600`	`if (qry[pos] == '\\')`
`602`	`601`	`{`
`603`	`602`	`if (AH->sqlparse.lastChar == '\\')`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`* by PostgreSQL`
`13`	`13`	`*`
`14`	`14`	`* IDENTIFICATION`
`15`		`- * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.411 2005/06/30 03:02:56 tgl Exp $`
	`15`	`+ * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.412 2005/07/01 21:03:25 momjian Exp $`
`16`	`16`	`*`
`17`	`17`	`*-------------------------------------------------------------------------`
`18`	`18`	`*/`
`@@ -7767,8 +7767,9 @@ dumpTrigger(Archive fout, TriggerInfo tginfo)`
`7767`	`7767`	`p = tginfo->tgargs;`
`7768`	`7768`	`for (findx = 0; findx < tginfo->tgnargs; findx++)`
`7769`	`7769`	`{`
`7770`		`- const char *s = p;`
	`7770`	`+ const char s = p, s2 = p;`
`7771`	`7771`
	`7772`	`+ /* Set 'p' to end of arg string. marked by '\000' */`
`7772`	`7773`	`for (;;)`
`7773`	`7774`	`{`
`7774`	`7775`	`p = strchr(p, '\\');`
`@@ -7781,20 +7782,29 @@ dumpTrigger(Archive fout, TriggerInfo tginfo)`
`7781`	`7782`	`exit_nicely();`
`7782`	`7783`	`}`
`7783`	`7784`	`p++;`
`7784`		`- if (*p == '\\')`
	`7785`	`+ if (p == '\\') / is it '\\'? */`
`7785`	`7786`	`{`
`7786`	`7787`	`p++;`
`7787`	`7788`	`continue;`
`7788`	`7789`	`}`
`7789`		`- if (p[0] == '0' && p[1] == '0' && p[2] == '0')`
	`7790`	`+ if (p[0] == '0' && p[1] == '0' && p[2] == '0') /* is it '\000'? */`
`7790`	`7791`	`break;`
`7791`	`7792`	`}`
`7792`	`7793`	`p--;`
	`7794`	`+`
	`7795`	`+ /* do we need E''? */`
	`7796`	`+ while (s2 < p)`
	`7797`	`+ if (*s2++ == '\\')`
	`7798`	`+ {`
	`7799`	`+ appendPQExpBufferChar(query, 'E');`
	`7800`	`+ break;`
	`7801`	`+ }`
	`7802`	`+`
`7793`	`7803`	`appendPQExpBufferChar(query, '\'');`
`7794`	`7804`	`while (s < p)`
`7795`	`7805`	`{`
`7796`	`7806`	`if (*s == '\'')`
`7797`		`- appendPQExpBufferChar(query, '\\');`
	`7807`	`+ appendPQExpBufferChar(query, '\'');`
`7798`	`7808`	`appendPQExpBufferChar(query, *s++);`
`7799`	`7809`	`}`
`7800`	`7810`	`appendPQExpBufferChar(query, '\'');`