Skip to content

P
Postgres FD Implementation
Commit b25749cc authored by Robert Haas's avatar Robert Haas
Browse files
Options

Make ECPG regression tests independent of standard_conforming_strings. 

Per buildfarm, again.
parent 0e22e08f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 131 additions and 88 deletions
src/interfaces/ecpg/test/expected/sql-quote.c
View file @ b25749cc
...@@ -61,9 +61,7 @@ if (sqlca.sqlcode < 0) sqlprint();} ...@@ -61,9 +61,7 @@ if (sqlca.sqlcode < 0) sqlprint();}
#line 20 "quote.pgc" #line 20 "quote.pgc"
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "show standard_conforming_strings", ECPGt_EOIT, { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "set standard_conforming_strings to off", ECPGt_EOIT, ECPGt_EORT);
ECPGt_char,(var),(long)25,(long)1,(25)*sizeof(char),
ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);
#line 22 "quote.pgc" #line 22 "quote.pgc"
if (sqlca.sqlwarn[0] == 'W') sqlprint(); if (sqlca.sqlwarn[0] == 'W') sqlprint();
...@@ -72,85 +70,110 @@ if (sqlca.sqlwarn[0] == 'W') sqlprint(); ...@@ -72,85 +70,110 @@ if (sqlca.sqlwarn[0] == 'W') sqlprint();
if (sqlca.sqlcode < 0) sqlprint();} if (sqlca.sqlcode < 0) sqlprint();}
#line 22 "quote.pgc" #line 22 "quote.pgc"
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "show standard_conforming_strings", ECPGt_EOIT,
ECPGt_char,(var),(long)25,(long)1,(25)*sizeof(char),
ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);
#line 24 "quote.pgc"
if (sqlca.sqlwarn[0] == 'W') sqlprint();
#line 24 "quote.pgc"
if (sqlca.sqlcode < 0) sqlprint();}
#line 24 "quote.pgc"
printf("Standard conforming strings: %s\n", var); printf("Standard conforming strings: %s\n", var);
/* this is a\\b actually */ /* this is a\\b actually */
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into \"My_Table\" values ( 1 , 'a\\\\\\\\b' )", ECPGt_EOIT, ECPGt_EORT); { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into \"My_Table\" values ( 1 , 'a\\\\\\\\b' )", ECPGt_EOIT, ECPGt_EORT);
#line 26 "quote.pgc" #line 28 "quote.pgc"
if (sqlca.sqlwarn[0] == 'W') sqlprint(); if (sqlca.sqlwarn[0] == 'W') sqlprint();
#line 26 "quote.pgc" #line 28 "quote.pgc"
if (sqlca.sqlcode < 0) sqlprint();} if (sqlca.sqlcode < 0) sqlprint();}
#line 26 "quote.pgc" #line 28 "quote.pgc"
/* this is a\\b */ /* this is a\\b */
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into \"My_Table\" values ( 1 , E'a\\\\\\\\b' )", ECPGt_EOIT, ECPGt_EORT); { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into \"My_Table\" values ( 1 , E'a\\\\\\\\b' )", ECPGt_EOIT, ECPGt_EORT);
#line 28 "quote.pgc" #line 30 "quote.pgc"
if (sqlca.sqlwarn[0] == 'W') sqlprint(); if (sqlca.sqlwarn[0] == 'W') sqlprint();
#line 28 "quote.pgc" #line 30 "quote.pgc"
if (sqlca.sqlcode < 0) sqlprint();} if (sqlca.sqlcode < 0) sqlprint();}
#line 28 "quote.pgc" #line 30 "quote.pgc"
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "set standard_conforming_strings to on", ECPGt_EOIT, ECPGt_EORT); { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "set standard_conforming_strings to on", ECPGt_EOIT, ECPGt_EORT);
#line 30 "quote.pgc" #line 32 "quote.pgc"
if (sqlca.sqlwarn[0] == 'W') sqlprint(); if (sqlca.sqlwarn[0] == 'W') sqlprint();
#line 30 "quote.pgc" #line 32 "quote.pgc"
if (sqlca.sqlcode < 0) sqlprint();} if (sqlca.sqlcode < 0) sqlprint();}
#line 30 "quote.pgc" #line 32 "quote.pgc"
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "show standard_conforming_strings", ECPGt_EOIT,
ECPGt_char,(var),(long)25,(long)1,(25)*sizeof(char),
ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);
#line 34 "quote.pgc"
if (sqlca.sqlwarn[0] == 'W') sqlprint();
#line 34 "quote.pgc"
if (sqlca.sqlcode < 0) sqlprint();}
#line 34 "quote.pgc"
printf("Standard conforming strings: %s\n", var);
/* this is a\\\\b actually */ /* this is a\\\\b actually */
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into \"My_Table\" values ( 2 , 'a\\\\\\\\b' )", ECPGt_EOIT, ECPGt_EORT); { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into \"My_Table\" values ( 2 , 'a\\\\\\\\b' )", ECPGt_EOIT, ECPGt_EORT);
#line 33 "quote.pgc" #line 38 "quote.pgc"
if (sqlca.sqlwarn[0] == 'W') sqlprint(); if (sqlca.sqlwarn[0] == 'W') sqlprint();
#line 33 "quote.pgc" #line 38 "quote.pgc"
if (sqlca.sqlcode < 0) sqlprint();} if (sqlca.sqlcode < 0) sqlprint();}
#line 33 "quote.pgc" #line 38 "quote.pgc"
/* this is a\\b */ /* this is a\\b */
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into \"My_Table\" values ( 2 , E'a\\\\\\\\b' )", ECPGt_EOIT, ECPGt_EORT); { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into \"My_Table\" values ( 2 , E'a\\\\\\\\b' )", ECPGt_EOIT, ECPGt_EORT);
#line 35 "quote.pgc" #line 40 "quote.pgc"
if (sqlca.sqlwarn[0] == 'W') sqlprint(); if (sqlca.sqlwarn[0] == 'W') sqlprint();
#line 35 "quote.pgc" #line 40 "quote.pgc"
if (sqlca.sqlcode < 0) sqlprint();} if (sqlca.sqlcode < 0) sqlprint();}
#line 35 "quote.pgc" #line 40 "quote.pgc"
{ ECPGtrans(__LINE__, NULL, "begin"); { ECPGtrans(__LINE__, NULL, "begin");
#line 37 "quote.pgc" #line 42 "quote.pgc"
if (sqlca.sqlwarn[0] == 'W') sqlprint(); if (sqlca.sqlwarn[0] == 'W') sqlprint();
#line 37 "quote.pgc" #line 42 "quote.pgc"
if (sqlca.sqlcode < 0) sqlprint();} if (sqlca.sqlcode < 0) sqlprint();}
#line 37 "quote.pgc" #line 42 "quote.pgc"
/* declare C cursor for select * from \"My_Table\" */ /* declare C cursor for select * from \"My_Table\" */
#line 38 "quote.pgc" #line 43 "quote.pgc"
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "declare C cursor for select * from \"My_Table\"", ECPGt_EOIT, ECPGt_EORT); { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "declare C cursor for select * from \"My_Table\"", ECPGt_EOIT, ECPGt_EORT);
#line 40 "quote.pgc" #line 45 "quote.pgc"
if (sqlca.sqlwarn[0] == 'W') sqlprint(); if (sqlca.sqlwarn[0] == 'W') sqlprint();
#line 40 "quote.pgc" #line 45 "quote.pgc"
if (sqlca.sqlcode < 0) sqlprint();} if (sqlca.sqlcode < 0) sqlprint();}
#line 40 "quote.pgc" #line 45 "quote.pgc"
/* exec sql whenever not found break ; */ /* exec sql whenever not found break ; */
#line 42 "quote.pgc" #line 47 "quote.pgc"
while (true) while (true)
...@@ -160,47 +183,47 @@ if (sqlca.sqlcode < 0) sqlprint();} ...@@ -160,47 +183,47 @@ if (sqlca.sqlcode < 0) sqlprint();}
ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L,
ECPGt_char,(var),(long)25,(long)1,(25)*sizeof(char), ECPGt_char,(var),(long)25,(long)1,(25)*sizeof(char),
ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT); ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);
#line 46 "quote.pgc" #line 51 "quote.pgc"
if (sqlca.sqlcode == ECPG_NOT_FOUND) break; if (sqlca.sqlcode == ECPG_NOT_FOUND) break;
#line 46 "quote.pgc" #line 51 "quote.pgc"
if (sqlca.sqlwarn[0] == 'W') sqlprint(); if (sqlca.sqlwarn[0] == 'W') sqlprint();
#line 46 "quote.pgc" #line 51 "quote.pgc"
if (sqlca.sqlcode < 0) sqlprint();} if (sqlca.sqlcode < 0) sqlprint();}
#line 46 "quote.pgc" #line 51 "quote.pgc"
printf("value: %d %s\n", i, var); printf("value: %d %s\n", i, var);
} }
{ ECPGtrans(__LINE__, NULL, "rollback"); { ECPGtrans(__LINE__, NULL, "rollback");
#line 50 "quote.pgc" #line 55 "quote.pgc"
if (sqlca.sqlwarn[0] == 'W') sqlprint(); if (sqlca.sqlwarn[0] == 'W') sqlprint();
#line 50 "quote.pgc" #line 55 "quote.pgc"
if (sqlca.sqlcode < 0) sqlprint();} if (sqlca.sqlcode < 0) sqlprint();}
#line 50 "quote.pgc" #line 55 "quote.pgc"
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "drop table \"My_Table\"", ECPGt_EOIT, ECPGt_EORT); { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "drop table \"My_Table\"", ECPGt_EOIT, ECPGt_EORT);
#line 51 "quote.pgc" #line 56 "quote.pgc"
if (sqlca.sqlwarn[0] == 'W') sqlprint(); if (sqlca.sqlwarn[0] == 'W') sqlprint();
#line 51 "quote.pgc" #line 56 "quote.pgc"
if (sqlca.sqlcode < 0) sqlprint();} if (sqlca.sqlcode < 0) sqlprint();}
#line 51 "quote.pgc" #line 56 "quote.pgc"
{ ECPGdisconnect(__LINE__, "ALL"); { ECPGdisconnect(__LINE__, "ALL");
#line 53 "quote.pgc" #line 58 "quote.pgc"
if (sqlca.sqlwarn[0] == 'W') sqlprint(); if (sqlca.sqlwarn[0] == 'W') sqlprint();
#line 53 "quote.pgc" #line 58 "quote.pgc"
if (sqlca.sqlcode < 0) sqlprint();} if (sqlca.sqlcode < 0) sqlprint();}
#line 53 "quote.pgc" #line 58 "quote.pgc"
return 0; return 0;
......
src/interfaces/ecpg/test/expected/sql-quote.stdout
View file @ b25749cc
Standard conforming strings: off Standard conforming strings: off
Standard conforming strings: on
value: 1 a\\b value: 1 a\\b
value: 1 a\\b value: 1 a\\b
value: 2 a\\\\b value: 2 a\\\\b
......
src/interfaces/ecpg/test/sql/quote.pgc
View file @ b25749cc
...@@ -19,6 +19,8 @@ int main() { ...@@ -19,6 +19,8 @@ int main() {
EXEC SQL CREATE TABLE "My_Table" ( Item1 int, Item2 text ); EXEC SQL CREATE TABLE "My_Table" ( Item1 int, Item2 text );
EXEC SQL SET standard_conforming_strings TO off;
EXEC SQL SHOW standard_conforming_strings INTO :var; EXEC SQL SHOW standard_conforming_strings INTO :var;
printf("Standard conforming strings: %s\n", var); printf("Standard conforming strings: %s\n", var);
...@@ -29,6 +31,9 @@ int main() { ...@@ -29,6 +31,9 @@ int main() {
EXEC SQL SET standard_conforming_strings TO on; EXEC SQL SET standard_conforming_strings TO on;
EXEC SQL SHOW standard_conforming_strings INTO :var;
printf("Standard conforming strings: %s\n", var);
/* this is a\\\\b actually */ /* this is a\\\\b actually */
EXEC SQL INSERT INTO "My_Table" VALUES ( 2, 'a\\\\b' ); EXEC SQL INSERT INTO "My_Table" VALUES ( 2, 'a\\\\b' );
/* this is a\\b */ /* this is a\\b */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment