diff options
| author | Bruce Momjian <bruce@momjian.us> | 2005-07-02 17:01:59 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2005-07-02 17:01:59 +0000 |
| commit | 74b49a81294b2943179078272bc3413b33d16e6f (patch) | |
| tree | 1f610742e7fffbce204c4a95df8163d98bcaba6f /src/interfaces/ecpg/ecpglib/execute.c | |
| parent | 654efe6aaa65d4bb53a3c888df1143558a1034ad (diff) | |
| download | postgresql-74b49a81294b2943179078272bc3413b33d16e6f.tar.gz postgresql-74b49a81294b2943179078272bc3413b33d16e6f.zip | |
Add E'' to internally created SQL strings that contain backslashes.
Improve code clarity by using macros for E'' processing.
Diffstat (limited to 'src/interfaces/ecpg/ecpglib/execute.c')
| -rw-r--r-- | src/interfaces/ecpg/ecpglib/execute.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/src/interfaces/ecpg/ecpglib/execute.c b/src/interfaces/ecpg/ecpglib/execute.c index c585a81b580..e1e8a43f4f3 100644 --- a/src/interfaces/ecpg/ecpglib/execute.c +++ b/src/interfaces/ecpg/ecpglib/execute.c @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/execute.c,v 1.40 2005/06/02 12:35:11 meskes Exp $ */ +/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/execute.c,v 1.41 2005/07/02 17:01:53 momjian Exp $ */ /* * The aim is to get a simpler inteface to the database routines. @@ -45,21 +45,14 @@ quote_postgres(char *arg, int lineno) if (!res) return (res); + if (strchr(arg, '\\') != NULL) + res[ri++] = ESCAPE_STRING_SYNTAX; res[ri++] = '\''; for (i = 0; arg[i]; i++, ri++) { - switch (arg[i]) - { - case '\'': - res[ri++] = '\''; - break; - case '\\': - res[ri++] = '\\'; - break; - default: - ; - } + if (SQL_STR_DOUBLE(arg[i])) + res[ri++] = arg[i]; res[ri] = arg[i]; } |