aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/interfaces/ecpg/ecpglib/sqlda.c25
-rw-r--r--src/interfaces/ecpg/test/expected/sql-sqlda.c2
-rw-r--r--src/interfaces/ecpg/test/expected/sql-sqlda.stderr2
-rw-r--r--src/interfaces/ecpg/test/expected/sql-sqlda.stdout8
-rw-r--r--src/interfaces/ecpg/test/sql/sqlda.pgc2
5 files changed, 23 insertions, 16 deletions
diff --git a/src/interfaces/ecpg/ecpglib/sqlda.c b/src/interfaces/ecpg/ecpglib/sqlda.c
index 3f86af3c8c4..80ddc6b6b13 100644
--- a/src/interfaces/ecpg/ecpglib/sqlda.c
+++ b/src/interfaces/ecpg/ecpglib/sqlda.c
@@ -123,7 +123,8 @@ sqlda_common_total_size(const PGresult *res, int row, enum COMPAT_MODE compat, l
num = PGTYPESnumeric_from_asc(val, NULL);
if (!num)
break;
- ecpg_sqlda_align_add_size(next_offset, sizeof(int), num->digits - num->buf + num->ndigits, &offset, &next_offset);
+ if (num->buf)
+ ecpg_sqlda_align_add_size(next_offset, sizeof(int), num->digits - num->buf + num->ndigits, &offset, &next_offset);
PGTYPESnumeric_free(num);
}
break;
@@ -347,11 +348,14 @@ ecpg_set_compat_sqlda(int lineno, struct sqlda_compat **_sqlda, const PGresult *
memcpy(sqlda->sqlvar[i].sqldata, num, sizeof(numeric));
- 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);
+ if (num->buf)
+ {
+ 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);
+ ((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);
@@ -533,11 +537,14 @@ ecpg_set_native_sqlda(int lineno, struct sqlda_struct **_sqlda, const PGresult *
memcpy(sqlda->sqlvar[i].sqldata, num, sizeof(numeric));
- 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);
+ if (num->buf)
+ {
+ 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);
+ ((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);
diff --git a/src/interfaces/ecpg/test/expected/sql-sqlda.c b/src/interfaces/ecpg/test/expected/sql-sqlda.c
index 3cba69e1a58..6bd9d5527a0 100644
--- a/src/interfaces/ecpg/test/expected/sql-sqlda.c
+++ b/src/interfaces/ecpg/test/expected/sql-sqlda.c
@@ -228,7 +228,7 @@ 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 ) , ( 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);
+ { 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' , 'NaN' , 4 , 'd' , 4444444444444444444 ) , ( 5 , 'e' , 0.001234 , 5 , 'e' , 5555555555555555555 )", ECPGt_EOIT, ECPGt_EORT);
#line 99 "sqlda.pgc"
if (sqlca.sqlcode < 0) exit (1);}
diff --git a/src/interfaces/ecpg/test/expected/sql-sqlda.stderr b/src/interfaces/ecpg/test/expected/sql-sqlda.stderr
index 2545aa1a0b3..e8c7a3725ea 100644
--- a/src/interfaces/ecpg/test/expected/sql-sqlda.stderr
+++ b/src/interfaces/ecpg/test/expected/sql-sqlda.stderr
@@ -14,7 +14,7 @@
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_process_output on line 84: OK: CREATE TABLE
[NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 94: query: 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 ); with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 94: query: 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' , 'NaN' , 4 , 'd' , 4444444444444444444 ) , ( 5 , 'e' , 0.001234 , 5 , 'e' , 5555555555555555555 ); with 0 parameter(s) on connection regress1
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 94: using PQexec
[NO_PID]: sqlca: code: 0, state: 00000
diff --git a/src/interfaces/ecpg/test/expected/sql-sqlda.stdout b/src/interfaces/ecpg/test/expected/sql-sqlda.stdout
index 81a5978b1c1..e3b1a6484aa 100644
--- a/src/interfaces/ecpg/test/expected/sql-sqlda.stdout
+++ b/src/interfaces/ecpg/test/expected/sql-sqlda.stdout
@@ -22,7 +22,7 @@ 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: 'd1' value NUMERIC 'NaN'
name sqlda descriptor: 'd2' value 4.000000
name sqlda descriptor: 'c' value 'd '
name sqlda descriptor: 'big' value 4444444444444444444
@@ -57,7 +57,7 @@ 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: 'd1' value NUMERIC 'NaN'
name sqlda descriptor: 'd2' value 4.000000
name sqlda descriptor: 'c' value 'd '
name sqlda descriptor: 'big' value 4444444444444444444
@@ -71,14 +71,14 @@ name sqlda descriptor: 'big' value 5555555555555555555
EXECUTE 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: 'd1' value NUMERIC 'NaN'
name sqlda descriptor: 'd2' value 4.000000
name sqlda descriptor: 'c' value 'd '
name sqlda descriptor: 'big' value 4444444444444444444
EXECUTE 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: 'd1' value NUMERIC 'NaN'
name sqlda descriptor: 'd2' value 4.000000
name sqlda descriptor: 'c' value 'd '
name sqlda descriptor: 'big' value 4444444444444444444
diff --git a/src/interfaces/ecpg/test/sql/sqlda.pgc b/src/interfaces/ecpg/test/sql/sqlda.pgc
index 4c3abca9d1b..f54b7e3c94b 100644
--- a/src/interfaces/ecpg/test/sql/sqlda.pgc
+++ b/src/interfaces/ecpg/test/sql/sqlda.pgc
@@ -95,7 +95,7 @@ exec sql end declare section;
(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),
+ (4, 'd', 'NaN', 4, 'd',4444444444444444444),
(5, 'e', 0.001234, 5, 'e',5555555555555555555);
strcpy(msg, "commit");
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-10 11:46:20 +0000