From 1546613bb2d5a7f19b625dc163f1c300f81884e1 Mon Sep 17 00:00:00 2001
From: Hiroshi Inoue
Date: Wed, 27 Aug 2003 10:17:53 +0000
Subject: 1) Fix a bug on SQLSetStmtAttr(.., SQL_CONCURRENCY) reported by
 Shachar Shemesh. 2) Apply a patch to changes the storage type of the debug
 "func" variables    to be stored in the constant area of the program(Shachar
 Shemesh). 3) Correct the column size in case of bytea as LO.

---
 statement.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'statement.c')

diff --git a/statement.c b/statement.c
index eeb735c..2b4119b 100644
--- a/statement.c
+++ b/statement.c
@@ -81,7 +81,7 @@ RETCODE		SQL_API
 PGAPI_AllocStmt(HDBC hdbc,
 				HSTMT FAR * phstmt)
 {
-	static char *func = "PGAPI_AllocStmt";
+	CSTR func = "PGAPI_AllocStmt";
 	ConnectionClass *conn = (ConnectionClass *) hdbc;
 	StatementClass *stmt;
 
@@ -135,7 +135,7 @@ RETCODE		SQL_API
 PGAPI_FreeStmt(HSTMT hstmt,
 			   UWORD fOption)
 {
-	static char *func = "PGAPI_FreeStmt";
+	CSTR func = "PGAPI_FreeStmt";
 	StatementClass *stmt = (StatementClass *) hstmt;
 
 	mylog("%s: entering...hstmt=%u, fOption=%d\n", func, hstmt, fOption);
@@ -218,6 +218,9 @@ InitializeStatementOptions(StatementOptions *opt)
 	opt->cursor_type = SQL_CURSOR_FORWARD_ONLY;
 	opt->retrieve_data = SQL_RD_ON;
 	opt->use_bookmarks = SQL_UB_OFF;
+#if (ODBCVER >= 0x0300)
+	opt->metadata_id = SQL_FALSE;
+#endif /* ODBCVER */
 }
 
 
@@ -845,7 +848,7 @@ SC_get_bookmark(StatementClass *self)
 RETCODE
 SC_fetch(StatementClass *self)
 {
-	static char *func = "SC_fetch";
+	CSTR func = "SC_fetch";
 	QResultClass *res = SC_get_Curres(self);
 	ARDFields	*opts;
 	int			retval,
@@ -1024,7 +1027,7 @@ SC_fetch(StatementClass *self)
 RETCODE
 SC_execute(StatementClass *self)
 {
-	static char *func = "SC_execute";
+	CSTR func = "SC_execute";
 	ConnectionClass *conn;
 	APDFields	*apdopts;
 	char		was_ok, was_nonfatal, was_rows_affected = 1;
-- 
cgit v1.2.3