Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit3291301

Browse files
committed
Split ECPGdo() in constituent parts
This splits ECPGdo() into ecpg_prologue(), ecpg_do() andecpg_epilogue(), and renames free_params() into ecpg_free_params() andexports it. This makes it possible for future code to use theseroutines for their own purposes.There is no user-visible functionality change here, only codereorganization.Zoltán BöszörményiReviewed by Antonin Houska. Larger, older versions of this patch werereviewed by Noah Misch and Michael Meskes.
1 parent8ba288d commit3291301

20 files changed

+246
-176
lines changed

‎src/interfaces/ecpg/ecpglib/execute.c

Lines changed: 144 additions & 84 deletions
Large diffs are not rendered by default.

‎src/interfaces/ecpg/ecpglib/extern.h

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,9 @@ struct statement
6060
boolquestionmarks;
6161
structvariable*inlist;
6262
structvariable*outlist;
63+
char*oldlocale;
64+
intnparams;
65+
char**paramvalues;
6366
};
6467

6568
/* structure to store prepared statements for a connection */
@@ -164,6 +167,13 @@ struct prepared_statement *ecpg_find_prepared_statement(const char *,
164167
boolecpg_store_result(constPGresult*results,intact_field,
165168
conststructstatement*stmt,structvariable*var);
166169
boolecpg_store_input(constint,constbool,conststructvariable*,char**,bool);
170+
voidecpg_free_params(structstatement*stmt,boolprint);
171+
voidecpg_do_epilogue(structstatement*);
172+
boolecpg_do_prologue(int,constint,constint,constchar*,constbool,
173+
enumECPG_statement_type,constchar*,va_list,
174+
structstatement**);
175+
boolecpg_do(constint,constint,constint,constchar*,constbool,
176+
constint,constchar*,va_list);
167177

168178
boolecpg_check_PQresult(PGresult*,int,PGconn*,enumCOMPAT_MODE);
169179
voidecpg_raise(intline,intcode,constchar*sqlstate,constchar*str);

‎src/interfaces/ecpg/test/expected/compat_informix-rnull.stderr

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,19 @@
1414
[NO_PID]: sqlca: code: 0, state: 00000
1515
[NO_PID]: ecpg_execute on line 36: using PQexecParams
1616
[NO_PID]: sqlca: code: 0, state: 00000
17-
[NO_PID]:free_params on line 36: parameter 1 = abc
17+
[NO_PID]:ecpg_free_params on line 36: parameter 1 = abc
1818
[NO_PID]: sqlca: code: 0, state: 00000
19-
[NO_PID]:free_params on line 36: parameter 2 = 17
19+
[NO_PID]:ecpg_free_params on line 36: parameter 2 = 17
2020
[NO_PID]: sqlca: code: 0, state: 00000
21-
[NO_PID]:free_params on line 36: parameter 3 = -74874
21+
[NO_PID]:ecpg_free_params on line 36: parameter 3 = -74874
2222
[NO_PID]: sqlca: code: 0, state: 00000
23-
[NO_PID]:free_params on line 36: parameter 4 = t
23+
[NO_PID]:ecpg_free_params on line 36: parameter 4 = t
2424
[NO_PID]: sqlca: code: 0, state: 00000
25-
[NO_PID]:free_params on line 36: parameter 5 = 3.71000003814697
25+
[NO_PID]:ecpg_free_params on line 36: parameter 5 = 3.71000003814697
2626
[NO_PID]: sqlca: code: 0, state: 00000
27-
[NO_PID]:free_params on line 36: parameter 6 = 487444
27+
[NO_PID]:ecpg_free_params on line 36: parameter 6 = 487444
2828
[NO_PID]: sqlca: code: 0, state: 00000
29-
[NO_PID]:free_params on line 36: parameter 7 = 404.404
29+
[NO_PID]:ecpg_free_params on line 36: parameter 7 = 404.404
3030
[NO_PID]: sqlca: code: 0, state: 00000
3131
[NO_PID]: ecpg_execute on line 36: OK: INSERT 0 1
3232
[NO_PID]: sqlca: code: 0, state: 00000
@@ -36,25 +36,25 @@
3636
[NO_PID]: sqlca: code: 0, state: 00000
3737
[NO_PID]: ecpg_execute on line 52: using PQexecParams
3838
[NO_PID]: sqlca: code: 0, state: 00000
39-
[NO_PID]:free_params on line 52: parameter 1 = null
39+
[NO_PID]:ecpg_free_params on line 52: parameter 1 = null
4040
[NO_PID]: sqlca: code: 0, state: 00000
41-
[NO_PID]:free_params on line 52: parameter 2 = null
41+
[NO_PID]:ecpg_free_params on line 52: parameter 2 = null
4242
[NO_PID]: sqlca: code: 0, state: 00000
43-
[NO_PID]:free_params on line 52: parameter 3 = null
43+
[NO_PID]:ecpg_free_params on line 52: parameter 3 = null
4444
[NO_PID]: sqlca: code: 0, state: 00000
45-
[NO_PID]:free_params on line 52: parameter 4 = t
45+
[NO_PID]:ecpg_free_params on line 52: parameter 4 = t
4646
[NO_PID]: sqlca: code: 0, state: 00000
47-
[NO_PID]:free_params on line 52: parameter 5 = null
47+
[NO_PID]:ecpg_free_params on line 52: parameter 5 = null
4848
[NO_PID]: sqlca: code: 0, state: 00000
49-
[NO_PID]:free_params on line 52: parameter 6 = null
49+
[NO_PID]:ecpg_free_params on line 52: parameter 6 = null
5050
[NO_PID]: sqlca: code: 0, state: 00000
51-
[NO_PID]:free_params on line 52: parameter 7 = null
51+
[NO_PID]:ecpg_free_params on line 52: parameter 7 = null
5252
[NO_PID]: sqlca: code: 0, state: 00000
53-
[NO_PID]:free_params on line 52: parameter 8 = null
53+
[NO_PID]:ecpg_free_params on line 52: parameter 8 = null
5454
[NO_PID]: sqlca: code: 0, state: 00000
55-
[NO_PID]:free_params on line 52: parameter 9 = null
55+
[NO_PID]:ecpg_free_params on line 52: parameter 9 = null
5656
[NO_PID]: sqlca: code: 0, state: 00000
57-
[NO_PID]:free_params on line 52: parameter 10 = null
57+
[NO_PID]:ecpg_free_params on line 52: parameter 10 = null
5858
[NO_PID]: sqlca: code: 0, state: 00000
5959
[NO_PID]: ecpg_execute on line 52: OK: INSERT 0 1
6060
[NO_PID]: sqlca: code: 0, state: 00000

‎src/interfaces/ecpg/test/expected/compat_informix-sqlda.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@
252252
[NO_PID]: sqlca: code: 0, state: 00000
253253
[NO_PID]: ecpg_execute on line 184: using PQexecPrepared for "SELECT * FROM t1 WHERE id = $1"
254254
[NO_PID]: sqlca: code: 0, state: 00000
255-
[NO_PID]:free_params on line 184: parameter 1 = 4
255+
[NO_PID]:ecpg_free_params on line 184: parameter 1 = 4
256256
[NO_PID]: sqlca: code: 0, state: 00000
257257
[NO_PID]: ecpg_execute on line 184: correctly got 1 tuples with 5 fields
258258
[NO_PID]: sqlca: code: 0, state: 00000
@@ -292,7 +292,7 @@
292292
[NO_PID]: sqlca: code: 0, state: 00000
293293
[NO_PID]: ecpg_execute on line 221: using PQexecPrepared for "SELECT * FROM t1 WHERE id = $1"
294294
[NO_PID]: sqlca: code: 0, state: 00000
295-
[NO_PID]:free_params on line 221: parameter 1 = 4
295+
[NO_PID]:ecpg_free_params on line 221: parameter 1 = 4
296296
[NO_PID]: sqlca: code: 0, state: 00000
297297
[NO_PID]: ecpg_execute on line 221: correctly got 1 tuples with 5 fields
298298
[NO_PID]: sqlca: code: 0, state: 00000

‎src/interfaces/ecpg/test/expected/compat_informix-test_informix.stderr

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
[NO_PID]: sqlca: code: 0, state: 00000
1313
[NO_PID]: ecpg_execute on line 28: using PQexecParams
1414
[NO_PID]: sqlca: code: 0, state: 00000
15-
[NO_PID]:free_params on line 28: parameter 1 = 0
15+
[NO_PID]:ecpg_free_params on line 28: parameter 1 = 0
1616
[NO_PID]: sqlca: code: 0, state: 00000
1717
[NO_PID]: ecpg_execute on line 28: OK: INSERT 0 1
1818
[NO_PID]: sqlca: code: 0, state: 00000
@@ -33,7 +33,7 @@ DETAIL: Key (i)=(7) already exists.
3333
[NO_PID]: sqlca: code: 0, state: 00000
3434
[NO_PID]: ecpg_execute on line 36: using PQexecParams
3535
[NO_PID]: sqlca: code: 0, state: 00000
36-
[NO_PID]:free_params on line 36: parameter 1 = 14
36+
[NO_PID]:ecpg_free_params on line 36: parameter 1 = 14
3737
[NO_PID]: sqlca: code: 0, state: 00000
3838
[NO_PID]: ecpg_execute on line 36: OK: INSERT 0 1
3939
[NO_PID]: sqlca: code: 0, state: 00000
@@ -59,7 +59,7 @@ DETAIL: Key (i)=(7) already exists.
5959
[NO_PID]: sqlca: code: 0, state: 00000
6060
[NO_PID]: ecpg_execute on line 95: using PQexecParams
6161
[NO_PID]: sqlca: code: 0, state: 00000
62-
[NO_PID]:free_params on line 95: parameter 1 = 14
62+
[NO_PID]:ecpg_free_params on line 95: parameter 1 = 14
6363
[NO_PID]: sqlca: code: 0, state: 00000
6464
[NO_PID]: ecpg_execute on line 95: OK: DECLARE CURSOR
6565
[NO_PID]: sqlca: code: 0, state: 00000
@@ -99,7 +99,7 @@ DETAIL: Key (i)=(7) already exists.
9999
[NO_PID]: sqlca: code: 0, state: 00000
100100
[NO_PID]: ecpg_execute on line 75: using PQexecParams
101101
[NO_PID]: sqlca: code: 0, state: 00000
102-
[NO_PID]:free_params on line 75: parameter 1 = 21.0
102+
[NO_PID]:ecpg_free_params on line 75: parameter 1 = 21.0
103103
[NO_PID]: sqlca: code: 0, state: 00000
104104
[NO_PID]: ecpg_execute on line 75: OK: DELETE 0
105105
[NO_PID]: sqlca: code: 0, state: 00000

‎src/interfaces/ecpg/test/expected/compat_informix-test_informix2.stderr

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
[NO_PID]: sqlca: code: 0, state: 00000
3333
[NO_PID]: ecpg_execute on line 81: using PQexecParams
3434
[NO_PID]: sqlca: code: 0, state: 00000
35-
[NO_PID]:free_params on line 81: parameter 1 = 2003-05-07 13:28:34
35+
[NO_PID]:ecpg_free_params on line 81: parameter 1 = 2003-05-07 13:28:34
3636
[NO_PID]: sqlca: code: 0, state: 00000
3737
[NO_PID]: ecpg_execute on line 81: correctly got 1 tuples with 2 fields
3838
[NO_PID]: sqlca: code: 0, state: 00000
@@ -44,9 +44,9 @@
4444
[NO_PID]: sqlca: code: 0, state: 00000
4545
[NO_PID]: ecpg_execute on line 95: using PQexecParams
4646
[NO_PID]: sqlca: code: 0, state: 00000
47-
[NO_PID]:free_params on line 95: parameter 1 = 2
47+
[NO_PID]:ecpg_free_params on line 95: parameter 1 = 2
4848
[NO_PID]: sqlca: code: 0, state: 00000
49-
[NO_PID]:free_params on line 95: parameter 2 = 2003-05-08 15:53:39
49+
[NO_PID]:ecpg_free_params on line 95: parameter 2 = 2003-05-08 15:53:39
5050
[NO_PID]: sqlca: code: 0, state: 00000
5151
[NO_PID]: ecpg_execute on line 95: OK: INSERT 0 1
5252
[NO_PID]: sqlca: code: 0, state: 00000

‎src/interfaces/ecpg/test/expected/pgtypeslib-dt_test.stderr

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,17 @@
2424
[NO_PID]: sqlca: code: 0, state: 00000
2525
[NO_PID]: ecpg_execute on line 36: using PQexecParams
2626
[NO_PID]: sqlca: code: 0, state: 00000
27-
[NO_PID]:free_params on line 36: parameter 1 = 1966-01-17
27+
[NO_PID]:ecpg_free_params on line 36: parameter 1 = 1966-01-17
2828
[NO_PID]: sqlca: code: 0, state: 00000
29-
[NO_PID]:free_params on line 36: parameter 2 = 2000-07-12 17:34:29
29+
[NO_PID]:ecpg_free_params on line 36: parameter 2 = 2000-07-12 17:34:29
3030
[NO_PID]: sqlca: code: 0, state: 00000
3131
[NO_PID]: ecpg_execute on line 36: OK: INSERT 0 1
3232
[NO_PID]: sqlca: code: 0, state: 00000
3333
[NO_PID]: ecpg_execute on line 38: query: select * from date_test where d = $1 ; with 1 parameter(s) on connection regress1
3434
[NO_PID]: sqlca: code: 0, state: 00000
3535
[NO_PID]: ecpg_execute on line 38: using PQexecParams
3636
[NO_PID]: sqlca: code: 0, state: 00000
37-
[NO_PID]:free_params on line 38: parameter 1 = 1966-01-17
37+
[NO_PID]:ecpg_free_params on line 38: parameter 1 = 1966-01-17
3838
[NO_PID]: sqlca: code: 0, state: 00000
3939
[NO_PID]: ecpg_execute on line 38: correctly got 1 tuples with 2 fields
4040
[NO_PID]: sqlca: code: 0, state: 00000

‎src/interfaces/ecpg/test/expected/pgtypeslib-nan_test.stderr

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -36,19 +36,19 @@
3636
[NO_PID]: sqlca: code: 0, state: 00000
3737
[NO_PID]: ecpg_execute on line 45: using PQexecParams
3838
[NO_PID]: sqlca: code: 0, state: 00000
39-
[NO_PID]:free_params on line 45: parameter 1 = 1
39+
[NO_PID]:ecpg_free_params on line 45: parameter 1 = 1
4040
[NO_PID]: sqlca: code: 0, state: 00000
41-
[NO_PID]:free_params on line 45: parameter 2 = NaN
41+
[NO_PID]:ecpg_free_params on line 45: parameter 2 = NaN
4242
[NO_PID]: sqlca: code: 0, state: 00000
4343
[NO_PID]: ecpg_execute on line 45: OK: INSERT 0 1
4444
[NO_PID]: sqlca: code: 0, state: 00000
4545
[NO_PID]: ecpg_execute on line 46: query: insert into nantest1 ( id , d ) values ( $1 + 6 , $2 ); with 2 parameter(s) on connection regress1
4646
[NO_PID]: sqlca: code: 0, state: 00000
4747
[NO_PID]: ecpg_execute on line 46: using PQexecParams
4848
[NO_PID]: sqlca: code: 0, state: 00000
49-
[NO_PID]:free_params on line 46: parameter 1 = 1
49+
[NO_PID]:ecpg_free_params on line 46: parameter 1 = 1
5050
[NO_PID]: sqlca: code: 0, state: 00000
51-
[NO_PID]:free_params on line 46: parameter 2 = NaN
51+
[NO_PID]:ecpg_free_params on line 46: parameter 2 = NaN
5252
[NO_PID]: sqlca: code: 0, state: 00000
5353
[NO_PID]: ecpg_execute on line 46: OK: INSERT 0 1
5454
[NO_PID]: sqlca: code: 0, state: 00000
@@ -68,19 +68,19 @@
6868
[NO_PID]: sqlca: code: 0, state: 00000
6969
[NO_PID]: ecpg_execute on line 45: using PQexecParams
7070
[NO_PID]: sqlca: code: 0, state: 00000
71-
[NO_PID]:free_params on line 45: parameter 1 = 2
71+
[NO_PID]:ecpg_free_params on line 45: parameter 1 = 2
7272
[NO_PID]: sqlca: code: 0, state: 00000
73-
[NO_PID]:free_params on line 45: parameter 2 = Infinity
73+
[NO_PID]:ecpg_free_params on line 45: parameter 2 = Infinity
7474
[NO_PID]: sqlca: code: 0, state: 00000
7575
[NO_PID]: ecpg_execute on line 45: OK: INSERT 0 1
7676
[NO_PID]: sqlca: code: 0, state: 00000
7777
[NO_PID]: ecpg_execute on line 46: query: insert into nantest1 ( id , d ) values ( $1 + 6 , $2 ); with 2 parameter(s) on connection regress1
7878
[NO_PID]: sqlca: code: 0, state: 00000
7979
[NO_PID]: ecpg_execute on line 46: using PQexecParams
8080
[NO_PID]: sqlca: code: 0, state: 00000
81-
[NO_PID]:free_params on line 46: parameter 1 = 2
81+
[NO_PID]:ecpg_free_params on line 46: parameter 1 = 2
8282
[NO_PID]: sqlca: code: 0, state: 00000
83-
[NO_PID]:free_params on line 46: parameter 2 = Infinity
83+
[NO_PID]:ecpg_free_params on line 46: parameter 2 = Infinity
8484
[NO_PID]: sqlca: code: 0, state: 00000
8585
[NO_PID]: ecpg_execute on line 46: OK: INSERT 0 1
8686
[NO_PID]: sqlca: code: 0, state: 00000
@@ -100,19 +100,19 @@
100100
[NO_PID]: sqlca: code: 0, state: 00000
101101
[NO_PID]: ecpg_execute on line 45: using PQexecParams
102102
[NO_PID]: sqlca: code: 0, state: 00000
103-
[NO_PID]:free_params on line 45: parameter 1 = 3
103+
[NO_PID]:ecpg_free_params on line 45: parameter 1 = 3
104104
[NO_PID]: sqlca: code: 0, state: 00000
105-
[NO_PID]:free_params on line 45: parameter 2 = -Infinity
105+
[NO_PID]:ecpg_free_params on line 45: parameter 2 = -Infinity
106106
[NO_PID]: sqlca: code: 0, state: 00000
107107
[NO_PID]: ecpg_execute on line 45: OK: INSERT 0 1
108108
[NO_PID]: sqlca: code: 0, state: 00000
109109
[NO_PID]: ecpg_execute on line 46: query: insert into nantest1 ( id , d ) values ( $1 + 6 , $2 ); with 2 parameter(s) on connection regress1
110110
[NO_PID]: sqlca: code: 0, state: 00000
111111
[NO_PID]: ecpg_execute on line 46: using PQexecParams
112112
[NO_PID]: sqlca: code: 0, state: 00000
113-
[NO_PID]:free_params on line 46: parameter 1 = 3
113+
[NO_PID]:ecpg_free_params on line 46: parameter 1 = 3
114114
[NO_PID]: sqlca: code: 0, state: 00000
115-
[NO_PID]:free_params on line 46: parameter 2 = -Infinity
115+
[NO_PID]:ecpg_free_params on line 46: parameter 2 = -Infinity
116116
[NO_PID]: sqlca: code: 0, state: 00000
117117
[NO_PID]: ecpg_execute on line 46: OK: INSERT 0 1
118118
[NO_PID]: sqlca: code: 0, state: 00000
@@ -286,15 +286,15 @@
286286
[NO_PID]: sqlca: code: 0, state: 00000
287287
[NO_PID]: ecpg_execute on line 72: using PQexecParams
288288
[NO_PID]: sqlca: code: 0, state: 00000
289-
[NO_PID]:free_params on line 72: parameter 1 = NaN
289+
[NO_PID]:ecpg_free_params on line 72: parameter 1 = NaN
290290
[NO_PID]: sqlca: code: 0, state: 00000
291291
[NO_PID]: ecpg_execute on line 72: OK: INSERT 0 1
292292
[NO_PID]: sqlca: code: 0, state: 00000
293293
[NO_PID]: ecpg_execute on line 73: query: insert into nantest2 ( id , d ) values ( 6 , $1 ); with 1 parameter(s) on connection regress1
294294
[NO_PID]: sqlca: code: 0, state: 00000
295295
[NO_PID]: ecpg_execute on line 73: using PQexecParams
296296
[NO_PID]: sqlca: code: 0, state: 00000
297-
[NO_PID]:free_params on line 73: parameter 1 = NaN
297+
[NO_PID]:ecpg_free_params on line 73: parameter 1 = NaN
298298
[NO_PID]: sqlca: code: 0, state: 00000
299299
[NO_PID]: ecpg_execute on line 73: OK: INSERT 0 1
300300
[NO_PID]: sqlca: code: 0, state: 00000

‎src/interfaces/ecpg/test/expected/pgtypeslib-num_test.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
[NO_PID]: sqlca: code: 0, state: 00000
1515
[NO_PID]: ecpg_execute on line 60: using PQexecParams
1616
[NO_PID]: sqlca: code: 0, state: 00000
17-
[NO_PID]:free_params on line 60: parameter 1 = 2369.7
17+
[NO_PID]:ecpg_free_params on line 60: parameter 1 = 2369.7
1818
[NO_PID]: sqlca: code: 0, state: 00000
1919
[NO_PID]: ecpg_execute on line 60: OK: INSERT 0 1
2020
[NO_PID]: sqlca: code: 0, state: 00000

‎src/interfaces/ecpg/test/expected/preproc-autoprep.stderr

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
[NO_PID]: sqlca: code: 0, state: 00000
2727
[NO_PID]: ecpg_execute on line 24: using PQexecPrepared for "insert into T values ( 1 , $1 )"
2828
[NO_PID]: sqlca: code: 0, state: 00000
29-
[NO_PID]:free_params on line 24: parameter 1 = 1
29+
[NO_PID]:ecpg_free_params on line 24: parameter 1 = 1
3030
[NO_PID]: sqlca: code: 0, state: 00000
3131
[NO_PID]: ecpg_execute on line 24: OK: INSERT 0 1
3232
[NO_PID]: sqlca: code: 0, state: 00000
@@ -36,7 +36,7 @@
3636
[NO_PID]: sqlca: code: 0, state: 00000
3737
[NO_PID]: ecpg_execute on line 26: using PQexecPrepared for "insert into T values ( 1 , $1 )"
3838
[NO_PID]: sqlca: code: 0, state: 00000
39-
[NO_PID]:free_params on line 26: parameter 1 = 2
39+
[NO_PID]:ecpg_free_params on line 26: parameter 1 = 2
4040
[NO_PID]: sqlca: code: 0, state: 00000
4141
[NO_PID]: ecpg_execute on line 26: OK: INSERT 0 1
4242
[NO_PID]: sqlca: code: 0, state: 00000
@@ -186,7 +186,7 @@
186186
[NO_PID]: sqlca: code: 0, state: 00000
187187
[NO_PID]: ecpg_execute on line 24: using PQexecPrepared for "insert into T values ( 1 , $1 )"
188188
[NO_PID]: sqlca: code: 0, state: 00000
189-
[NO_PID]:free_params on line 24: parameter 1 = 1
189+
[NO_PID]:ecpg_free_params on line 24: parameter 1 = 1
190190
[NO_PID]: sqlca: code: 0, state: 00000
191191
[NO_PID]: ecpg_execute on line 24: OK: INSERT 0 1
192192
[NO_PID]: sqlca: code: 0, state: 00000
@@ -196,7 +196,7 @@
196196
[NO_PID]: sqlca: code: 0, state: 00000
197197
[NO_PID]: ecpg_execute on line 26: using PQexecPrepared for "insert into T values ( 1 , $1 )"
198198
[NO_PID]: sqlca: code: 0, state: 00000
199-
[NO_PID]:free_params on line 26: parameter 1 = 2
199+
[NO_PID]:ecpg_free_params on line 26: parameter 1 = 2
200200
[NO_PID]: sqlca: code: 0, state: 00000
201201
[NO_PID]: ecpg_execute on line 26: OK: INSERT 0 1
202202
[NO_PID]: sqlca: code: 0, state: 00000

‎src/interfaces/ecpg/test/expected/preproc-type.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
[NO_PID]: sqlca: code: 0, state: 00000
1919
[NO_PID]: ecpg_execute on line 65: using PQexecParams
2020
[NO_PID]: sqlca: code: 0, state: 00000
21-
[NO_PID]:free_params on line 65: parameter 1 = 1
21+
[NO_PID]:ecpg_free_params on line 65: parameter 1 = 1
2222
[NO_PID]: sqlca: code: 0, state: 00000
2323
[NO_PID]: ecpg_execute on line 65: correctly got 1 tuples with 6 fields
2424
[NO_PID]: sqlca: code: 0, state: 00000

‎src/interfaces/ecpg/test/expected/sql-array.stderr

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,21 +22,21 @@
2222
[NO_PID]: sqlca: code: 0, state: 00000
2323
[NO_PID]: ecpg_execute on line 37: using PQexecParams
2424
[NO_PID]: sqlca: code: 0, state: 00000
25-
[NO_PID]:free_params on line 37: parameter 1 = {9,8,7,6,5,4,3,2,1,0}
25+
[NO_PID]:ecpg_free_params on line 37: parameter 1 = {9,8,7,6,5,4,3,2,1,0}
2626
[NO_PID]: sqlca: code: 0, state: 00000
27-
[NO_PID]:free_params on line 37: parameter 2 = klmnopqrst
27+
[NO_PID]:ecpg_free_params on line 37: parameter 2 = klmnopqrst
2828
[NO_PID]: sqlca: code: 0, state: 00000
2929
[NO_PID]: ecpg_execute on line 37: OK: INSERT 0 1
3030
[NO_PID]: sqlca: code: 0, state: 00000
3131
[NO_PID]: ecpg_execute on line 39: query: insert into test ( f , i , a , text ) values ( 14.07 , $1 , $2 , $3 ); with 3 parameter(s) on connection regress1
3232
[NO_PID]: sqlca: code: 0, state: 00000
3333
[NO_PID]: ecpg_execute on line 39: using PQexecParams
3434
[NO_PID]: sqlca: code: 0, state: 00000
35-
[NO_PID]:free_params on line 39: parameter 1 = 1
35+
[NO_PID]:ecpg_free_params on line 39: parameter 1 = 1
3636
[NO_PID]: sqlca: code: 0, state: 00000
37-
[NO_PID]:free_params on line 39: parameter 2 = {9,8,7,6,5,4,3,2,1,0}
37+
[NO_PID]:ecpg_free_params on line 39: parameter 2 = {9,8,7,6,5,4,3,2,1,0}
3838
[NO_PID]: sqlca: code: 0, state: 00000
39-
[NO_PID]:free_params on line 39: parameter 3 = 0123456789
39+
[NO_PID]:ecpg_free_params on line 39: parameter 3 = 0123456789
4040
[NO_PID]: sqlca: code: 0, state: 00000
4141
[NO_PID]: ecpg_execute on line 39: OK: INSERT 0 1
4242
[NO_PID]: sqlca: code: 0, state: 00000
@@ -58,7 +58,7 @@
5858
[NO_PID]: sqlca: code: 0, state: 00000
5959
[NO_PID]: ecpg_execute on line 53: using PQexecParams
6060
[NO_PID]: sqlca: code: 0, state: 00000
61-
[NO_PID]:free_params on line 53: parameter 1 = 140787
61+
[NO_PID]:ecpg_free_params on line 53: parameter 1 = 140787
6262
[NO_PID]: sqlca: code: 0, state: 00000
6363
[NO_PID]: ecpg_execute on line 53: correctly got 1 tuples with 2 fields
6464
[NO_PID]: sqlca: code: 0, state: 00000
@@ -72,7 +72,7 @@
7272
[NO_PID]: sqlca: code: 0, state: 00000
7373
[NO_PID]: ecpg_execute on line 63: using PQexecParams
7474
[NO_PID]: sqlca: code: 0, state: 00000
75-
[NO_PID]:free_params on line 63: parameter 1 = 140787
75+
[NO_PID]:ecpg_free_params on line 63: parameter 1 = 140787
7676
[NO_PID]: sqlca: code: 0, state: 00000
7777
[NO_PID]: ecpg_execute on line 63: correctly got 1 tuples with 1 fields
7878
[NO_PID]: sqlca: code: 0, state: 00000

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp