Changeset 4e9b5ad in tol

Timestamp:

Dec 3, 2010, 11:07:28 AM (16 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

76a56bf

Parents:

1121f7d

Message:

fixes #1027, libtolodbc should check for constants returned by ODBC 3.0

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@2743 be4846ae-f051-483a-831f-b64e7d08527f

File:

• tol/dbdrivers/libtolodbc.c (modified) (8 diffs)

tol/dbdrivers/libtolodbc.c

@@ -362 +362 @@
 
   dbd->typeList[nfield] = pfSqlType;
+  //printf( "pfSqlType=%d\n", pfSqlType ); 
   switch (pfSqlType)
     {
@@ -377 +378 @@
       }
     case SQL_DATE: case SQL_TIME: case SQL_TIMESTAMP:
+#if (ODBCVER >= 0x0300)
+    case SQL_TYPE_DATE: case SQL_TYPE_TIME: case SQL_TYPE_TIMESTAMP:
+#endif
       {
         ret = TypeDBDate;
@@ -618 +622 @@
     {
     case SQL_DATE:
+#if (ODBCVER >= 0x0300)
+    case SQL_TYPE_DATE:
+#endif
       size   = sizeof(struct tagDATE_STRUCT);
       x_date = (struct tagDATE_STRUCT *)malloc(size);
@@ -624 +631 @@
       break;
     case SQL_TIME:
+#if (ODBCVER >= 0x0300)
+    case SQL_TYPE_TIME:
+#endif
       size   = sizeof(struct tagTIME_STRUCT);
       x_time = (struct tagTIME_STRUCT *)malloc(size);
@@ -630 +640 @@
       break;
     case SQL_TIMESTAMP:
+#if (ODBCVER >= 0x0300)
+    case SQL_TYPE_TIMESTAMP:
+#endif
       size        = sizeof(struct tagTIMESTAMP_STRUCT);
       x_timestamp = (struct tagTIMESTAMP_STRUCT *)malloc(size);
@@ -665 +678 @@
     {
     case SQL_DATE:
+#if (ODBCVER >= 0x0300)
+    case SQL_TYPE_DATE:
+#endif
       (*dateval)->year  = (unsigned short)(x_date->year);
       (*dateval)->month = (unsigned short)(x_date->month);
@@ -670 +686 @@
       break;
     case SQL_TIME:
+#if (ODBCVER >= 0x0300)
+    case SQL_TYPE_TIME:
+#endif
       (*dateval)->hour    = (unsigned short)(x_time->hour);
       (*dateval)->minute  = (unsigned short)(x_time->minute);
@@ -675 +694 @@
       break;
     case SQL_TIMESTAMP:
+#if (ODBCVER >= 0x0300)
+    case SQL_TYPE_TIMESTAMP:
+#endif
       (*dateval)->year    = (unsigned short)(x_timestamp->year);
       (*dateval)->month   = (unsigned short)(x_timestamp->month);