Skip to content

Commit dadb718

Browse files
author
Hiroshi Inoue
committed
Bug fixes for the 2002-03-08 change.
1) Put back the error message for SQLError(). 2) Change Disallow premature to handle the SELECTed result. 3) Put back the behavior of AUTUCOMMIT mode change. 4) Fix SQLColumns for ODBC3.0. 5) Improve the handling of variable bookmark in ODBC3.0. 6) Enable Recognize Unique Index Button.
1 parent d0d3ab5 commit dadb718

File tree

9 files changed

+77
-35
lines changed

9 files changed

+77
-35
lines changed

‎src/interfaces/odbc/bind.c

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -199,12 +199,20 @@ PGAPI_BindCol(
199199
else
200200
{
201201
/* Make sure it is the bookmark data type */
202-
if (fCType != SQL_C_BOOKMARK)
202+
if (fCType == SQL_C_BOOKMARK)
203+
switch (fCType)
203204
{
204-
stmt->errormsg = "Column 0 is not of type SQL_C_BOOKMARK";
205-
stmt->errornumber = STMT_PROGRAM_TYPE_OUT_OF_RANGE;
206-
SC_log_error(func, "", stmt);
207-
return SQL_ERROR;
205+
case SQL_C_BOOKMARK:
206+
#if (ODBCVER >= 0x0300)
207+
case SQL_C_VARBOOKMARK:
208+
#endif /* ODBCVER */
209+
break;
210+
default:
211+
stmt->errormsg = "Column 0 is not of type SQL_C_BOOKMARK";
212+
inolog("Column 0 is type %d not of type SQL_C_BOOKMARK", fCType);
213+
stmt->errornumber = STMT_PROGRAM_TYPE_OUT_OF_RANGE;
214+
SC_log_error(func, "", stmt);
215+
return SQL_ERROR;
208216
}
209217

210218
stmt->bookmark.buffer = rgbValue;

‎src/interfaces/odbc/connection.c

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1322,7 +1322,7 @@ CC_send_query(ConnectionClass *self, char *query, QueryInfo *qi, BOOL clear_resu
13221322
if ((swallow != '\0') || SOCK_get_errcode(sock) != 0)
13231323
{
13241324
self->errornumber = CONNECTION_BACKEND_CRAZY;
1325-
self->errormsg = "Unexpected protocol character from backend (send_query - I)";
1325+
QR_set_message(res, "Unexpected protocol character from backend (send_query - I)");
13261326
QR_set_status(res, PGRES_FATAL_ERROR);
13271327
ReadyToReturn = TRUE;
13281328
retres = cmdres;
@@ -1346,21 +1346,21 @@ CC_send_query(ConnectionClass *self, char *query, QueryInfo *qi, BOOL clear_resu
13461346
if (msgbuffer[0] != '\0' && msgbuffer[strlen(msgbuffer) - 1] == '\n')
13471347
msgbuffer[strlen(msgbuffer) - 1] = '\0';
13481348

1349-
self->errormsg = msgbuffer;
13501349

1351-
mylog("send_query: 'E' - %s\n", self->errormsg);
1352-
qlog("ERROR from backend during send_query: '%s'\n", self->errormsg);
1350+
mylog("send_query: 'E' - %s\n", msgbuffer);
1351+
qlog("ERROR from backend during send_query: '%s'\n", msgbuffer);
13531352

13541353
/* We should report that an error occured. Zoltan */
13551354

1356-
if (!strncmp(self->errormsg, "FATAL", 5))
1355+
if (!strncmp(msgbuffer, "FATAL", 5))
13571356
{
13581357
self->errornumber = CONNECTION_SERVER_REPORTED_ERROR;
13591358
CC_set_no_trans(self);
13601359
}
13611360
else
13621361
self->errornumber = CONNECTION_SERVER_REPORTED_WARNING;
13631362
QR_set_status(res, PGRES_FATAL_ERROR);
1363+
QR_set_message(res, msgbuffer);
13641364
QR_set_aborted(res, TRUE);
13651365
aborted = TRUE;
13661366
while (msg_truncated)
@@ -1487,7 +1487,7 @@ CC_send_query(ConnectionClass *self, char *query, QueryInfo *qi, BOOL clear_resu
14871487
retres = NULL;
14881488
}
14891489
}
1490-
else
1490+
if (retres)
14911491
{
14921492
/*
14931493
* discard results other than errors.
@@ -1501,6 +1501,11 @@ CC_send_query(ConnectionClass *self, char *query, QueryInfo *qi, BOOL clear_resu
15011501
qres->next = NULL;
15021502
QR_Destructor(qres);
15031503
}
1504+
/*
1505+
* If error message isn't set
1506+
*/
1507+
if (retres && (!self->errormsg || !self->errormsg[0]))
1508+
self->errormsg = QR_get_message(retres);
15041509
}
15051510
}
15061511
}

‎src/interfaces/odbc/convert.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -349,8 +349,8 @@ copy_and_convert_field(StatementClass *stmt, Int4 field_type, void *value, Int2
349349
{
350350
pbic = &stmt->bindings[stmt->current_col];
351351
if (pbic->data_left == -2)
352-
pbic->data_left = (cbValueMax > 0) ? 0 : -1; /* This seems to be *
353-
* needed for ADO ? */
352+
pbic->data_left = (cbValueMax > 0) ? 0 : -1; /* This seems to be *
353+
* needed for ADO ? */
354354
if (pbic->data_left == 0)
355355
{
356356
if (pbic->ttlbuf != NULL)

‎src/interfaces/odbc/dlg_specific.c

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -175,9 +175,9 @@ driver_options_update(HWND hdlg, ConnInfo *ci, BOOL updateProfile)
175175
comval->commlog = IsDlgButtonChecked(hdlg, DRV_COMMLOG);
176176
comval->disable_optimizer = IsDlgButtonChecked(hdlg, DRV_OPTIMIZER);
177177
comval->ksqo = IsDlgButtonChecked(hdlg, DRV_KSQO);
178+
comval->unique_index = IsDlgButtonChecked(hdlg, DRV_UNIQUEINDEX);
178179
if (!ci)
179180
{
180-
comval->unique_index = IsDlgButtonChecked(hdlg, DRV_UNIQUEINDEX);
181181
comval->onlyread = IsDlgButtonChecked(hdlg, DRV_READONLY);
182182
}
183183
comval->use_declarefetch = IsDlgButtonChecked(hdlg, DRV_USEDECLAREFETCH);
@@ -442,15 +442,13 @@ updateCommons(const ConnInfo *ci)
442442
SQLWritePrivateProfileString(sectionName,
443443
INI_KSQO, tmp, fileName);
444444

445+
sprintf(tmp, "%d", comval->unique_index);
446+
SQLWritePrivateProfileString(sectionName, INI_UNIQUEINDEX, tmp, fileName);
445447
/*
446-
* Never update the onlyread, unique_index from this module.
448+
* Never update the onlyread from this module.
447449
*/
448450
if (!ci)
449451
{
450-
sprintf(tmp, "%d", comval->unique_index);
451-
SQLWritePrivateProfileString(sectionName, INI_UNIQUEINDEX, tmp,
452-
fileName);
453-
454452
sprintf(tmp, "%d", comval->onlyread);
455453
SQLWritePrivateProfileString(sectionName, INI_READONLY, tmp,
456454
fileName);

‎src/interfaces/odbc/info.c

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1734,7 +1734,11 @@ PGAPI_Columns(
17341734
* a statement is actually executed, so we'll have to do this
17351735
* ourselves.
17361736
*/
1737+
#if (ODBCVER >= 0x0300)
1738+
result_cols = 18;
1739+
#else
17371740
result_cols = 14;
1741+
#endif /* ODBCVER */
17381742
extend_bindings(stmt, result_cols);
17391743

17401744
/* set the field names */
@@ -1803,7 +1807,12 @@ PGAPI_Columns(
18031807
set_tuplefield_string(&row->tuple[11], "");
18041808

18051809
#if (ODBCVER >= 0x0300)
1810+
set_tuplefield_null(&row->tuple[12]);
18061811
set_tuplefield_int2(&row->tuple[13], sqltype);
1812+
set_tuplefield_null(&row->tuple[14]);
1813+
set_tuplefield_int4(&row->tuple[15], pgtype_length(stmt, the_type, PG_STATIC, PG_STATIC));
1814+
set_tuplefield_int4(&row->tuple[16], 0);
1815+
set_tuplefield_string(&row->tuple[17], "No");
18071816
#else
18081817
set_tuplefield_int4(&row->tuple[12], pgtype_display_size(stmt, the_type, PG_STATIC, PG_STATIC));
18091818
set_tuplefield_int4(&row->tuple[13], the_type);
@@ -1918,9 +1927,12 @@ PGAPI_Columns(
19181927
break;
19191928
default:
19201929
set_tuplefield_int2(&row->tuple[13], sqltype);
1930+
set_tuplefield_null(&row->tuple[14]);
19211931
break;
19221932
}
1933+
set_tuplefield_int4(&row->tuple[15], pgtype_length(stmt, field_type, PG_STATIC, PG_STATIC));
19231934
set_tuplefield_int4(&row->tuple[16], field_number);
1935+
set_tuplefield_null(&row->tuple[17]);
19241936
#else
19251937
set_tuplefield_int4(&row->tuple[13], field_type);
19261938
#endif /* ODBCVER */
@@ -1956,16 +1968,26 @@ PGAPI_Columns(
19561968
set_tuplefield_string(&row->tuple[1], "");
19571969
set_tuplefield_string(&row->tuple[2], table_name);
19581970
set_tuplefield_string(&row->tuple[3], "xmin");
1959-
set_tuplefield_int2(&row->tuple[4], pgtype_to_sqltype(stmt, the_type));
1971+
sqltype = pgtype_to_sqltype(stmt, the_type);
1972+
set_tuplefield_int2(&row->tuple[4], sqltype);
19601973
set_tuplefield_string(&row->tuple[5], pgtype_to_name(stmt, the_type));
19611974
set_tuplefield_int4(&row->tuple[6], pgtype_precision(stmt, the_type, PG_STATIC, PG_STATIC));
19621975
set_tuplefield_int4(&row->tuple[7], pgtype_length(stmt, the_type, PG_STATIC, PG_STATIC));
19631976
set_nullfield_int2(&row->tuple[8], pgtype_scale(stmt, the_type, PG_STATIC));
19641977
set_nullfield_int2(&row->tuple[9], pgtype_radix(stmt, the_type));
19651978
set_tuplefield_int2(&row->tuple[10], SQL_NO_NULLS);
19661979
set_tuplefield_string(&row->tuple[11], "");
1980+
#if (ODBCVER >= 0x0300)
1981+
set_tuplefield_null(&row->tuple[12]);
1982+
set_tuplefield_int2(&row->tuple[13], sqltype);
1983+
set_tuplefield_null(&row->tuple[14]);
1984+
set_tuplefield_int4(&row->tuple[15], pgtype_length(stmt, the_type, PG_STATIC, PG_STATIC));
1985+
set_tuplefield_int4(&row->tuple[16], 0);
1986+
set_tuplefield_string(&row->tuple[17], "No");
1987+
#else
19671988
set_tuplefield_int4(&row->tuple[12], pgtype_display_size(stmt, the_type, PG_STATIC, PG_STATIC));
19681989
set_tuplefield_int4(&row->tuple[13], the_type);
1990+
#endif /* ODBCVER */
19691991

19701992
QR_add_tuple(res, row);
19711993
}

‎src/interfaces/odbc/options.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -342,9 +342,9 @@ PGAPI_SetConnectOption(
342342
break;
343343

344344
case SQL_AUTOCOMMIT:
345-
if (vParam == SQL_AUTOCOMMIT_ON && CC_is_in_trans(conn))
345+
if (vParam == SQL_AUTOCOMMIT_ON && CC_is_in_autocommit(conn))
346346
break;
347-
else if (vParam == SQL_AUTOCOMMIT_OFF && !CC_is_in_trans(conn))
347+
else if (vParam == SQL_AUTOCOMMIT_OFF && !CC_is_in_autocommit(conn))
348348
break;
349349
if (CC_is_in_trans(conn))
350350
CC_commit(conn);

‎src/interfaces/odbc/psqlodbc.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*
66
* Comments: See "notice.txt" for copyright and license information.
77
*
8-
* $Id: psqlodbc.h,v 1.58 2002/03/08 08:52:53 inoue Exp $
8+
* $Id: psqlodbc.h,v 1.59 2002/03/11 10:25:57 inoue Exp $
99
*
1010
*/
1111

‎src/interfaces/odbc/results.c

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,7 @@ PGAPI_DescribeCol(
189189

190190
/* gets all the information about a specific column */
191191
StatementClass *stmt = (StatementClass *) hstmt;
192+
ConnectionClass *conn;
192193
QResultClass *res;
193194
char *col_name = NULL;
194195
Int4 fieldtype = 0;
@@ -200,22 +201,24 @@ PGAPI_DescribeCol(
200201
int len = 0;
201202
RETCODE result;
202203

203-
mylog("%s: entering...\n", func);
204+
mylog("%s: entering.%d..\n", func, icol);
204205

205206
if (!stmt)
206207
{
207208
SC_log_error(func, "", NULL);
208209
return SQL_INVALID_HANDLE;
209210
}
210211

211-
ci = &(SC_get_conn(stmt)->connInfo);
212+
conn = SC_get_conn(stmt);
213+
ci = &(conn->connInfo);
212214

213215
SC_clear_error(stmt);
214216

215217
#if (ODBCVER >= 0x0300)
216218
if (0 == icol) /* bookmark column */
217219
{
218-
SQLSMALLINT fType = SQL_INTEGER;
220+
SQLSMALLINT fType = stmt->options.use_bookmarks == SQL_UB_VARIABLE ? SQL_BINARY : SQL_INTEGER;
221+
219222
if (szColName && cbColNameMax > 0)
220223
*szColName = '\0';
221224
if (pcbColName)
@@ -440,7 +443,7 @@ PGAPI_ColAttributes(
440443
break;
441444
case SQL_DESC_TYPE:
442445
if (pfDesc)
443-
*pfDesc = SQL_INTEGER;
446+
*pfDesc = stmt->options.use_bookmarks == SQL_UB_VARIABLE ? SQL_BINARY : SQL_INTEGER;
444447
break;
445448
}
446449
return SQL_SUCCESS;
@@ -813,12 +816,19 @@ PGAPI_GetData(
813816
}
814817

815818
/* Make sure it is the bookmark data type */
816-
if (fCType != SQL_C_BOOKMARK)
819+
switch (fCType)
817820
{
818-
stmt->errormsg = "Column 0 is not of type SQL_C_BOOKMARK";
819-
stmt->errornumber = STMT_PROGRAM_TYPE_OUT_OF_RANGE;
820-
SC_log_error(func, "", stmt);
821-
return SQL_ERROR;
821+
case SQL_C_BOOKMARK:
822+
#if (ODBCVER >= 0x0300)
823+
case SQL_C_VARBOOKMARK:
824+
#endif /* ODBCVER */
825+
break;
826+
default:
827+
stmt->errormsg = "Column 0 is not of type SQL_C_BOOKMARK";
828+
inolog("Column 0 is type %d not of type SQL_C_BOOKMARK", fCType);
829+
stmt->errornumber = STMT_PROGRAM_TYPE_OUT_OF_RANGE;
830+
SC_log_error(func, "", stmt);
831+
return SQL_ERROR;
822832
}
823833

824834
get_bookmark = TRUE;

‎src/interfaces/odbc/statement.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -959,8 +959,7 @@ SC_execute(StatementClass *self)
959959
mylog(" Sending SELECT statement on stmt=%u, cursor_name='%s'\n", self, self->cursor_name);
960960

961961
/* send the declare/select */
962-
res = CC_send_query(conn, self->stmt_with_params, NULL, TRUE);
963-
962+
res = CC_send_query(conn, self->stmt_with_params, NULL, FALSE);
964963
if (SC_is_fetchcursor(self) && res != NULL &&
965964
QR_command_successful(res))
966965
{
@@ -1068,7 +1067,7 @@ SC_execute(StatementClass *self)
10681067
else
10691068
{
10701069
self->errornumber = STMT_EXEC_ERROR;
1071-
self->errormsg = "Error while executing the query";
1070+
self->errormsg = conn->errormsg;
10721071
}
10731072

10741073
if (!self->internal)

0 commit comments

Comments
 (0)