From: Michael Meskes Date: Sun, 21 Mar 2010 11:38:16 +0000 (+0000) Subject: Adjusted regression test results to the change I made in debug output for ecpglib. X-Git-Tag: REL9_0_ALPHA5~52 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=654fff2311f564c276e29d460e07696f77b92847;p=postgresql Adjusted regression test results to the change I made in debug output for ecpglib. --- diff --git a/src/interfaces/ecpg/test/expected/compat_informix-describe.stderr b/src/interfaces/ecpg/test/expected/compat_informix-describe.stderr index 3be0a65460..898fa3b8e4 100644 --- a/src/interfaces/ecpg/test/expected/compat_informix-describe.stderr +++ b/src/interfaces/ecpg/test/expected/compat_informix-describe.stderr @@ -40,7 +40,7 @@ [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ECPGtrans on line 42: action "commit"; connection "regress1" [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGprepare on line 55: name st_id1; query: "SELECT id, t FROM descr_t1" +[NO_PID]: prepare_common on line 55: name st_id1; query: "SELECT id, t FROM descr_t1" [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_build_compat_sqlda on line 63 sqld = 2 [NO_PID]: sqlca: code: 0, state: 00000 @@ -68,9 +68,9 @@ [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ECPGget_desc: NAME = t [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGdeallocate on line 132: name st_id1 +[NO_PID]: deallocate_one on line 132: name st_id1 [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGprepare on line 141: name st_id2; query: "SELECT id, t FROM descr_t1 WHERE id = -1" +[NO_PID]: prepare_common on line 141: name st_id2; query: "SELECT id, t FROM descr_t1 WHERE id = -1" [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_build_compat_sqlda on line 149 sqld = 2 [NO_PID]: sqlca: code: 0, state: 00000 @@ -98,7 +98,7 @@ [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ECPGget_desc: NAME = t [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGdeallocate on line 185: name st_id2 +[NO_PID]: deallocate_one on line 185: name st_id2 [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_execute on line 190: query: drop table descr_t1; with 0 parameter(s) on connection regress1 [NO_PID]: sqlca: code: 0, state: 00000 diff --git a/src/interfaces/ecpg/test/expected/compat_informix-sqlda.stderr b/src/interfaces/ecpg/test/expected/compat_informix-sqlda.stderr index c365ba84d1..f463d034fc 100644 --- a/src/interfaces/ecpg/test/expected/compat_informix-sqlda.stderr +++ b/src/interfaces/ecpg/test/expected/compat_informix-sqlda.stderr @@ -22,7 +22,7 @@ [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ECPGtrans on line 88: action "commit"; connection "regress1" [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGprepare on line 95: name st_id1; query: "SELECT * FROM t1" +[NO_PID]: prepare_common on line 95: name st_id1; query: "SELECT * FROM t1" [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_execute on line 101: query: declare mycur1 cursor for SELECT * FROM t1; with 0 parameter(s) on connection regress1 [NO_PID]: sqlca: code: 0, state: 00000 @@ -132,9 +132,9 @@ [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_execute on line 118: OK: CLOSE CURSOR [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGdeallocate on line 121: name st_id1 +[NO_PID]: deallocate_one on line 121: name st_id1 [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGprepare on line 132: name st_id2; query: "SELECT * FROM t1" +[NO_PID]: prepare_common on line 132: name st_id2; query: "SELECT * FROM t1" [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_execute on line 138: query: declare mycur2 cursor for SELECT * FROM t1; with 0 parameter(s) on connection regress1 [NO_PID]: sqlca: code: 0, state: 00000 @@ -244,9 +244,9 @@ [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_execute on line 155: OK: CLOSE CURSOR [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGdeallocate on line 158: name st_id2 +[NO_PID]: deallocate_one on line 158: name st_id2 [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGprepare on line 181: name st_id3; query: "SELECT * FROM t1 WHERE id = $1" +[NO_PID]: prepare_common on line 181: name st_id3; query: "SELECT * FROM t1 WHERE id = $1" [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_execute on line 184: query: SELECT * FROM t1 WHERE id = $1; with 1 parameter(s) on connection regress1 [NO_PID]: sqlca: code: 0, state: 00000 @@ -282,11 +282,11 @@ [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_execute on line 184: putting result (1 tuple 5 fields) into sqlda descriptor [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGdeallocate on line 189: name st_id3 +[NO_PID]: deallocate_one on line 189: name st_id3 [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ECPGconnect: opening database regress1 on port [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGprepare on line 218: name st_id4; query: "SELECT * FROM t1 WHERE id = $1" +[NO_PID]: prepare_common on line 218: name st_id4; query: "SELECT * FROM t1 WHERE id = $1" [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_execute on line 221: query: SELECT * FROM t1 WHERE id = $1; with 1 parameter(s) on connection con2 [NO_PID]: sqlca: code: 0, state: 00000 @@ -324,7 +324,7 @@ [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ECPGtrans on line 226: action "commit"; connection "con2" [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGdeallocate on line 229: name st_id4 +[NO_PID]: deallocate_one on line 229: name st_id4 [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_finish: connection con2 closed [NO_PID]: sqlca: code: 0, state: 00000 diff --git a/src/interfaces/ecpg/test/expected/preproc-autoprep.stderr b/src/interfaces/ecpg/test/expected/preproc-autoprep.stderr index bb728e1ae2..16117bed74 100644 --- a/src/interfaces/ecpg/test/expected/preproc-autoprep.stderr +++ b/src/interfaces/ecpg/test/expected/preproc-autoprep.stderr @@ -10,7 +10,7 @@ [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_auto_prepare on line 23: statement not in cache; inserting [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGprepare on line 23: name ecpg1; query: "insert into T values ( 1 , null )" +[NO_PID]: prepare_common on line 23: name ecpg1; query: "insert into T values ( 1 , null )" [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_execute on line 23: query: insert into T values ( 1 , null ); with 0 parameter(s) on connection regress1 [NO_PID]: sqlca: code: 0, state: 00000 @@ -20,7 +20,7 @@ [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_auto_prepare on line 24: statement not in cache; inserting [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGprepare on line 24: name ecpg2; query: "insert into T values ( 1 , $1 )" +[NO_PID]: prepare_common on line 24: name ecpg2; query: "insert into T values ( 1 , $1 )" [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_execute on line 24: query: insert into T values ( 1 , $1 ); with 1 parameter(s) on connection regress1 [NO_PID]: sqlca: code: 0, state: 00000 @@ -40,7 +40,7 @@ [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_execute on line 26: OK: INSERT 0 1 [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGprepare on line 27: name i; query: " insert into T values ( 1 , 2 ) " +[NO_PID]: prepare_common on line 27: name i; query: " insert into T values ( 1 , 2 ) " [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_execute on line 28: query: insert into T values ( 1 , 2 ) ; with 0 parameter(s) on connection regress1 [NO_PID]: sqlca: code: 0, state: 00000 @@ -50,7 +50,7 @@ [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_auto_prepare on line 30: statement not in cache; inserting [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGprepare on line 30: name ecpg3; query: "select Item2 from T order by Item2 nulls last" +[NO_PID]: prepare_common on line 30: name ecpg3; query: "select Item2 from T order by Item2 nulls last" [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_execute on line 30: query: select Item2 from T order by Item2 nulls last; with 0 parameter(s) on connection regress1 [NO_PID]: sqlca: code: 0, state: 00000 @@ -86,7 +86,7 @@ [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_execute on line 42: OK: CLOSE CURSOR [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGprepare on line 44: name stmt1; query: "SELECT item2 FROM T ORDER BY item2 NULLS LAST" +[NO_PID]: prepare_common on line 44: name stmt1; query: "SELECT item2 FROM T ORDER BY item2 NULLS LAST" [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_execute on line 48: query: declare cur1 cursor for SELECT item2 FROM T ORDER BY item2 NULLS LAST; with 0 parameter(s) on connection regress1 [NO_PID]: sqlca: code: 0, state: 00000 @@ -146,15 +146,15 @@ [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_execute on line 62: OK: DROP TABLE [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGdeallocate on line 0: name stmt1 +[NO_PID]: deallocate_one on line 0: name stmt1 [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGdeallocate on line 0: name ecpg3 +[NO_PID]: deallocate_one on line 0: name ecpg3 [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGdeallocate on line 0: name i +[NO_PID]: deallocate_one on line 0: name i [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGdeallocate on line 0: name ecpg2 +[NO_PID]: deallocate_one on line 0: name ecpg2 [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGdeallocate on line 0: name ecpg1 +[NO_PID]: deallocate_one on line 0: name ecpg1 [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_finish: connection regress1 closed [NO_PID]: sqlca: code: 0, state: 00000 @@ -170,7 +170,7 @@ [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_auto_prepare on line 23: statement found in cache; entry 15328 [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGprepare on line 23: name ecpg1; query: "insert into T values ( 1 , null )" +[NO_PID]: prepare_common on line 23: name ecpg1; query: "insert into T values ( 1 , null )" [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_execute on line 23: query: insert into T values ( 1 , null ); with 0 parameter(s) on connection regress1 [NO_PID]: sqlca: code: 0, state: 00000 @@ -180,7 +180,7 @@ [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_auto_prepare on line 24: statement found in cache; entry 1640 [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGprepare on line 24: name ecpg2; query: "insert into T values ( 1 , $1 )" +[NO_PID]: prepare_common on line 24: name ecpg2; query: "insert into T values ( 1 , $1 )" [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_execute on line 24: query: insert into T values ( 1 , $1 ); with 1 parameter(s) on connection regress1 [NO_PID]: sqlca: code: 0, state: 00000 @@ -200,7 +200,7 @@ [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_execute on line 26: OK: INSERT 0 1 [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGprepare on line 27: name i; query: " insert into T values ( 1 , 2 ) " +[NO_PID]: prepare_common on line 27: name i; query: " insert into T values ( 1 , 2 ) " [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_execute on line 28: query: insert into T values ( 1 , 2 ) ; with 0 parameter(s) on connection regress1 [NO_PID]: sqlca: code: 0, state: 00000 @@ -210,7 +210,7 @@ [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_auto_prepare on line 30: statement found in cache; entry 13056 [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGprepare on line 30: name ecpg3; query: "select Item2 from T order by Item2 nulls last" +[NO_PID]: prepare_common on line 30: name ecpg3; query: "select Item2 from T order by Item2 nulls last" [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_execute on line 30: query: select Item2 from T order by Item2 nulls last; with 0 parameter(s) on connection regress1 [NO_PID]: sqlca: code: 0, state: 00000 @@ -246,7 +246,7 @@ [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_execute on line 42: OK: CLOSE CURSOR [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGprepare on line 44: name stmt1; query: "SELECT item2 FROM T ORDER BY item2 NULLS LAST" +[NO_PID]: prepare_common on line 44: name stmt1; query: "SELECT item2 FROM T ORDER BY item2 NULLS LAST" [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_execute on line 48: query: declare cur1 cursor for SELECT item2 FROM T ORDER BY item2 NULLS LAST; with 0 parameter(s) on connection regress1 [NO_PID]: sqlca: code: 0, state: 00000 @@ -306,15 +306,15 @@ [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_execute on line 62: OK: DROP TABLE [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGdeallocate on line 0: name stmt1 +[NO_PID]: deallocate_one on line 0: name stmt1 [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGdeallocate on line 0: name ecpg3 +[NO_PID]: deallocate_one on line 0: name ecpg3 [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGdeallocate on line 0: name i +[NO_PID]: deallocate_one on line 0: name i [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGdeallocate on line 0: name ecpg2 +[NO_PID]: deallocate_one on line 0: name ecpg2 [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGdeallocate on line 0: name ecpg1 +[NO_PID]: deallocate_one on line 0: name ecpg1 [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_finish: connection regress1 closed [NO_PID]: sqlca: code: 0, state: 00000 diff --git a/src/interfaces/ecpg/test/expected/preproc-cursor.stderr b/src/interfaces/ecpg/test/expected/preproc-cursor.stderr index 1d96b12d54..3a3bedc1cb 100644 --- a/src/interfaces/ecpg/test/expected/preproc-cursor.stderr +++ b/src/interfaces/ecpg/test/expected/preproc-cursor.stderr @@ -196,7 +196,7 @@ [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_execute on line 135: OK: CLOSE CURSOR [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGprepare on line 140: name st_id1; query: "SELECT id, t FROM t1" +[NO_PID]: prepare_common on line 140: name st_id1; query: "SELECT id, t FROM t1" [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_execute on line 146: query: declare mycur cursor for SELECT id, t FROM t1; with 0 parameter(s) on connection regress1 [NO_PID]: sqlca: code: 0, state: 00000 @@ -276,9 +276,9 @@ [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_execute on line 178: OK: CLOSE CURSOR [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGdeallocate on line 181: name st_id1 +[NO_PID]: deallocate_one on line 181: name st_id1 [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGprepare on line 190: name st_id2; query: "SELECT id, t FROM t1" +[NO_PID]: prepare_common on line 190: name st_id2; query: "SELECT id, t FROM t1" [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_execute on line 196: query: declare mycur cursor for SELECT id, t FROM t1; with 0 parameter(s) on connection regress1 [NO_PID]: sqlca: code: 0, state: 00000 @@ -358,7 +358,7 @@ [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_execute on line 228: OK: CLOSE CURSOR [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGdeallocate on line 231: name st_id2 +[NO_PID]: deallocate_one on line 231: name st_id2 [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_execute on line 236: query: drop table t1; with 0 parameter(s) on connection regress1 [NO_PID]: sqlca: code: 0, state: 00000 diff --git a/src/interfaces/ecpg/test/expected/sql-desc.stderr b/src/interfaces/ecpg/test/expected/sql-desc.stderr index 2f8a1fe5e3..ef113835b7 100644 --- a/src/interfaces/ecpg/test/expected/sql-desc.stderr +++ b/src/interfaces/ecpg/test/expected/sql-desc.stderr @@ -8,13 +8,13 @@ [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_execute on line 29: OK: CREATE TABLE [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGprepare on line 30: name foo1; query: "INSERT INTO test1 VALUES ($1, $2)" +[NO_PID]: prepare_common on line 30: name foo1; query: "INSERT INTO test1 VALUES ($1, $2)" [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGprepare on line 31: name Foo-1; query: "INSERT INTO test1 VALUES ($1, $2)" +[NO_PID]: prepare_common on line 31: name Foo-1; query: "INSERT INTO test1 VALUES ($1, $2)" [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGprepare on line 32: name foo2; query: "SELECT * from test1 where a = $1 and b = $2" +[NO_PID]: prepare_common on line 32: name foo2; query: "SELECT * from test1 where a = $1 and b = $2" [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGprepare on line 33: name foo3; query: "SELECT * from test1 where $1 = a" +[NO_PID]: prepare_common on line 33: name foo3; query: "SELECT * from test1 where $1 = a" [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_execute on line 35: query: INSERT INTO test1 VALUES ($1, $2); with 2 parameter(s) on connection regress1 [NO_PID]: sqlca: code: 0, state: 00000 @@ -46,7 +46,7 @@ [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_execute on line 45: OK: INSERT 0 1 [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGdeallocate on line 47: name Foo-1 +[NO_PID]: deallocate_one on line 47: name Foo-1 [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_execute on line 52: query: SELECT * from test1 where a = $1 and b = $2; with 2 parameter(s) on connection regress1 [NO_PID]: sqlca: code: 0, state: 00000 @@ -130,11 +130,11 @@ [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_execute on line 80: OK: DROP TABLE [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGdeallocate on line 81: name foo3 +[NO_PID]: deallocate_one on line 81: name foo3 [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGdeallocate on line 81: name foo2 +[NO_PID]: deallocate_one on line 81: name foo2 [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGdeallocate on line 81: name foo1 +[NO_PID]: deallocate_one on line 81: name foo1 [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_finish: connection regress1 closed [NO_PID]: sqlca: code: 0, state: 00000 diff --git a/src/interfaces/ecpg/test/expected/sql-describe.stderr b/src/interfaces/ecpg/test/expected/sql-describe.stderr index 64f0e03317..efb23d7ecb 100644 --- a/src/interfaces/ecpg/test/expected/sql-describe.stderr +++ b/src/interfaces/ecpg/test/expected/sql-describe.stderr @@ -40,7 +40,7 @@ [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ECPGtrans on line 42: action "commit"; connection "regress1" [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGprepare on line 55: name st_id1; query: "SELECT id, t FROM descr_t2" +[NO_PID]: prepare_common on line 55: name st_id1; query: "SELECT id, t FROM descr_t2" [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_build_native_sqlda on line 63 sqld = 2 [NO_PID]: sqlca: code: 0, state: 00000 @@ -68,9 +68,9 @@ [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ECPGget_desc: NAME = t [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGdeallocate on line 132: name st_id1 +[NO_PID]: deallocate_one on line 132: name st_id1 [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGprepare on line 141: name st_id2; query: "SELECT id, t FROM descr_t2 WHERE id = -1" +[NO_PID]: prepare_common on line 141: name st_id2; query: "SELECT id, t FROM descr_t2 WHERE id = -1" [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_build_native_sqlda on line 149 sqld = 2 [NO_PID]: sqlca: code: 0, state: 00000 @@ -98,7 +98,7 @@ [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ECPGget_desc: NAME = t [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGdeallocate on line 185: name st_id2 +[NO_PID]: deallocate_one on line 185: name st_id2 [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_execute on line 190: query: drop table descr_t2; with 0 parameter(s) on connection regress1 [NO_PID]: sqlca: code: 0, state: 00000 diff --git a/src/interfaces/ecpg/test/expected/sql-dyntest.stderr b/src/interfaces/ecpg/test/expected/sql-dyntest.stderr index 871d55c2c1..6afccb268a 100644 --- a/src/interfaces/ecpg/test/expected/sql-dyntest.stderr +++ b/src/interfaces/ecpg/test/expected/sql-dyntest.stderr @@ -26,7 +26,7 @@ [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_execute on line 55: OK: INSERT 0 1 [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGprepare on line 57: name myquery; query: "select * from dyntest" +[NO_PID]: prepare_common on line 57: name myquery; query: "select * from dyntest" [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_execute on line 60: query: declare MYCURS cursor for select * from dyntest; with 0 parameter(s) on connection regress1 [NO_PID]: sqlca: code: 0, state: 00000 diff --git a/src/interfaces/ecpg/test/expected/sql-execute.stderr b/src/interfaces/ecpg/test/expected/sql-execute.stderr index f02ec3c5b0..fa9067299d 100644 --- a/src/interfaces/ecpg/test/expected/sql-execute.stderr +++ b/src/interfaces/ecpg/test/expected/sql-execute.stderr @@ -28,7 +28,7 @@ [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_execute on line 35: OK: INSERT 0 2 [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGprepare on line 40: name i; query: "insert into test (name, amount, letter) select name, amount+$1, letter from test" +[NO_PID]: prepare_common on line 40: name i; query: "insert into test (name, amount, letter) select name, amount+$1, letter from test" [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_execute on line 41: query: insert into test (name, amount, letter) select name, amount+$1, letter from test; with 1 parameter(s) on connection main [NO_PID]: sqlca: code: 0, state: 00000 @@ -40,7 +40,7 @@ [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ECPGtrans on line 45: action "commit"; connection "main" [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGprepare on line 49: name f; query: "select * from test" +[NO_PID]: prepare_common on line 49: name f; query: "select * from test" [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_execute on line 52: query: declare CUR cursor for select * from test; with 0 parameter(s) on connection main [NO_PID]: sqlca: code: 0, state: 00000 @@ -108,9 +108,9 @@ [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_execute on line 66: OK: CLOSE CURSOR [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGdeallocate on line 67: name f +[NO_PID]: deallocate_one on line 67: name f [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGprepare on line 71: name f; query: "select * from test where amount = $1" +[NO_PID]: prepare_common on line 71: name f; query: "select * from test where amount = $1" [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_execute on line 74: query: declare CUR2 cursor for select * from test where amount = $1; with 1 parameter(s) on connection main [NO_PID]: sqlca: code: 0, state: 00000 @@ -138,9 +138,9 @@ [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_execute on line 88: OK: CLOSE CURSOR [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGdeallocate on line 89: name f +[NO_PID]: deallocate_one on line 89: name f [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGprepare on line 93: name f; query: "select * from test where amount = $1" +[NO_PID]: prepare_common on line 93: name f; query: "select * from test where amount = $1" [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_execute on line 94: query: select * from test where amount = $1; with 1 parameter(s) on connection main [NO_PID]: sqlca: code: 0, state: 00000 @@ -156,7 +156,7 @@ [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_get_data on line 94: RESULT: t offset: -1; array: no [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGdeallocate on line 107: name f +[NO_PID]: deallocate_one on line 107: name f [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_execute on line 108: query: drop table test; with 0 parameter(s) on connection main [NO_PID]: sqlca: code: 0, state: 00000 @@ -166,7 +166,7 @@ [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ECPGtrans on line 109: action "commit"; connection "main" [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGdeallocate on line 0: name i +[NO_PID]: deallocate_one on line 0: name i [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_finish: connection main closed [NO_PID]: sqlca: code: 0, state: 00000 diff --git a/src/interfaces/ecpg/test/expected/sql-oldexec.stderr b/src/interfaces/ecpg/test/expected/sql-oldexec.stderr index 7aba74f31c..451c2f64af 100644 --- a/src/interfaces/ecpg/test/expected/sql-oldexec.stderr +++ b/src/interfaces/ecpg/test/expected/sql-oldexec.stderr @@ -28,7 +28,7 @@ [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_execute on line 35: OK: INSERT 0 2 [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGprepare on line 40: name i; query: "insert into test (name, amount, letter) select name, amount+$1, letter from test" +[NO_PID]: prepare_common on line 40: name i; query: "insert into test (name, amount, letter) select name, amount+$1, letter from test" [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_execute on line 41: query: insert into test (name, amount, letter) select name, amount+$1, letter from test; with 1 parameter(s) on connection main [NO_PID]: sqlca: code: 0, state: 00000 @@ -40,7 +40,7 @@ [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ECPGtrans on line 45: action "commit"; connection "main" [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGprepare on line 49: name f; query: "select * from test" +[NO_PID]: prepare_common on line 49: name f; query: "select * from test" [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_execute on line 52: query: declare CUR cursor for select * from test; with 0 parameter(s) on connection main [NO_PID]: sqlca: code: 0, state: 00000 @@ -108,9 +108,9 @@ [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_execute on line 66: OK: CLOSE CURSOR [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGdeallocate on line 70: name f +[NO_PID]: deallocate_one on line 70: name f [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGprepare on line 70: name f; query: "select * from test where $1 = amount" +[NO_PID]: prepare_common on line 70: name f; query: "select * from test where $1 = amount" [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_execute on line 73: query: declare CUR3 cursor for select * from test where $1 = amount; with 1 parameter(s) on connection main [NO_PID]: sqlca: code: 0, state: 00000 @@ -146,9 +146,9 @@ [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ECPGtrans on line 89: action "commit"; connection "main" [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGdeallocate on line 0: name f +[NO_PID]: deallocate_one on line 0: name f [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGdeallocate on line 0: name i +[NO_PID]: deallocate_one on line 0: name i [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_finish: connection main closed [NO_PID]: sqlca: code: 0, state: 00000 diff --git a/src/interfaces/ecpg/test/expected/sql-sqlda.stderr b/src/interfaces/ecpg/test/expected/sql-sqlda.stderr index 4af3c9692f..b3d771a09c 100644 --- a/src/interfaces/ecpg/test/expected/sql-sqlda.stderr +++ b/src/interfaces/ecpg/test/expected/sql-sqlda.stderr @@ -22,7 +22,7 @@ [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ECPGtrans on line 90: action "commit"; connection "regress1" [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGprepare on line 97: name st_id1; query: "SELECT * FROM t1" +[NO_PID]: prepare_common on line 97: name st_id1; query: "SELECT * FROM t1" [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_execute on line 103: query: declare mycur1 cursor for SELECT * FROM t1; with 0 parameter(s) on connection regress1 [NO_PID]: sqlca: code: 0, state: 00000 @@ -128,9 +128,9 @@ [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_execute on line 120: OK: CLOSE CURSOR [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGdeallocate on line 123: name st_id1 +[NO_PID]: deallocate_one on line 123: name st_id1 [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGprepare on line 132: name st_id2; query: "SELECT * FROM t1" +[NO_PID]: prepare_common on line 132: name st_id2; query: "SELECT * FROM t1" [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_execute on line 138: query: declare mycur2 cursor for SELECT * FROM t1; with 0 parameter(s) on connection regress1 [NO_PID]: sqlca: code: 0, state: 00000 @@ -216,9 +216,9 @@ [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_execute on line 157: OK: CLOSE CURSOR [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGdeallocate on line 160: name st_id2 +[NO_PID]: deallocate_one on line 160: name st_id2 [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGprepare on line 182: name st_id3; query: "SELECT * FROM t1 WHERE id = $1" +[NO_PID]: prepare_common on line 182: name st_id3; query: "SELECT * FROM t1 WHERE id = $1" [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_execute on line 185: query: SELECT * FROM t1 WHERE id = $1; with 1 parameter(s) on connection regress1 [NO_PID]: sqlca: code: 0, state: 00000 @@ -252,11 +252,11 @@ [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_execute on line 185: putting result (1 tuple 5 fields) into sqlda descriptor [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGdeallocate on line 190: name st_id3 +[NO_PID]: deallocate_one on line 190: name st_id3 [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ECPGconnect: opening database regress1 on port [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGprepare on line 219: name st_id4; query: "SELECT * FROM t1 WHERE id = $1" +[NO_PID]: prepare_common on line 219: name st_id4; query: "SELECT * FROM t1 WHERE id = $1" [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_execute on line 222: query: SELECT * FROM t1 WHERE id = $1; with 1 parameter(s) on connection con2 [NO_PID]: sqlca: code: 0, state: 00000 @@ -292,7 +292,7 @@ [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ECPGtrans on line 227: action "commit"; connection "con2" [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGdeallocate on line 230: name st_id4 +[NO_PID]: deallocate_one on line 230: name st_id4 [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_finish: connection con2 closed [NO_PID]: sqlca: code: 0, state: 00000