Skip to content

Commit 822697a

Browse files
author
Michael Meskes
committed
Removed test case using nan as float value because printf's output for nan is
OS specific with some distinguishing between signaling and quiet nans. It's not really importnat for us here anyway.
1 parent 858dc6d commit 822697a

File tree

8 files changed

+315
-459
lines changed

8 files changed

+315
-459
lines changed

‎src/interfaces/ecpg/test/compat_informix/sqlda.pgc‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ exec sql end declare section;
8282
exec sql insert into t1 values
8383
(1, 'a', 1.0, 1, 'a'),
8484
(2, null, null, null, null),
85-
(3, '"c"', -3, 'nan'::float8, 'c'),
8685
(4, 'd', 4.0, 4, 'd');
8786

8887
strcpy(msg, "commit");

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

Lines changed: 57 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -208,19 +208,19 @@ if (sqlca.sqlcode < 0) exit (1);}
208208

209209

210210
strcpy(msg, "insert");
211-
{ ECPGdo(__LINE__, 1, 1, NULL, 0, ECPGst_normal, "insert into t1 values ( 1 , 'a' , 1.0 , 1 , 'a' ) , ( 2 , null , null , null , null ) , ( 3 , '\"c\"' , - 3 , 'nan' :: float8 , 'c' ) , ( 4 , 'd' , 4.0 , 4 , 'd' )", ECPGt_EOIT, ECPGt_EORT);
212-
#line 86 "sqlda.pgc"
211+
{ ECPGdo(__LINE__, 1, 1, NULL, 0, ECPGst_normal, "insert into t1 values ( 1 , 'a' , 1.0 , 1 , 'a' ) , ( 2 , null , null , null , null ) , ( 4 , 'd' , 4.0 , 4 , 'd' )", ECPGt_EOIT, ECPGt_EORT);
212+
#line 85 "sqlda.pgc"
213213

214214
if (sqlca.sqlcode < 0) exit (1);}
215-
#line 86 "sqlda.pgc"
215+
#line 85 "sqlda.pgc"
216216

217217

218218
strcpy(msg, "commit");
219219
{ ECPGtrans(__LINE__, NULL, "commit");
220-
#line 89 "sqlda.pgc"
220+
#line 88 "sqlda.pgc"
221221

222222
if (sqlca.sqlcode < 0) exit (1);}
223-
#line 89 "sqlda.pgc"
223+
#line 88 "sqlda.pgc"
224224

225225

226226
/* SQLDA test for getting all records from a table */
@@ -229,29 +229,29 @@ if (sqlca.sqlcode < 0) exit (1);}
229229

230230
strcpy(msg, "prepare");
231231
{ ECPGprepare(__LINE__, NULL, 0, "st_id1", stmt1);
232-
#line 96 "sqlda.pgc"
232+
#line 95 "sqlda.pgc"
233233

234234
if (sqlca.sqlcode < 0) exit (1);}
235-
#line 96 "sqlda.pgc"
235+
#line 95 "sqlda.pgc"
236236

237237

238238
strcpy(msg, "declare");
239239
ECPG_informix_reset_sqlca(); /* declare mycur1 cursor for $1 */
240-
#line 99 "sqlda.pgc"
240+
#line 98 "sqlda.pgc"
241241

242242

243243
strcpy(msg, "open");
244244
{ ECPGdo(__LINE__, 1, 1, NULL, 0, ECPGst_normal, "declare mycur1 cursor for $1",
245245
ECPGt_char_variable,(ECPGprepared_statement(NULL, "st_id1", __LINE__)),(long)1,(long)1,(1)*sizeof(char),
246246
ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT);
247-
#line 102 "sqlda.pgc"
247+
#line 101 "sqlda.pgc"
248248

249249
if (sqlca.sqlcode < 0) exit (1);}
250-
#line 102 "sqlda.pgc"
250+
#line 101 "sqlda.pgc"
251251

252252

253253
/* exec sql whenever not found break ; */
254-
#line 104 "sqlda.pgc"
254+
#line 103 "sqlda.pgc"
255255

256256

257257
rec = 0;
@@ -261,37 +261,37 @@ if (sqlca.sqlcode < 0) exit (1);}
261261
{ ECPGdo(__LINE__, 1, 1, NULL, 0, ECPGst_normal, "fetch 1 from mycur1", ECPGt_EOIT,
262262
ECPGt_sqlda, &outp_sqlda, 0L, 0L, 0L,
263263
ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);
264-
#line 110 "sqlda.pgc"
264+
#line 109 "sqlda.pgc"
265265

266266
if (sqlca.sqlcode == ECPG_NOT_FOUND) break;
267-
#line 110 "sqlda.pgc"
267+
#line 109 "sqlda.pgc"
268268

269269
if (sqlca.sqlcode < 0) exit (1);}
270-
#line 110 "sqlda.pgc"
270+
#line 109 "sqlda.pgc"
271271

272272

273273
printf("FETCH RECORD %d\n", ++rec);
274274
dump_sqlda(outp_sqlda);
275275
}
276276

277277
/* exec sql whenever not found continue ; */
278-
#line 116 "sqlda.pgc"
278+
#line 115 "sqlda.pgc"
279279

280280

281281
strcpy(msg, "close");
282282
{ ECPGdo(__LINE__, 1, 1, NULL, 0, ECPGst_normal, "close mycur1", ECPGt_EOIT, ECPGt_EORT);
283-
#line 119 "sqlda.pgc"
283+
#line 118 "sqlda.pgc"
284284

285285
if (sqlca.sqlcode < 0) exit (1);}
286-
#line 119 "sqlda.pgc"
286+
#line 118 "sqlda.pgc"
287287

288288

289289
strcpy(msg, "deallocate");
290290
{ ECPGdeallocate(__LINE__, 1, NULL, "st_id1");
291-
#line 122 "sqlda.pgc"
291+
#line 121 "sqlda.pgc"
292292

293293
if (sqlca.sqlcode < 0) exit (1);}
294-
#line 122 "sqlda.pgc"
294+
#line 121 "sqlda.pgc"
295295

296296

297297
free(outp_sqlda);
@@ -304,29 +304,29 @@ if (sqlca.sqlcode < 0) exit (1);}
304304

305305
strcpy(msg, "prepare");
306306
{ ECPGprepare(__LINE__, NULL, 0, "st_id2", stmt1);
307-
#line 133 "sqlda.pgc"
307+
#line 132 "sqlda.pgc"
308308

309309
if (sqlca.sqlcode < 0) exit (1);}
310-
#line 133 "sqlda.pgc"
310+
#line 132 "sqlda.pgc"
311311

312312

313313
strcpy(msg, "declare");
314314
ECPG_informix_reset_sqlca(); /* declare mycur2 cursor for $1 */
315-
#line 136 "sqlda.pgc"
315+
#line 135 "sqlda.pgc"
316316

317317

318318
strcpy(msg, "open");
319319
{ ECPGdo(__LINE__, 1, 1, NULL, 0, ECPGst_normal, "declare mycur2 cursor for $1",
320320
ECPGt_char_variable,(ECPGprepared_statement(NULL, "st_id2", __LINE__)),(long)1,(long)1,(1)*sizeof(char),
321321
ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT);
322-
#line 139 "sqlda.pgc"
322+
#line 138 "sqlda.pgc"
323323

324324
if (sqlca.sqlcode < 0) exit (1);}
325-
#line 139 "sqlda.pgc"
325+
#line 138 "sqlda.pgc"
326326

327327

328328
/* exec sql whenever not found break ; */
329-
#line 141 "sqlda.pgc"
329+
#line 140 "sqlda.pgc"
330330

331331

332332
rec = 0;
@@ -336,37 +336,37 @@ if (sqlca.sqlcode < 0) exit (1);}
336336
{ ECPGdo(__LINE__, 1, 1, NULL, 0, ECPGst_normal, "fetch from mycur2", ECPGt_EOIT,
337337
ECPGt_sqlda, &outp_sqlda, 0L, 0L, 0L,
338338
ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);
339-
#line 147 "sqlda.pgc"
339+
#line 146 "sqlda.pgc"
340340

341341
if (sqlca.sqlcode == ECPG_NOT_FOUND) break;
342-
#line 147 "sqlda.pgc"
342+
#line 146 "sqlda.pgc"
343343

344344
if (sqlca.sqlcode < 0) exit (1);}
345-
#line 147 "sqlda.pgc"
345+
#line 146 "sqlda.pgc"
346346

347347

348348
printf("FETCH RECORD %d\n", ++rec);
349349
dump_sqlda(outp_sqlda);
350350
}
351351

352352
/* exec sql whenever not found continue ; */
353-
#line 153 "sqlda.pgc"
353+
#line 152 "sqlda.pgc"
354354

355355

356356
strcpy(msg, "close");
357357
{ ECPGdo(__LINE__, 1, 1, NULL, 0, ECPGst_normal, "close mycur2", ECPGt_EOIT, ECPGt_EORT);
358-
#line 156 "sqlda.pgc"
358+
#line 155 "sqlda.pgc"
359359

360360
if (sqlca.sqlcode < 0) exit (1);}
361-
#line 156 "sqlda.pgc"
361+
#line 155 "sqlda.pgc"
362362

363363

364364
strcpy(msg, "deallocate");
365365
{ ECPGdeallocate(__LINE__, 1, NULL, "st_id2");
366-
#line 159 "sqlda.pgc"
366+
#line 158 "sqlda.pgc"
367367

368368
if (sqlca.sqlcode < 0) exit (1);}
369-
#line 159 "sqlda.pgc"
369+
#line 158 "sqlda.pgc"
370370

371371

372372
free(outp_sqlda);
@@ -391,10 +391,10 @@ if (sqlca.sqlcode < 0) exit (1);}
391391

392392
strcpy(msg, "prepare");
393393
{ ECPGprepare(__LINE__, NULL, 0, "st_id3", stmt2);
394-
#line 182 "sqlda.pgc"
394+
#line 181 "sqlda.pgc"
395395

396396
if (sqlca.sqlcode < 0) exit (1);}
397-
#line 182 "sqlda.pgc"
397+
#line 181 "sqlda.pgc"
398398

399399

400400
strcpy(msg, "execute");
@@ -403,20 +403,20 @@ if (sqlca.sqlcode < 0) exit (1);}
403403
ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT,
404404
ECPGt_sqlda, &outp_sqlda, 0L, 0L, 0L,
405405
ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);
406-
#line 185 "sqlda.pgc"
406+
#line 184 "sqlda.pgc"
407407

408408
if (sqlca.sqlcode < 0) exit (1);}
409-
#line 185 "sqlda.pgc"
409+
#line 184 "sqlda.pgc"
410410

411411

412412
dump_sqlda(outp_sqlda);
413413

414414
strcpy(msg, "deallocate");
415415
{ ECPGdeallocate(__LINE__, 1, NULL, "st_id3");
416-
#line 190 "sqlda.pgc"
416+
#line 189 "sqlda.pgc"
417417

418418
if (sqlca.sqlcode < 0) exit (1);}
419-
#line 190 "sqlda.pgc"
419+
#line 189 "sqlda.pgc"
420420

421421

422422
free(inp_sqlda->sqlvar);
@@ -428,10 +428,10 @@ if (sqlca.sqlcode < 0) exit (1);}
428428
*/
429429

430430
{ ECPGconnect(__LINE__, 1, "regress1" , NULL, NULL , "con2", 0);
431-
#line 200 "sqlda.pgc"
431+
#line 199 "sqlda.pgc"
432432

433433
if (sqlca.sqlcode < 0) exit (1);}
434-
#line 200 "sqlda.pgc"
434+
#line 199 "sqlda.pgc"
435435

436436

437437
/* Input sqlda has to be built manually */
@@ -452,10 +452,10 @@ if (sqlca.sqlcode < 0) exit (1);}
452452

453453
strcpy(msg, "prepare");
454454
{ ECPGprepare(__LINE__, "con2", 0, "st_id4", stmt2);
455-
#line 219 "sqlda.pgc"
455+
#line 218 "sqlda.pgc"
456456

457457
if (sqlca.sqlcode < 0) exit (1);}
458-
#line 219 "sqlda.pgc"
458+
#line 218 "sqlda.pgc"
459459

460460

461461
strcpy(msg, "execute");
@@ -464,28 +464,28 @@ if (sqlca.sqlcode < 0) exit (1);}
464464
ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT,
465465
ECPGt_sqlda, &outp_sqlda, 0L, 0L, 0L,
466466
ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);
467-
#line 222 "sqlda.pgc"
467+
#line 221 "sqlda.pgc"
468468

469469
if (sqlca.sqlcode < 0) exit (1);}
470-
#line 222 "sqlda.pgc"
470+
#line 221 "sqlda.pgc"
471471

472472

473473
dump_sqlda(outp_sqlda);
474474

475475
strcpy(msg, "commit");
476476
{ ECPGtrans(__LINE__, "con2", "commit");
477-
#line 227 "sqlda.pgc"
477+
#line 226 "sqlda.pgc"
478478

479479
if (sqlca.sqlcode < 0) exit (1);}
480-
#line 227 "sqlda.pgc"
480+
#line 226 "sqlda.pgc"
481481

482482

483483
strcpy(msg, "deallocate");
484484
{ ECPGdeallocate(__LINE__, 1, NULL, "st_id4");
485-
#line 230 "sqlda.pgc"
485+
#line 229 "sqlda.pgc"
486486

487487
if (sqlca.sqlcode < 0) exit (1);}
488-
#line 230 "sqlda.pgc"
488+
#line 229 "sqlda.pgc"
489489

490490

491491
free(inp_sqlda->sqlvar);
@@ -494,36 +494,36 @@ if (sqlca.sqlcode < 0) exit (1);}
494494

495495
strcpy(msg, "disconnect");
496496
{ ECPGdisconnect(__LINE__, "con2");
497-
#line 237 "sqlda.pgc"
497+
#line 236 "sqlda.pgc"
498498

499499
if (sqlca.sqlcode < 0) exit (1);}
500-
#line 237 "sqlda.pgc"
500+
#line 236 "sqlda.pgc"
501501

502502

503503
/* End test */
504504

505505
strcpy(msg, "drop");
506506
{ ECPGdo(__LINE__, 1, 1, NULL, 0, ECPGst_normal, "drop table t1", ECPGt_EOIT, ECPGt_EORT);
507-
#line 242 "sqlda.pgc"
507+
#line 241 "sqlda.pgc"
508508

509509
if (sqlca.sqlcode < 0) exit (1);}
510-
#line 242 "sqlda.pgc"
510+
#line 241 "sqlda.pgc"
511511

512512

513513
strcpy(msg, "commit");
514514
{ ECPGtrans(__LINE__, NULL, "commit");
515-
#line 245 "sqlda.pgc"
515+
#line 244 "sqlda.pgc"
516516

517517
if (sqlca.sqlcode < 0) exit (1);}
518-
#line 245 "sqlda.pgc"
518+
#line 244 "sqlda.pgc"
519519

520520

521521
strcpy(msg, "disconnect");
522522
{ ECPGdisconnect(__LINE__, "CURRENT");
523-
#line 248 "sqlda.pgc"
523+
#line 247 "sqlda.pgc"
524524

525525
if (sqlca.sqlcode < 0) exit (1);}
526-
#line 248 "sqlda.pgc"
526+
#line 247 "sqlda.pgc"
527527

528528

529529
return (0);

0 commit comments

Comments
 (0)