Skip to content

Commit acbddf4

Browse files
author
Michael Meskes
committed
Applied Zoltan's patch to correctly align interval and timestamp data in ecpg's sqlda.
1 parent 90bbeb1 commit acbddf4

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/interfaces/ecpg/ecpglib/sqlda.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,10 +127,10 @@ sqlda_common_total_size(const PGresult *res, int row, enum COMPAT_MODE compat, l
127127
ecpg_sqlda_align_add_size(offset, sizeof(date), sizeof(date), &offset, &next_offset);
128128
break;
129129
case ECPGt_timestamp:
130-
ecpg_sqlda_align_add_size(offset, sizeof(int), sizeof(timestamp), &offset, &next_offset);
130+
ecpg_sqlda_align_add_size(offset, sizeof(int64), sizeof(timestamp), &offset, &next_offset);
131131
break;
132132
case ECPGt_interval:
133-
ecpg_sqlda_align_add_size(offset, sizeof(int), sizeof(interval), &offset, &next_offset);
133+
ecpg_sqlda_align_add_size(offset, sizeof(int64), sizeof(interval), &offset, &next_offset);
134134
break;
135135
case ECPGt_char:
136136
case ECPGt_unsigned_char:
@@ -354,7 +354,7 @@ ecpg_set_compat_sqlda(int lineno, struct sqlda_compat ** _sqlda, const PGresult
354354
sqlda->sqlvar[i].sqllen = sizeof(date);
355355
break;
356356
case ECPGt_timestamp:
357-
ecpg_sqlda_align_add_size(offset, sizeof(timestamp), sizeof(timestamp), &offset, &next_offset);
357+
ecpg_sqlda_align_add_size(offset, sizeof(int64), sizeof(timestamp), &offset, &next_offset);
358358
sqlda->sqlvar[i].sqldata = (char *) sqlda + offset;
359359
sqlda->sqlvar[i].sqllen = sizeof(timestamp);
360360
break;
@@ -540,7 +540,7 @@ ecpg_set_native_sqlda(int lineno, struct sqlda_struct ** _sqlda, const PGresult
540540
sqlda->sqlvar[i].sqllen = sizeof(date);
541541
break;
542542
case ECPGt_timestamp:
543-
ecpg_sqlda_align_add_size(offset, sizeof(timestamp), sizeof(timestamp), &offset, &next_offset);
543+
ecpg_sqlda_align_add_size(offset, sizeof(int64), sizeof(timestamp), &offset, &next_offset);
544544
sqlda->sqlvar[i].sqldata = (char *) sqlda + offset;
545545
sqlda->sqlvar[i].sqllen = sizeof(timestamp);
546546
break;

0 commit comments

Comments
 (0)