Skip to content

P
Postgres FD Implementation
Commit ecfd5579 authored by Tom Lane's avatar Tom Lane
Browse files
Options

Fix incorrect results for numeric data passed through an ECPG SQLDA. 

Numeric values with leading zeroes were incorrectly copied into a
SQLDA (SQL Descriptor Area), leading to wrong results in ECPG programs.

Report and patch by Daisuke Higuchi.  Back-patch to all supported
versions.

Discussion: https://postgr.es/m/1803D792815FC24D871C00D17AE95905C71161@g01jpexmbkw24
parent 965a3d6b
Expand all Show whitespace changes
Inline Side-by-side
Showing with 380 additions and 230 deletions
src/interfaces/ecpg/ecpglib/sqlda.c
View file @ ecfd5579
......@@ -107,9 +107,12 @@ sqlda_common_total_size(const PGresult *res, int row, enum COMPAT_MODE compat, l
case ECPGt_numeric:
/*
* Let's align both the numeric struct and the digits array to
* int Unfortunately we need to do double work here to compute
* the size of the space needed for the numeric structure.
* We align the numeric struct to allow it to store a pointer,
* while the digits array is aligned to int (which seems like
* overkill, but let's keep compatibility here).
*
* Unfortunately we need to deconstruct the value twice to
* find out the digits array's size and then later fill it.
*/
ecpg_sqlda_align_add_size(offset, sizeof(NumericDigit *), sizeof(numeric), &offset, &next_offset);
if (!PQgetisnull(res, row, i))
......@@ -120,8 +123,7 @@ sqlda_common_total_size(const PGresult *res, int row, enum COMPAT_MODE compat, l
num = PGTYPESnumeric_from_asc(val, NULL);
if (!num)
break;
if (num->ndigits)
ecpg_sqlda_align_add_size(next_offset, sizeof(int), num->ndigits + 1, &offset, &next_offset);
ecpg_sqlda_align_add_size(next_offset, sizeof(int), num->digits - num->buf + num->ndigits, &offset, &next_offset);
PGTYPESnumeric_free(num);
}
break;
......@@ -345,14 +347,11 @@ ecpg_set_compat_sqlda(int lineno, struct sqlda_compat **_sqlda, const PGresult *
memcpy(sqlda->sqlvar[i].sqldata, num, sizeof(numeric));
if (num->ndigits)
{
ecpg_sqlda_align_add_size(next_offset, sizeof(int), num->ndigits + 1, &offset, &next_offset);
memcpy((char *) sqlda + offset, num->buf, num->ndigits + 1);
ecpg_sqlda_align_add_size(next_offset, sizeof(int), num->digits - num->buf + num->ndigits, &offset, &next_offset);
memcpy((char *) sqlda + offset, num->buf, num->digits - num->buf + num->ndigits);
((numeric *) sqlda->sqlvar[i].sqldata)->buf = (NumericDigit *) sqlda + offset;
((numeric *) sqlda->sqlvar[i].sqldata)->digits = (NumericDigit *) sqlda + offset + (num->digits - num->buf);
}
PGTYPESnumeric_free(num);
......@@ -534,14 +533,11 @@ ecpg_set_native_sqlda(int lineno, struct sqlda_struct **_sqlda, const PGresult *
memcpy(sqlda->sqlvar[i].sqldata, num, sizeof(numeric));
if (num->ndigits)
{
ecpg_sqlda_align_add_size(next_offset, sizeof(int), num->ndigits + 1, &offset, &next_offset);
memcpy((char *) sqlda + offset, num->buf, num->ndigits + 1);
ecpg_sqlda_align_add_size(next_offset, sizeof(int), num->digits - num->buf + num->ndigits, &offset, &next_offset);
memcpy((char *) sqlda + offset, num->buf, num->digits - num->buf + num->ndigits);
((numeric *) sqlda->sqlvar[i].sqldata)->buf = (NumericDigit *) sqlda + offset;
((numeric *) sqlda->sqlvar[i].sqldata)->digits = (NumericDigit *) sqlda + offset + (num->digits - num->buf);
}
PGTYPESnumeric_free(num);
......
src/interfaces/ecpg/test/expected/sql-sqlda.c
View file @ ecfd5579
......@@ -228,19 +228,19 @@ if (sqlca.sqlcode < 0) exit (1);}
strcpy(msg, "insert");
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into t1 values ( 1 , 'a' , 1.0 , 1 , 'a' , 1111111111111111111 ) , ( 2 , null , null , null , null , null ) , ( 4 , 'd' , 4.0 , 4 , 'd' , 4444444444444444444 )", ECPGt_EOIT, ECPGt_EORT);
#line 97 "sqlda.pgc"
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into t1 values ( 1 , 'a' , 1.0 , 1 , 'a' , 1111111111111111111 ) , ( 2 , null , null , null , null , null ) , ( 3 , 'c' , 0.0 , 3 , 'c' , 3333333333333333333 ) , ( 4 , 'd' , 4.0 , 4 , 'd' , 4444444444444444444 ) , ( 5 , 'e' , 0.001234 , 5 , 'e' , 5555555555555555555 )", ECPGt_EOIT, ECPGt_EORT);
#line 99 "sqlda.pgc"
if (sqlca.sqlcode < 0) exit (1);}
#line 97 "sqlda.pgc"
#line 99 "sqlda.pgc"
strcpy(msg, "commit");
{ ECPGtrans(__LINE__, NULL, "commit");
#line 100 "sqlda.pgc"
#line 102 "sqlda.pgc"
if (sqlca.sqlcode < 0) exit (1);}
#line 100 "sqlda.pgc"
#line 102 "sqlda.pgc"
/* SQLDA test for getting all records from a table */
......@@ -249,29 +249,29 @@ if (sqlca.sqlcode < 0) exit (1);}
strcpy(msg, "prepare");
{ ECPGprepare(__LINE__, NULL, 0, "st_id1", stmt1);
#line 107 "sqlda.pgc"
#line 109 "sqlda.pgc"
if (sqlca.sqlcode < 0) exit (1);}
#line 107 "sqlda.pgc"
#line 109 "sqlda.pgc"
strcpy(msg, "declare");
/* declare mycur1 cursor for $1 */
#line 110 "sqlda.pgc"
#line 112 "sqlda.pgc"
strcpy(msg, "open");
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "declare mycur1 cursor for $1",
ECPGt_char_variable,(ECPGprepared_statement(NULL, "st_id1", __LINE__)),(long)1,(long)1,(1)*sizeof(char),
ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT);
#line 113 "sqlda.pgc"
#line 115 "sqlda.pgc"
if (sqlca.sqlcode < 0) exit (1);}
#line 113 "sqlda.pgc"
#line 115 "sqlda.pgc"
/* exec sql whenever not found break ; */
#line 115 "sqlda.pgc"
#line 117 "sqlda.pgc"
rec = 0;
......@@ -281,13 +281,13 @@ if (sqlca.sqlcode < 0) exit (1);}
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "fetch 1 from mycur1", ECPGt_EOIT,
ECPGt_sqlda, &outp_sqlda, 0L, 0L, 0L,
ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);
#line 121 "sqlda.pgc"
#line 123 "sqlda.pgc"
if (sqlca.sqlcode == ECPG_NOT_FOUND) break;
#line 121 "sqlda.pgc"
#line 123 "sqlda.pgc"
if (sqlca.sqlcode < 0) exit (1);}
#line 121 "sqlda.pgc"
#line 123 "sqlda.pgc"
printf("FETCH RECORD %d\n", ++rec);
......@@ -295,23 +295,23 @@ if (sqlca.sqlcode < 0) exit (1);}
}
/* exec sql whenever not found continue ; */
#line 127 "sqlda.pgc"
#line 129 "sqlda.pgc"
strcpy(msg, "close");
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "close mycur1", ECPGt_EOIT, ECPGt_EORT);
#line 130 "sqlda.pgc"
#line 132 "sqlda.pgc"
if (sqlca.sqlcode < 0) exit (1);}
#line 130 "sqlda.pgc"
#line 132 "sqlda.pgc"
strcpy(msg, "deallocate");
{ ECPGdeallocate(__LINE__, 0, NULL, "st_id1");
#line 133 "sqlda.pgc"
#line 135 "sqlda.pgc"
if (sqlca.sqlcode < 0) exit (1);}
#line 133 "sqlda.pgc"
#line 135 "sqlda.pgc"
free(outp_sqlda);
......@@ -322,35 +322,35 @@ if (sqlca.sqlcode < 0) exit (1);}
strcpy(msg, "prepare");
{ ECPGprepare(__LINE__, NULL, 0, "st_id2", stmt1);
#line 142 "sqlda.pgc"
#line 144 "sqlda.pgc"
if (sqlca.sqlcode < 0) exit (1);}
#line 142 "sqlda.pgc"
#line 144 "sqlda.pgc"
strcpy(msg, "declare");
/* declare mycur2 cursor for $1 */
#line 145 "sqlda.pgc"
#line 147 "sqlda.pgc"
strcpy(msg, "open");
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "declare mycur2 cursor for $1",
ECPGt_char_variable,(ECPGprepared_statement(NULL, "st_id2", __LINE__)),(long)1,(long)1,(1)*sizeof(char),
ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT);
#line 148 "sqlda.pgc"
#line 150 "sqlda.pgc"
if (sqlca.sqlcode < 0) exit (1);}
#line 148 "sqlda.pgc"
#line 150 "sqlda.pgc"
strcpy(msg, "fetch");
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "fetch all from mycur2", ECPGt_EOIT,
ECPGt_sqlda, &outp_sqlda, 0L, 0L, 0L,
ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);
#line 151 "sqlda.pgc"
#line 153 "sqlda.pgc"
if (sqlca.sqlcode < 0) exit (1);}
#line 151 "sqlda.pgc"
#line 153 "sqlda.pgc"
outp_sqlda1 = outp_sqlda;
......@@ -368,18 +368,18 @@ if (sqlca.sqlcode < 0) exit (1);}
strcpy(msg, "close");
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "close mycur2", ECPGt_EOIT, ECPGt_EORT);
#line 167 "sqlda.pgc"
#line 169 "sqlda.pgc"
if (sqlca.sqlcode < 0) exit (1);}
#line 167 "sqlda.pgc"
#line 169 "sqlda.pgc"
strcpy(msg, "deallocate");
{ ECPGdeallocate(__LINE__, 0, NULL, "st_id2");
#line 170 "sqlda.pgc"
#line 172 "sqlda.pgc"
if (sqlca.sqlcode < 0) exit (1);}
#line 170 "sqlda.pgc"
#line 172 "sqlda.pgc"
/* SQLDA test for getting one record using an input descriptor */
......@@ -403,10 +403,10 @@ if (sqlca.sqlcode < 0) exit (1);}
strcpy(msg, "prepare");
{ ECPGprepare(__LINE__, NULL, 0, "st_id3", stmt2);
#line 192 "sqlda.pgc"
#line 194 "sqlda.pgc"
if (sqlca.sqlcode < 0) exit (1);}
#line 192 "sqlda.pgc"
#line 194 "sqlda.pgc"
strcpy(msg, "execute");
......@@ -415,20 +415,20 @@ if (sqlca.sqlcode < 0) exit (1);}
ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT,
ECPGt_sqlda, &outp_sqlda, 0L, 0L, 0L,
ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);
#line 195 "sqlda.pgc"
#line 197 "sqlda.pgc"
if (sqlca.sqlcode < 0) exit (1);}
#line 195 "sqlda.pgc"
#line 197 "sqlda.pgc"
dump_sqlda(outp_sqlda);
strcpy(msg, "deallocate");
{ ECPGdeallocate(__LINE__, 0, NULL, "st_id3");
#line 200 "sqlda.pgc"
#line 202 "sqlda.pgc"
if (sqlca.sqlcode < 0) exit (1);}
#line 200 "sqlda.pgc"
#line 202 "sqlda.pgc"
free(inp_sqlda);
......@@ -439,10 +439,10 @@ if (sqlca.sqlcode < 0) exit (1);}
*/
{ ECPGconnect(__LINE__, 0, "ecpg1_regression" , NULL, NULL , "con2", 0);
#line 209 "sqlda.pgc"
#line 211 "sqlda.pgc"
if (sqlca.sqlcode < 0) exit (1);}
#line 209 "sqlda.pgc"
#line 211 "sqlda.pgc"
/*
......@@ -464,10 +464,10 @@ if (sqlca.sqlcode < 0) exit (1);}
strcpy(msg, "prepare");
{ ECPGprepare(__LINE__, "con2", 0, "st_id4", stmt2);
#line 229 "sqlda.pgc"
#line 231 "sqlda.pgc"
if (sqlca.sqlcode < 0) exit (1);}
#line 229 "sqlda.pgc"
#line 231 "sqlda.pgc"
strcpy(msg, "execute");
......@@ -476,28 +476,28 @@ if (sqlca.sqlcode < 0) exit (1);}
ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT,
ECPGt_sqlda, &outp_sqlda, 0L, 0L, 0L,
ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);
#line 232 "sqlda.pgc"
#line 234 "sqlda.pgc"
if (sqlca.sqlcode < 0) exit (1);}
#line 232 "sqlda.pgc"
#line 234 "sqlda.pgc"
dump_sqlda(outp_sqlda);
strcpy(msg, "commit");
{ ECPGtrans(__LINE__, "con2", "commit");
#line 237 "sqlda.pgc"
#line 239 "sqlda.pgc"
if (sqlca.sqlcode < 0) exit (1);}
#line 237 "sqlda.pgc"
#line 239 "sqlda.pgc"
strcpy(msg, "deallocate");
{ ECPGdeallocate(__LINE__, 0, NULL, "st_id4");
#line 240 "sqlda.pgc"
#line 242 "sqlda.pgc"
if (sqlca.sqlcode < 0) exit (1);}
#line 240 "sqlda.pgc"
#line 242 "sqlda.pgc"
free(inp_sqlda);
......@@ -505,36 +505,36 @@ if (sqlca.sqlcode < 0) exit (1);}
strcpy(msg, "disconnect");
{ ECPGdisconnect(__LINE__, "con2");
#line 246 "sqlda.pgc"
#line 248 "sqlda.pgc"
if (sqlca.sqlcode < 0) exit (1);}
#line 246 "sqlda.pgc"
#line 248 "sqlda.pgc"
/* End test */
strcpy(msg, "drop");
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "drop table t1", ECPGt_EOIT, ECPGt_EORT);
#line 251 "sqlda.pgc"
#line 253 "sqlda.pgc"
if (sqlca.sqlcode < 0) exit (1);}
#line 251 "sqlda.pgc"
#line 253 "sqlda.pgc"
strcpy(msg, "commit");
{ ECPGtrans(__LINE__, NULL, "commit");
#line 254 "sqlda.pgc"
#line 256 "sqlda.pgc"
if (sqlca.sqlcode < 0) exit (1);}
#line 254 "sqlda.pgc"
#line 256 "sqlda.pgc"
strcpy(msg, "disconnect");
{ ECPGdisconnect(__LINE__, "CURRENT");
#line 257 "sqlda.pgc"
#line 259 "sqlda.pgc"
if (sqlca.sqlcode < 0) exit (1);}
#line 257 "sqlda.pgc"
#line 259 "sqlda.pgc"
return 0;
......
src/interfaces/ecpg/test/expected/sql-sqlda.stdout
View file @ ecfd5579
......@@ -13,12 +13,26 @@ name sqlda descriptor: 'd2' value NULL'
name sqlda descriptor: 'c' value NULL'
name sqlda descriptor: 'big' value NULL'
FETCH RECORD 3
name sqlda descriptor: 'id' value 3
name sqlda descriptor: 't' value 'c'
name sqlda descriptor: 'd1' value NUMERIC '0.0'
name sqlda descriptor: 'd2' value 3.000000
name sqlda descriptor: 'c' value 'c '
name sqlda descriptor: 'big' value 3333333333333333333
FETCH RECORD 4
name sqlda descriptor: 'id' value 4
name sqlda descriptor: 't' value 'd'
name sqlda descriptor: 'd1' value NUMERIC '4.0'
name sqlda descriptor: 'd2' value 4.000000
name sqlda descriptor: 'c' value 'd '
name sqlda descriptor: 'big' value 4444444444444444444
FETCH RECORD 5
name sqlda descriptor: 'id' value 5
name sqlda descriptor: 't' value 'e'
name sqlda descriptor: 'd1' value NUMERIC '0.001234'
name sqlda descriptor: 'd2' value 5.000000
name sqlda descriptor: 'c' value 'e '
name sqlda descriptor: 'big' value 5555555555555555555
FETCH RECORD 1
name sqlda descriptor: 'id' value 1
name sqlda descriptor: 't' value 'a'
......@@ -34,12 +48,26 @@ name sqlda descriptor: 'd2' value NULL'
name sqlda descriptor: 'c' value NULL'
name sqlda descriptor: 'big' value NULL'
FETCH RECORD 3
name sqlda descriptor: 'id' value 3
name sqlda descriptor: 't' value 'c'
name sqlda descriptor: 'd1' value NUMERIC '0.0'
name sqlda descriptor: 'd2' value 3.000000
name sqlda descriptor: 'c' value 'c '
name sqlda descriptor: 'big' value 3333333333333333333
FETCH RECORD 4
name sqlda descriptor: 'id' value 4
name sqlda descriptor: 't' value 'd'
name sqlda descriptor: 'd1' value NUMERIC '4.0'
name sqlda descriptor: 'd2' value 4.000000
name sqlda descriptor: 'c' value 'd '
name sqlda descriptor: 'big' value 4444444444444444444
FETCH RECORD 5
name sqlda descriptor: 'id' value 5
name sqlda descriptor: 't' value 'e'
name sqlda descriptor: 'd1' value NUMERIC '0.001234'
name sqlda descriptor: 'd2' value 5.000000
name sqlda descriptor: 'c' value 'e '
name sqlda descriptor: 'big' value 5555555555555555555
EXECUTE RECORD 4
name sqlda descriptor: 'id' value 4
name sqlda descriptor: 't' value 'd'
......
src/interfaces/ecpg/test/sql/sqlda.pgc
View file @ ecfd5579
......@@ -94,7 +94,9 @@ exec sql end declare section;
exec sql insert into t1 values
(1, 'a', 1.0, 1, 'a',1111111111111111111),
(2, null, null, null, null,null),
(4, 'd', 4.0, 4, 'd',4444444444444444444);
(3, 'c', 0.0, 3, 'c',3333333333333333333),
(4, 'd', 4.0, 4, 'd',4444444444444444444),
(5, 'e', 0.001234, 5, 'e',5555555555555555555);
strcpy(msg, "commit");
exec sql commit;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment