diff options
| author | Greg Stark <stark@mit.edu> | 2013-07-29 23:43:44 +0100 |
|---|---|---|
| committer | Greg Stark <stark@mit.edu> | 2013-07-29 23:44:11 +0100 |
| commit | 69b7d59a744134e33bbe51dab44dd4113c83b7fb (patch) | |
| tree | e3d4ce55850315694f7a6a3d070a4c7ab2a26620 /src/interfaces/ecpg/test/expected | |
| parent | c62736cc37f6812d1ebb41ea5a86ffe60564a1f0 (diff) | |
| download | postgresql-69b7d59a744134e33bbe51dab44dd4113c83b7fb.tar.gz postgresql-69b7d59a744134e33bbe51dab44dd4113c83b7fb.zip | |
Sync ECPG with WITH ORDINALITY changes
Diffstat (limited to 'src/interfaces/ecpg/test/expected')
| -rw-r--r-- | src/interfaces/ecpg/test/expected/sql-parser.c | 20 | ||||
| -rw-r--r-- | src/interfaces/ecpg/test/expected/sql-parser.stderr | 16 |
2 files changed, 3 insertions, 33 deletions
diff --git a/src/interfaces/ecpg/test/expected/sql-parser.c b/src/interfaces/ecpg/test/expected/sql-parser.c index 876bbf34a15..a4a6d864bfb 100644 --- a/src/interfaces/ecpg/test/expected/sql-parser.c +++ b/src/interfaces/ecpg/test/expected/sql-parser.c @@ -58,25 +58,7 @@ if (sqlca.sqlcode < 0) sqlprint();} #line 20 "parser.pgc" - { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into T values ( 1 , null )", ECPGt_EOIT, ECPGt_EORT); -#line 22 "parser.pgc" - -if (sqlca.sqlwarn[0] == 'W') sqlprint(); -#line 22 "parser.pgc" - -if (sqlca.sqlcode < 0) sqlprint();} -#line 22 "parser.pgc" - - { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into T values ( 1 , 1 )", ECPGt_EOIT, ECPGt_EORT); -#line 23 "parser.pgc" - -if (sqlca.sqlwarn[0] == 'W') sqlprint(); -#line 23 "parser.pgc" - -if (sqlca.sqlcode < 0) sqlprint();} -#line 23 "parser.pgc" - - { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into T values ( 1 , 2 )", ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into t select 1 , nullif ( y - 1 , 0 ) from generate_series ( 1 , 3 ) with ordinality as series ( x , y )", ECPGt_EOIT, ECPGt_EORT); #line 24 "parser.pgc" if (sqlca.sqlwarn[0] == 'W') sqlprint(); diff --git a/src/interfaces/ecpg/test/expected/sql-parser.stderr b/src/interfaces/ecpg/test/expected/sql-parser.stderr index 0959fa1e726..af68c43db49 100644 --- a/src/interfaces/ecpg/test/expected/sql-parser.stderr +++ b/src/interfaces/ecpg/test/expected/sql-parser.stderr @@ -10,23 +10,11 @@ [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_execute on line 20: OK: CREATE TABLE [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ecpg_execute on line 22: query: insert into T values ( 1 , null ); with 0 parameter(s) on connection regress1 +[NO_PID]: ecpg_execute on line 22: query: insert into t select 1 , nullif ( y - 1 , 0 ) from generate_series ( 1 , 3 ) with ordinality as series ( x , y ); with 0 parameter(s) on connection regress1 [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_execute on line 22: using PQexec [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ecpg_execute on line 22: OK: INSERT 0 1 -[NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ecpg_execute on line 23: query: insert into T values ( 1 , 1 ); with 0 parameter(s) on connection regress1 -[NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ecpg_execute on line 23: using PQexec -[NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ecpg_execute on line 23: OK: INSERT 0 1 -[NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ecpg_execute on line 24: query: insert into T values ( 1 , 2 ); with 0 parameter(s) on connection regress1 -[NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ecpg_execute on line 24: using PQexec -[NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ecpg_execute on line 24: OK: INSERT 0 1 +[NO_PID]: ecpg_execute on line 22: OK: INSERT 0 3 [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_execute on line 26: query: select Item2 from T order by Item2 nulls last; with 0 parameter(s) on connection regress1 [NO_PID]: sqlca: code: 0, state: 00000 |