open-dsi
/
postgres
mirror of https://github.com/postgres/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Applied Zoltan's patch to correctly align interval and timestamp data in ecpg's sqlda.

Browse Source
pull/1/head
Michael Meskes 14 years ago
parent 4509033a00
commit 309411a69e
1 changed files with 4 additions and 4 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 8
      src/interfaces/ecpg/ecpglib/sqlda.c

8
src/interfaces/ecpg/ecpglib/sqlda.c
Unescape View File

@ -127,10 +127,10 @@ sqlda_common_total_size(const PGresult *res, int row, enum COMPAT_MODE compat, l
ecpg_sqlda_align_add_size(offset, sizeof(date), sizeof(date), &offset, &next_offset); ecpg_sqlda_align_add_size(offset, sizeof(date), sizeof(date), &offset, &next_offset);
break; break;
case ECPGt_timestamp: case ECPGt_timestamp:
ecpg_sqlda_align_add_size(offset, sizeof(int), sizeof(timestamp), &offset, &next_offset); ecpg_sqlda_align_add_size(offset, sizeof(int64), sizeof(timestamp), &offset, &next_offset);
break; break;
case ECPGt_interval: case ECPGt_interval:
ecpg_sqlda_align_add_size(offset, sizeof(int), sizeof(interval), &offset, &next_offset); ecpg_sqlda_align_add_size(offset, sizeof(int64), sizeof(interval), &offset, &next_offset);
break; break;
case ECPGt_char: case ECPGt_char:
case ECPGt_unsigned_char: case ECPGt_unsigned_char:
@ -359,7 +359,7 @@ ecpg_set_compat_sqlda(int lineno, struct sqlda_compat ** _sqlda, const PGresult
sqlda->sqlvar[i].sqllen = sizeof(date); sqlda->sqlvar[i].sqllen = sizeof(date);
break; break;
case ECPGt_timestamp: case ECPGt_timestamp:
ecpg_sqlda_align_add_size(offset, sizeof(timestamp), sizeof(timestamp), &offset, &next_offset); ecpg_sqlda_align_add_size(offset, sizeof(int64), sizeof(timestamp), &offset, &next_offset);
sqlda->sqlvar[i].sqldata = (char *) sqlda + offset; sqlda->sqlvar[i].sqldata = (char *) sqlda + offset;
sqlda->sqlvar[i].sqllen = sizeof(timestamp); sqlda->sqlvar[i].sqllen = sizeof(timestamp);
break; break;
@ -545,7 +545,7 @@ ecpg_set_native_sqlda(int lineno, struct sqlda_struct ** _sqlda, const PGresult
sqlda->sqlvar[i].sqllen = sizeof(date); sqlda->sqlvar[i].sqllen = sizeof(date);
break; break;
case ECPGt_timestamp: case ECPGt_timestamp:
ecpg_sqlda_align_add_size(offset, sizeof(timestamp), sizeof(timestamp), &offset, &next_offset); ecpg_sqlda_align_add_size(offset, sizeof(int64), sizeof(timestamp), &offset, &next_offset);
sqlda->sqlvar[i].sqldata = (char *) sqlda + offset; sqlda->sqlvar[i].sqldata = (char *) sqlda + offset;
sqlda->sqlvar[i].sqllen = sizeof(timestamp); sqlda->sqlvar[i].sqllen = sizeof(timestamp);
break; break;

Write Preview
Loading…
Cancel
Save