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

Commitaa130f5

Browse files
author
Michael Meskes
committed
Fixed compiler warning for enum handling
1 parent146242f commitaa130f5

36 files changed

+244
-244
lines changed

‎src/interfaces/ecpg/preproc/output.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/output.c,v 1.20 2007/08/14 10:01:53 meskes Exp $ */
1+
/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/output.c,v 1.21 2007/08/14 10:32:47 meskes Exp $ */
22

33
#include"postgres_fe.h"
44

@@ -113,9 +113,9 @@ output_statement(char *stmt, int whenever_mode, enum ECPG_statement_type st)
113113
if (st==ECPGst_normal)
114114
{
115115
if (auto_prepare)
116-
fprintf(yyout,"%d, \"",ECPGst_prepnormal);
116+
fputs("ECPGst_prepnormal, \"",yyout);
117117
else
118-
fprintf(yyout,"%d, \"",ECPGst_normal);
118+
fputs("ECPGst_normal, \"",yyout);
119119

120120
output_escaped_str(stmt, false);
121121
fputs("\", ",yyout);

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ if (sqlca.sqlcode < 0) sqlprint ( );}
106106
#line 29 "rnull.pgc"
107107

108108

109-
{ECPGdo(__LINE__,1,0,NULL,0,0,"create table test ( id int , c char ( 10 ) , s smallint , i int , b bool , f float , l bigint , dbl double precision , dec decimal , dat date , tmp timestamptz ) ",ECPGt_EOIT,ECPGt_EORT);
109+
{ECPGdo(__LINE__,1,0,NULL,0,ECPGst_normal,"create table test ( id int , c char ( 10 ) , s smallint , i int , b bool , f float , l bigint , dbl double precision , dec decimal , dat date , tmp timestamptz ) ",ECPGt_EOIT,ECPGt_EORT);
110110
#line 33 "rnull.pgc"
111111

112112
if (sqlca.sqlcode<0)sqlprint ( );}
@@ -119,7 +119,7 @@ if (sqlca.sqlcode < 0) sqlprint ( );}
119119
#line 34 "rnull.pgc"
120120

121121

122-
{ECPGdo(__LINE__,1,0,NULL,0,0,"insert into test ( id , c , s , i , b , f , l , dbl ) values ( 1 , $1 , $2 , $3 , $4 , $5 , $6 , $7 ) ",
122+
{ECPGdo(__LINE__,1,0,NULL,0,ECPGst_normal,"insert into test ( id , c , s , i , b , f , l , dbl ) values ( 1 , $1 , $2 , $3 , $4 , $5 , $6 , $7 ) ",
123123
ECPGt_char,(c),(long)sizeof("abc"),(long)1,(sizeof("abc"))*sizeof(char),
124124
ECPGt_NO_INDICATOR,NULL ,0L,0L,0L,
125125
ECPGt_short,&(s),(long)1,(long)1,sizeof(short),
@@ -157,7 +157,7 @@ if (sqlca.sqlcode < 0) sqlprint ( );}
157157
rsetnull(CDATETYPE, (char*)&dat);
158158
rsetnull(CDTIMETYPE, (char*)&tmp);
159159

160-
{ECPGdo(__LINE__,1,0,NULL,0,0,"insert into test ( id , c , s , i , b , f , l , dbl , dec , dat , tmp ) values ( 2 , $1 , $2 , $3 , $4 , $5 , $6 , $7 , $8 , $9 , $10 ) ",
160+
{ECPGdo(__LINE__,1,0,NULL,0,ECPGst_normal,"insert into test ( id , c , s , i , b , f , l , dbl , dec , dat , tmp ) values ( 2 , $1 , $2 , $3 , $4 , $5 , $6 , $7 , $8 , $9 , $10 ) ",
161161
ECPGt_char,(c),(long)sizeof("abc"),(long)1,(sizeof("abc"))*sizeof(char),
162162
ECPGt_NO_INDICATOR,NULL ,0L,0L,0L,
163163
ECPGt_short,&(s),(long)1,(long)1,sizeof(short),
@@ -192,7 +192,7 @@ if (sqlca.sqlcode < 0) sqlprint ( );}
192192

193193
printf("first select\n");
194194

195-
{ECPGdo(__LINE__,1,0,NULL,0,0,"select c , s , i , b , f , l , dbl , dec , dat , tmp from test where id = 1 ",ECPGt_EOIT,
195+
{ECPGdo(__LINE__,1,0,NULL,0,ECPGst_normal,"select c , s , i , b , f , l , dbl , dec , dat , tmp from test where id = 1 ",ECPGt_EOIT,
196196
ECPGt_char,(c),(long)sizeof("abc"),(long)1,(sizeof("abc"))*sizeof(char),
197197
ECPGt_NO_INDICATOR,NULL ,0L,0L,0L,
198198
ECPGt_short,&(s),(long)1,(long)1,sizeof(short),
@@ -232,7 +232,7 @@ if (sqlca.sqlcode < 0) sqlprint ( );}
232232

233233
printf("second select\n");
234234

235-
{ECPGdo(__LINE__,1,0,NULL,0,0,"select c , s , i , b , f , l , dbl , dec , dat , tmp from test where id = 2 ",ECPGt_EOIT,
235+
{ECPGdo(__LINE__,1,0,NULL,0,ECPGst_normal,"select c , s , i , b , f , l , dbl , dec , dat , tmp from test where id = 2 ",ECPGt_EOIT,
236236
ECPGt_char,(c),(long)sizeof("abc"),(long)1,(sizeof("abc"))*sizeof(char),
237237
ECPGt_NO_INDICATOR,NULL ,0L,0L,0L,
238238
ECPGt_short,&(s),(long)1,(long)1,sizeof(short),
@@ -270,7 +270,7 @@ if (sqlca.sqlcode < 0) sqlprint ( );}
270270
test_null(CDATETYPE, (char*)&dat);
271271
test_null(CDTIMETYPE, (char*)&tmp);
272272

273-
{ECPGdo(__LINE__,1,0,NULL,0,0,"drop table test ",ECPGt_EOIT,ECPGt_EORT);
273+
{ECPGdo(__LINE__,1,0,NULL,0,ECPGst_normal,"drop table test ",ECPGt_EOIT,ECPGt_EORT);
274274
#line 91 "rnull.pgc"
275275

276276
if (sqlca.sqlcode<0)sqlprint ( );}

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ if (sqlca.sqlcode < 0) dosqlprint ( );}
5858

5959
if (sqlca.sqlcode!=0)exit(1);
6060

61-
{ECPGdo(__LINE__,1,1,NULL,0,0,"create table test ( i int primary key , j int ) ",ECPGt_EOIT,ECPGt_EORT);
61+
{ECPGdo(__LINE__,1,1,NULL,0,ECPGst_normal,"create table test ( i int primary key , j int ) ",ECPGt_EOIT,ECPGt_EORT);
6262
#line 23 "test_informix.pgc"
6363

6464
if (sqlca.sqlcode<0)dosqlprint ( );}
@@ -67,7 +67,7 @@ if (sqlca.sqlcode < 0) dosqlprint ( );}
6767

6868
/* this INSERT works */
6969
rsetnull(CDECIMALTYPE, (char*)&j);
70-
{ECPGdo(__LINE__,1,1,NULL,0,0,"insert into test ( i , j ) values ( 7 , $1 ) ",
70+
{ECPGdo(__LINE__,1,1,NULL,0,ECPGst_normal,"insert into test ( i , j ) values ( 7 , $1 ) ",
7171
ECPGt_decimal,&(j),(long)1,(long)1,sizeof(decimal),
7272
ECPGt_NO_INDICATOR,NULL ,0L,0L,0L,ECPGt_EOIT,ECPGt_EORT);
7373
#line 27 "test_informix.pgc"
@@ -83,7 +83,7 @@ if (sqlca.sqlcode < 0) dosqlprint ( );}
8383

8484

8585
/* this INSERT should fail because i is a unique column */
86-
{ECPGdo(__LINE__,1,1,NULL,0,0,"insert into test ( i , j ) values ( 7 , 12 ) ",ECPGt_EOIT,ECPGt_EORT);
86+
{ECPGdo(__LINE__,1,1,NULL,0,ECPGst_normal,"insert into test ( i , j ) values ( 7 , 12 ) ",ECPGt_EOIT,ECPGt_EORT);
8787
#line 31 "test_informix.pgc"
8888

8989
if (sqlca.sqlcode<0)dosqlprint ( );}
@@ -97,7 +97,7 @@ if (sqlca.sqlcode < 0) dosqlprint ( );}
9797
#line 33 "test_informix.pgc"
9898

9999

100-
{ECPGdo(__LINE__,1,1,NULL,0,0,"insert into test ( i , j ) values ( $1 , 1 ) ",
100+
{ECPGdo(__LINE__,1,1,NULL,0,ECPGst_normal,"insert into test ( i , j ) values ( $1 , 1 ) ",
101101
ECPGt_int,&(i),(long)1,(long)1,sizeof(int),
102102
ECPGt_NO_INDICATOR,NULL ,0L,0L,0L,ECPGt_EOIT,ECPGt_EORT);
103103
#line 35 "test_informix.pgc"
@@ -113,7 +113,7 @@ if (sqlca.sqlcode < 0) dosqlprint ( );}
113113

114114

115115
/* this will fail (more than one row in subquery) */
116-
{ECPGdo(__LINE__,1,1,NULL,0,0,"select i from test where j = ( select j from test ) ",ECPGt_EOIT,ECPGt_EORT);
116+
{ECPGdo(__LINE__,1,1,NULL,0,ECPGst_normal,"select i from test where j = ( select j from test ) ",ECPGt_EOIT,ECPGt_EORT);
117117
#line 39 "test_informix.pgc"
118118

119119
if (sqlca.sqlcode<0)dosqlprint ( );}
@@ -127,7 +127,7 @@ if (sqlca.sqlcode < 0) dosqlprint ( );}
127127

128128

129129
/* this however should be ok */
130-
{ECPGdo(__LINE__,1,1,NULL,0,0,"select i from test where j = ( select j from test order by i limit 1 ) ",ECPGt_EOIT,ECPGt_EORT);
130+
{ECPGdo(__LINE__,1,1,NULL,0,ECPGst_normal,"select i from test where j = ( select j from test order by i limit 1 ) ",ECPGt_EOIT,ECPGt_EORT);
131131
#line 43 "test_informix.pgc"
132132

133133
if (sqlca.sqlcode<0)dosqlprint ( );}
@@ -151,7 +151,7 @@ if (sqlca.sqlcode < 0) dosqlprint ( );}
151151

152152
while (1)
153153
{
154-
{ECPGdo(__LINE__,1,1,NULL,0,0,"fetch forward from c",ECPGt_EOIT,
154+
{ECPGdo(__LINE__,1,1,NULL,0,ECPGst_normal,"fetch forward from c",ECPGt_EOIT,
155155
ECPGt_int,&(i),(long)1,(long)1,sizeof(int),
156156
ECPGt_NO_INDICATOR,NULL ,0L,0L,0L,
157157
ECPGt_decimal,&(j),(long)1,(long)1,sizeof(decimal),
@@ -178,7 +178,7 @@ if (sqlca.sqlcode < 0) dosqlprint ( );}
178178
deccvint(7,&j);
179179
deccvint(14,&m);
180180
decadd(&j,&m,&n);
181-
{ECPGdo(__LINE__,1,1,NULL,0,0,"delete from test where i = $1 :: decimal ",
181+
{ECPGdo(__LINE__,1,1,NULL,0,ECPGst_normal,"delete from test where i = $1 :: decimal ",
182182
ECPGt_decimal,&(n),(long)1,(long)1,sizeof(decimal),
183183
ECPGt_NO_INDICATOR,NULL ,0L,0L,0L,ECPGt_EOIT,ECPGt_EORT);
184184
#line 72 "test_informix.pgc"
@@ -188,15 +188,15 @@ if (sqlca.sqlcode < 0) dosqlprint ( );}
188188

189189
printf("DELETE: %ld\n",sqlca.sqlcode);
190190

191-
{ECPGdo(__LINE__,1,1,NULL,0,0,"select 1 from test where i = 14 ",ECPGt_EOIT,ECPGt_EORT);
191+
{ECPGdo(__LINE__,1,1,NULL,0,ECPGst_normal,"select 1 from test where i = 14 ",ECPGt_EOIT,ECPGt_EORT);
192192
#line 75 "test_informix.pgc"
193193

194194
if (sqlca.sqlcode<0)dosqlprint ( );}
195195
#line 75 "test_informix.pgc"
196196

197197
printf("Exists: %ld\n",sqlca.sqlcode);
198198

199-
{ECPGdo(__LINE__,1,1,NULL,0,0,"select 1 from test where i = 147 ",ECPGt_EOIT,ECPGt_EORT);
199+
{ECPGdo(__LINE__,1,1,NULL,0,ECPGst_normal,"select 1 from test where i = 147 ",ECPGt_EOIT,ECPGt_EORT);
200200
#line 78 "test_informix.pgc"
201201

202202
if (sqlca.sqlcode<0)dosqlprint ( );}
@@ -210,7 +210,7 @@ if (sqlca.sqlcode < 0) dosqlprint ( );}
210210
if (sqlca.sqlcode<0)dosqlprint ( );}
211211
#line 81 "test_informix.pgc"
212212

213-
{ECPGdo(__LINE__,1,1,NULL,0,0,"drop table test ",ECPGt_EOIT,ECPGt_EORT);
213+
{ECPGdo(__LINE__,1,1,NULL,0,ECPGst_normal,"drop table test ",ECPGt_EOIT,ECPGt_EORT);
214214
#line 82 "test_informix.pgc"
215215

216216
if (sqlca.sqlcode<0)dosqlprint ( );}
@@ -235,7 +235,7 @@ if (sqlca.sqlcode < 0) dosqlprint ( );}
235235

236236
staticvoidopenit(void)
237237
{
238-
{ECPGdo(__LINE__,1,1,NULL,0,0,"declare c cursor for select * from test where i <= $1 ",
238+
{ECPGdo(__LINE__,1,1,NULL,0,ECPGst_normal,"declare c cursor for select * from test where i <= $1 ",
239239
ECPGt_int,&(*(int*)(ECPG_informix_get_var(0))),(long)1,(long)1,sizeof(int),
240240
ECPGt_NO_INDICATOR,NULL ,0L,0L,0L,ECPGt_EOIT,ECPGt_EORT);
241241
#line 92 "test_informix.pgc"

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -180,30 +180,30 @@ if (sqlca.sqlcode < 0) sqlprint();}
180180

181181
sql_check("main","connect",0);
182182

183-
{ECPGdo(__LINE__,1,1,NULL,0,0,"set DateStyle to 'DMY'",ECPGt_EOIT,ECPGt_EORT);
183+
{ECPGdo(__LINE__,1,1,NULL,0,ECPGst_normal,"set DateStyle to 'DMY'",ECPGt_EOIT,ECPGt_EORT);
184184
#line 66 "test_informix2.pgc"
185185

186186
if (sqlca.sqlcode<0)sqlprint();}
187187
#line 66 "test_informix2.pgc"
188188

189189

190-
{ECPGdo(__LINE__,1,1,NULL,0,0,"create table history ( customerid integer , timestamp timestamp without time zone , action_taken char ( 5 ) , narrative varchar ( 100 ) ) ",ECPGt_EOIT,ECPGt_EORT);
190+
{ECPGdo(__LINE__,1,1,NULL,0,ECPGst_normal,"create table history ( customerid integer , timestamp timestamp without time zone , action_taken char ( 5 ) , narrative varchar ( 100 ) ) ",ECPGt_EOIT,ECPGt_EORT);
191191
#line 68 "test_informix2.pgc"
192192

193193
if (sqlca.sqlcode<0)sqlprint();}
194194
#line 68 "test_informix2.pgc"
195195

196196
sql_check("main","create",0);
197197

198-
{ECPGdo(__LINE__,1,1,NULL,0,0,"insert into history ( customerid , timestamp , action_taken , narrative ) values ( 1 , '2003-05-07 13:28:34 CEST' , 'test' , 'test' ) ",ECPGt_EOIT,ECPGt_EORT);
198+
{ECPGdo(__LINE__,1,1,NULL,0,ECPGst_normal,"insert into history ( customerid , timestamp , action_taken , narrative ) values ( 1 , '2003-05-07 13:28:34 CEST' , 'test' , 'test' ) ",ECPGt_EOIT,ECPGt_EORT);
199199
#line 73 "test_informix2.pgc"
200200

201201
if (sqlca.sqlcode<0)sqlprint();}
202202
#line 73 "test_informix2.pgc"
203203

204204
sql_check("main","insert",0);
205205

206-
{ECPGdo(__LINE__,1,1,NULL,0,0,"select max ( timestamp ) from history ",ECPGt_EOIT,
206+
{ECPGdo(__LINE__,1,1,NULL,0,ECPGst_normal,"select max ( timestamp ) from history ",ECPGt_EOIT,
207207
ECPGt_timestamp,&(maxd),(long)1,(long)1,sizeof(timestamp),
208208
ECPGt_NO_INDICATOR,NULL ,0L,0L,0L,ECPGt_EORT);
209209
#line 78 "test_informix2.pgc"
@@ -213,7 +213,7 @@ if (sqlca.sqlcode < 0) sqlprint();}
213213

214214
sql_check("main","select max",100);
215215

216-
{ECPGdo(__LINE__,1,1,NULL,0,0,"select customerid , timestamp from history where timestamp = $1 limit 1 ",
216+
{ECPGdo(__LINE__,1,1,NULL,0,ECPGst_normal,"select customerid , timestamp from history where timestamp = $1 limit 1 ",
217217
ECPGt_timestamp,&(maxd),(long)1,(long)1,sizeof(timestamp),
218218
ECPGt_NO_INDICATOR,NULL ,0L,0L,0L,ECPGt_EOIT,
219219
ECPGt_int,&(c),(long)1,(long)1,sizeof(int),
@@ -234,7 +234,7 @@ if (sqlca.sqlcode < 0) sqlprint();}
234234
free(intvl);
235235
c++;
236236

237-
{ECPGdo(__LINE__,1,1,NULL,0,0,"insert into history ( customerid , timestamp , action_taken , narrative ) values ( $1 , $2 , 'test' , 'test' ) ",
237+
{ECPGdo(__LINE__,1,1,NULL,0,ECPGst_normal,"insert into history ( customerid , timestamp , action_taken , narrative ) values ( $1 , $2 , 'test' , 'test' ) ",
238238
ECPGt_int,&(c),(long)1,(long)1,sizeof(int),
239239
ECPGt_NO_INDICATOR,NULL ,0L,0L,0L,
240240
ECPGt_timestamp,&(e),(long)1,(long)1,sizeof(timestamp),
@@ -253,7 +253,7 @@ if (sqlca.sqlcode < 0) sqlprint();}
253253
#line 100 "test_informix2.pgc"
254254

255255

256-
{ECPGdo(__LINE__,1,1,NULL,0,0,"drop table history ",ECPGt_EOIT,ECPGt_EORT);
256+
{ECPGdo(__LINE__,1,1,NULL,0,ECPGst_normal,"drop table history ",ECPGt_EOIT,ECPGt_EORT);
257257
#line 102 "test_informix2.pgc"
258258

259259
if (sqlca.sqlcode<0)sqlprint();}

‎src/interfaces/ecpg/test/expected/connect-test2.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,17 +56,17 @@ main(void)
5656

5757

5858
/* this selects from "second" which was opened last */
59-
{ECPGdo(__LINE__,0,1,NULL,0,0,"select current_database () ",ECPGt_EOIT,
59+
{ECPGdo(__LINE__,0,1,NULL,0,ECPGst_normal,"select current_database () ",ECPGt_EOIT,
6060
ECPGt_char,(res),(long)200,(long)1,(200)*sizeof(char),
6161
ECPGt_NO_INDICATOR,NULL ,0L,0L,0L,ECPGt_EORT);}
6262
#line 28 "test2.pgc"
6363

64-
{ECPGdo(__LINE__,0,1,"first",0,0,"select current_database () ",ECPGt_EOIT,
64+
{ECPGdo(__LINE__,0,1,"first",0,ECPGst_normal,"select current_database () ",ECPGt_EOIT,
6565
ECPGt_char,(res),(long)200,(long)1,(200)*sizeof(char),
6666
ECPGt_NO_INDICATOR,NULL ,0L,0L,0L,ECPGt_EORT);}
6767
#line 29 "test2.pgc"
6868

69-
{ECPGdo(__LINE__,0,1,"second",0,0,"select current_database () ",ECPGt_EOIT,
69+
{ECPGdo(__LINE__,0,1,"second",0,ECPGst_normal,"select current_database () ",ECPGt_EOIT,
7070
ECPGt_char,(res),(long)200,(long)1,(200)*sizeof(char),
7171
ECPGt_NO_INDICATOR,NULL ,0L,0L,0L,ECPGt_EORT);}
7272
#line 30 "test2.pgc"
@@ -75,7 +75,7 @@ main(void)
7575
{ECPGsetconn(__LINE__,"first");}
7676
#line 32 "test2.pgc"
7777

78-
{ECPGdo(__LINE__,0,1,NULL,0,0,"select current_database () ",ECPGt_EOIT,
78+
{ECPGdo(__LINE__,0,1,NULL,0,ECPGst_normal,"select current_database () ",ECPGt_EOIT,
7979
ECPGt_char,(res),(long)200,(long)1,(200)*sizeof(char),
8080
ECPGt_NO_INDICATOR,NULL ,0L,0L,0L,ECPGt_EORT);}
8181
#line 33 "test2.pgc"
@@ -85,7 +85,7 @@ main(void)
8585
{ECPGdisconnect(__LINE__,"CURRENT");}
8686
#line 36 "test2.pgc"
8787

88-
{ECPGdo(__LINE__,0,1,NULL,0,0,"select current_database () ",ECPGt_EOIT,
88+
{ECPGdo(__LINE__,0,1,NULL,0,ECPGst_normal,"select current_database () ",ECPGt_EOIT,
8989
ECPGt_char,(res),(long)200,(long)1,(200)*sizeof(char),
9090
ECPGt_NO_INDICATOR,NULL ,0L,0L,0L,ECPGt_EORT);}
9191
#line 37 "test2.pgc"

‎src/interfaces/ecpg/test/expected/connect-test3.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ main(void)
5555

5656

5757
/* this selects from "second" which was opened last */
58-
{ECPGdo(__LINE__,0,1,NULL,0,0,"select current_database () ",ECPGt_EOIT,
58+
{ECPGdo(__LINE__,0,1,NULL,0,ECPGst_normal,"select current_database () ",ECPGt_EOIT,
5959
ECPGt_char,(res),(long)200,(long)1,(200)*sizeof(char),
6060
ECPGt_NO_INDICATOR,NULL ,0L,0L,0L,ECPGt_EORT);}
6161
#line 27 "test3.pgc"
@@ -65,7 +65,7 @@ main(void)
6565
{ECPGdisconnect(__LINE__,"CURRENT");}
6666
#line 30 "test3.pgc"
6767

68-
{ECPGdo(__LINE__,0,1,NULL,0,0,"select current_database () ",ECPGt_EOIT,
68+
{ECPGdo(__LINE__,0,1,NULL,0,ECPGst_normal,"select current_database () ",ECPGt_EOIT,
6969
ECPGt_char,(res),(long)200,(long)1,(200)*sizeof(char),
7070
ECPGt_NO_INDICATOR,NULL ,0L,0L,0L,ECPGt_EORT);}
7171
#line 31 "test3.pgc"

‎src/interfaces/ecpg/test/expected/connect-test5.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ main(void)
4040
{ECPGconnect(__LINE__,0,"connectdb" ,NULL,NULL ,"main",0); }
4141
#line 22 "test5.pgc"
4242

43-
{ECPGdo(__LINE__,0,1,NULL,0,0,"alter user connectuser encrypted password 'connectpw'",ECPGt_EOIT,ECPGt_EORT);}
43+
{ECPGdo(__LINE__,0,1,NULL,0,ECPGst_normal,"alter user connectuser encrypted password 'connectpw'",ECPGt_EOIT,ECPGt_EORT);}
4444
#line 23 "test5.pgc"
4545

4646
{ECPGdisconnect(__LINE__,"CURRENT");}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,13 @@ main(void)
6666
if (sqlca.sqlcode<0)sqlprint ( );}
6767
#line 28 "dt_test.pgc"
6868

69-
{ECPGdo(__LINE__,0,1,NULL,0,0,"create table date_test ( d date , ts timestamp ) ",ECPGt_EOIT,ECPGt_EORT);
69+
{ECPGdo(__LINE__,0,1,NULL,0,ECPGst_normal,"create table date_test ( d date , ts timestamp ) ",ECPGt_EOIT,ECPGt_EORT);
7070
#line 29 "dt_test.pgc"
7171

7272
if (sqlca.sqlcode<0)sqlprint ( );}
7373
#line 29 "dt_test.pgc"
7474

75-
{ECPGdo(__LINE__,0,1,NULL,0,0,"set datestyle to iso",ECPGt_EOIT,ECPGt_EORT);
75+
{ECPGdo(__LINE__,0,1,NULL,0,ECPGst_normal,"set datestyle to iso",ECPGt_EOIT,ECPGt_EORT);
7676
#line 30 "dt_test.pgc"
7777

7878
if (sqlca.sqlcode<0)sqlprint ( );}
@@ -82,7 +82,7 @@ if (sqlca.sqlcode < 0) sqlprint ( );}
8282
date1=PGTYPESdate_from_asc(d1,NULL);
8383
ts1=PGTYPEStimestamp_from_asc(t1,NULL);
8484

85-
{ECPGdo(__LINE__,0,1,NULL,0,0,"insert into date_test ( d , ts ) values ( $1 , $2 ) ",
85+
{ECPGdo(__LINE__,0,1,NULL,0,ECPGst_normal,"insert into date_test ( d , ts ) values ( $1 , $2 ) ",
8686
ECPGt_date,&(date1),(long)1,(long)1,sizeof(date),
8787
ECPGt_NO_INDICATOR,NULL ,0L,0L,0L,
8888
ECPGt_timestamp,&(ts1),(long)1,(long)1,sizeof(timestamp),
@@ -93,7 +93,7 @@ if (sqlca.sqlcode < 0) sqlprint ( );}
9393
#line 35 "dt_test.pgc"
9494

9595

96-
{ECPGdo(__LINE__,0,1,NULL,0,0,"select * from date_test where d = $1 ",
96+
{ECPGdo(__LINE__,0,1,NULL,0,ECPGst_normal,"select * from date_test where d = $1 ",
9797
ECPGt_date,&(date1),(long)1,(long)1,sizeof(date),
9898
ECPGt_NO_INDICATOR,NULL ,0L,0L,0L,ECPGt_EOIT,
9999
ECPGt_date,&(date1),(long)1,(long)1,sizeof(date),

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ if (sqlca.sqlcode < 0) sqlprint ( );}
6868
if (sqlca.sqlcode<0)sqlprint ( );}
6969
#line 34 "num_test.pgc"
7070

71-
{ECPGdo(__LINE__,0,1,NULL,0,0,"create table test ( text char ( 5 ) , num numeric ( 14 , 7 ) ) ",ECPGt_EOIT,ECPGt_EORT);
71+
{ECPGdo(__LINE__,0,1,NULL,0,ECPGst_normal,"create table test ( text char ( 5 ) , num numeric ( 14 , 7 ) ) ",ECPGt_EOIT,ECPGt_EORT);
7272
#line 35 "num_test.pgc"
7373

7474
if (sqlca.sqlcode<0)sqlprint ( );}
@@ -98,7 +98,7 @@ if (sqlca.sqlcode < 0) sqlprint ( );}
9898

9999
des=PGTYPESnumeric_new();
100100
PGTYPESnumeric_copy(res,des);
101-
{ECPGdo(__LINE__,0,1,NULL,0,0,"insert into test ( text , num ) values ( 'test' , $1 ) ",
101+
{ECPGdo(__LINE__,0,1,NULL,0,ECPGst_normal,"insert into test ( text , num ) values ( 'test' , $1 ) ",
102102
ECPGt_numeric,&(des),(long)1,(long)0,sizeof(numeric),
103103
ECPGt_NO_INDICATOR,NULL ,0L,0L,0L,ECPGt_EOIT,ECPGt_EORT);
104104
#line 60 "num_test.pgc"
@@ -111,7 +111,7 @@ if (sqlca.sqlcode < 0) sqlprint ( );}
111111
PGTYPESnumeric_mul(value1,value2,res);
112112
PGTYPESnumeric_free(value2);
113113

114-
{ECPGdo(__LINE__,0,1,NULL,0,0,"select num from test where text = 'test' ",ECPGt_EOIT,
114+
{ECPGdo(__LINE__,0,1,NULL,0,ECPGst_normal,"select num from test where text = 'test' ",ECPGt_EOIT,
115115
ECPGt_numeric,&(des),(long)1,(long)0,sizeof(numeric),
116116
ECPGt_NO_INDICATOR,NULL ,0L,0L,0L,ECPGt_EORT);
117117
#line 66 "num_test.pgc"

0 commit comments

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