Changeset: 6ab4376d6e2e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6ab4376d6e2e
Modified Files:
clients/ChangeLog.Feb2013
clients/odbc/driver/ODBCConvert.c
clients/odbc/driver/SQLGetConnectAttr.c
clients/odbc/driver/SQLGetInfo.c
clients/odbc/driver/SQLSetConnectAttr.c
clients/odbc/samples/arraytest.c
Branch: default
Log Message:
Merge with Feb2013 branch.
diffs (145 lines):
diff --git a/clients/ChangeLog.Feb2013 b/clients/ChangeLog.Feb2013
--- a/clients/ChangeLog.Feb2013
+++ b/clients/ChangeLog.Feb2013
@@ -1,3 +1,12 @@
# ChangeLog file for clients
# This file is updated with Maddlog
+* Wed Nov 6 2013 Sjoerd Mullender <sjo...@acm.org>
+- ODBC: Fixed interpretation SQL_C_SLONG/SQL_C_ULONG/SQL_C_LONG to
+ refer to a 32 bit integer always (i.e. "int" on 64 bit architectures
+ despite the name and the Microsoft documentation). This seems to be
+ the consensus.
+- ODBC: Fixed transaction level: MonetDB only supports the highest level
+ (SQL_TXN_SERIALIZABLE), so setting the transaction level can be accepted
+ and ignored.
+
diff --git a/clients/odbc/driver/ODBCConvert.c
b/clients/odbc/driver/ODBCConvert.c
--- a/clients/odbc/driver/ODBCConvert.c
+++ b/clients/odbc/driver/ODBCConvert.c
@@ -1985,9 +1985,9 @@ ODBCFetch(ODBCStmt *stmt,
case SQL_C_LONG:
maxval <<= 31;
if (lenp)
- *lenp = sizeof(long);
+ *lenp = sizeof(int);
if (ardrec && row > 0)
- ptr = (SQLPOINTER) ((char *) ptr + row *
(bind_type == SQL_BIND_BY_COLUMN ? sizeof(long) : bind_type));
+ ptr = (SQLPOINTER) ((char *) ptr + row *
(bind_type == SQL_BIND_BY_COLUMN ? sizeof(int) : bind_type));
break;
case SQL_C_SBIGINT:
maxval <<= 63;
@@ -2047,7 +2047,7 @@ ODBCFetch(ODBCStmt *stmt,
break;
case SQL_C_SLONG:
case SQL_C_LONG:
- *(long *) ptr = nval.sign ? (long) nval.val :
-(long) nval.val;
+ *(int *) ptr = nval.sign ? (int) nval.val :
-(int) nval.val;
break;
case SQL_C_SBIGINT:
*(SQLBIGINT *) ptr = nval.sign ? (SQLBIGINT)
nval.val : -(SQLBIGINT) nval.val;
@@ -2086,9 +2086,9 @@ ODBCFetch(ODBCStmt *stmt,
case SQL_C_ULONG:
maxval <<= 32;
if (lenp)
- *lenp = sizeof(unsigned long);
+ *lenp = sizeof(unsigned int);
if (ardrec && row > 0)
- ptr = (SQLPOINTER) ((char *) ptr + row *
(bind_type == SQL_BIND_BY_COLUMN ? sizeof(unsigned long) : bind_type));
+ ptr = (SQLPOINTER) ((char *) ptr + row *
(bind_type == SQL_BIND_BY_COLUMN ? sizeof(unsigned int) : bind_type));
break;
case SQL_C_UBIGINT:
if (lenp)
@@ -2145,7 +2145,7 @@ ODBCFetch(ODBCStmt *stmt,
*(unsigned short *) ptr = (unsigned short)
nval.val;
break;
case SQL_C_ULONG:
- *(unsigned long *) ptr = (unsigned long)
nval.val;
+ *(unsigned int *) ptr = (unsigned int) nval.val;
break;
case SQL_C_UBIGINT:
*(SQLUBIGINT *) ptr = (SQLUBIGINT) nval.val;
diff --git a/clients/odbc/driver/SQLGetConnectAttr.c
b/clients/odbc/driver/SQLGetConnectAttr.c
--- a/clients/odbc/driver/SQLGetConnectAttr.c
+++ b/clients/odbc/driver/SQLGetConnectAttr.c
@@ -93,6 +93,9 @@ SQLGetConnectAttr_(ODBCDbc *dbc,
BufferLength, StringLengthPtr, SQLINTEGER,
addDbcError, dbc, return SQL_ERROR);
break;
+ case SQL_ATTR_TXN_ISOLATION:
+ *(SQLUINTEGER *) ValuePtr = SQL_TXN_SERIALIZABLE;
+ break;
/* TODO: implement all the other Connection Attributes */
case SQL_ATTR_DISCONNECT_BEHAVIOR:
@@ -103,7 +106,6 @@ SQLGetConnectAttr_(ODBCDbc *dbc,
case SQL_ATTR_TRACEFILE:
case SQL_ATTR_TRANSLATE_LIB:
case SQL_ATTR_TRANSLATE_OPTION:
- case SQL_ATTR_TXN_ISOLATION:
/* Optional feature not implemented */
addDbcError(dbc, "HYC00", NULL, 0);
return SQL_ERROR;
diff --git a/clients/odbc/driver/SQLGetInfo.c b/clients/odbc/driver/SQLGetInfo.c
--- a/clients/odbc/driver/SQLGetInfo.c
+++ b/clients/odbc/driver/SQLGetInfo.c
@@ -436,7 +436,7 @@ SQLGetInfo_(ODBCDbc *dbc,
sValue = "N";
break;
case SQL_DEFAULT_TXN_ISOLATION:
- nValue = SQL_TXN_READ_COMMITTED;
+ nValue = SQL_TXN_SERIALIZABLE;
len = sizeof(SQLUINTEGER);
break;
case SQL_EXPRESSIONS_IN_ORDERBY:
@@ -569,7 +569,7 @@ SQLGetInfo_(ODBCDbc *dbc,
len = sizeof(SQLUINTEGER);
break;
case SQL_TXN_ISOLATION_OPTION:
- nValue = SQL_TXN_REPEATABLE_READ;
+ nValue = SQL_TXN_SERIALIZABLE;
len = sizeof(SQLUINTEGER);
break;
case SQL_INTEGRITY:
diff --git a/clients/odbc/driver/SQLSetConnectAttr.c
b/clients/odbc/driver/SQLSetConnectAttr.c
--- a/clients/odbc/driver/SQLSetConnectAttr.c
+++ b/clients/odbc/driver/SQLSetConnectAttr.c
@@ -101,6 +101,9 @@ SQLSetConnectAttr_(ODBCDbc *dbc,
if (dbc->mid)
mapi_timeout(dbc->mid,
dbc->sql_attr_connection_timeout);
break;
+ case SQL_ATTR_TXN_ISOLATION:
+ /* nothing to change, we only do the highest level */
+ break;
/* TODO: implement connection attribute behavior */
case SQL_ATTR_ACCESS_MODE:
@@ -113,7 +116,6 @@ SQLSetConnectAttr_(ODBCDbc *dbc,
case SQL_ATTR_TRACEFILE:
case SQL_ATTR_TRANSLATE_LIB:
case SQL_ATTR_TRANSLATE_OPTION:
- case SQL_ATTR_TXN_ISOLATION:
/* Optional feature not implemented */
addDbcError(dbc, "HYC00", NULL, 0);
return SQL_ERROR;
diff --git a/clients/odbc/samples/arraytest.c b/clients/odbc/samples/arraytest.c
--- a/clients/odbc/samples/arraytest.c
+++ b/clients/odbc/samples/arraytest.c
@@ -126,7 +126,7 @@ main(int argc, char **argv)
SQLULEN *processed;
SQLUSMALLINT *status;
SQLINTEGER offset;
- long *data_i;
+ int *data_i;
char (*data_s)[20];
SQLLEN *data_slen;
float *data_f;
@@ -370,7 +370,7 @@ main(int argc, char **argv)
data[i].t.hour, data[i].t.minute,
data[i].t.second);
fprintf(stderr,
- "%ld %g %s %04d-%02d-%02d %02d:%02d:%02d\n",
+ "%d %g %s %04d-%02d-%02d %02d:%02d:%02d\n",
data_i[i], data_f[i], data_s[i],
data_d[i].year, data_d[i].month, data_d[i].day,
data_t[i].hour, data_t[i].minute,
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
