git.postgresql.org Git - postgresql.git/commitdiff

diff --git a/src/interfaces/ecpg/ChangeLog b/src/interfaces/ecpg/ChangeLog

index 613a3096886d947511174925ab6bc66635025a38..2147d28efcb083e91053c2106ed8507ac6bce371 100644 (file)

--- a/src/interfaces/ecpg/ChangeLog

+++ b/src/interfaces/ecpg/ChangeLog

- Fixed bug that caused arrays of varchar to be output with incomplete

name.

+

+Thu, 20 Mar 2008 16:54:27 +0100

+

+ - Changed statement escaping to not escape continuation line markers.

+

diff --git a/src/interfaces/ecpg/preproc/output.c b/src/interfaces/ecpg/preproc/output.c

index 74da49a0d20db853df9febab02f80570786ceb89..e12308d666fa42c292bac42dbc114eee226a6a1b 100644 (file)

--- a/src/interfaces/ecpg/preproc/output.c

+++ b/src/interfaces/ecpg/preproc/output.c

-/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/output.c,v 1.23 2007年11月15日 21:14:45 momjian Exp $ */

+/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/output.c,v 1.24 2008年03月20日 15:56:59 meskes Exp $ */

#include "postgres_fe.h"

else if (str[i] == '\n')

fputs("\\\n", yyout);

else if (str[i] == '\\')

- fputs("\\\\", yyout);

+ {

+ int j = i;

+

+ /* check whether this is a continuation line

+ * if it is, do not output anything because newlines are escaped anyway */

+

+ /* accept blanks after the '\' as some other compilers do too */

+ do { j++; } while (str[j] == ' ' || str[j] == '\t');

+

+ if ((str[j] != '\n') && (str[j] != '\r' || str[j + 1] != '\n')) /* not followed by a newline */

+ fputs("\\\\", yyout);

+ }

else if (str[i] == '\r' && str[i + 1] == '\n')

{

fputs("\\\r\n", yyout);