Changeset 9d6a77b in tol

Timestamp:

Jan 12, 2016, 5:11:27 PM (11 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

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

Children:

9b74047

Parents:

eb0481b

Message:

refs #1906, se usan los tipos adecuados SQLLEN, se corrige la conversion de fraction a msecond

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

File:

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

tol/dbdrivers/libtolodbc.c

@@ -426 +426 @@
 {
   SQLRETURN status;
-  SQLINTEGER row_count=-1;
+  SQLLEN row_count=-1;
   
   if(odbc_OpenQuery(dbd, query))
@@ -473 +473 @@
   SQLCHAR szColName [SQLMAXWORD+1];
   SQLSMALLINT pfSqlType, pibScale, pfNullable;
-  SQLUINTEGER pcbColDef;
+  SQLULEN ColumnSize;
   SQLRETURN status;
   int ret = TypeDBUnknown;
  
   status = SQLDescribeCol(dbd->hstmt, nfield+1, szColName, SQLMAXWORD, NULL,
-                          &pfSqlType, &pcbColDef, &pibScale, &pfNullable);
+                          &pfSqlType, &ColumnSize, &pibScale, &pfNullable);
   if(!checkSQLRet(status, dbd, __LINE__, GET_DIAG_STMT)) {
     return -1;
@@ -484 +484 @@
 
   dbd->typeList[nfield] = pfSqlType;
-  //printf( "pfSqlType=%d\n", pfSqlType ); 
+  // printf( "pfSqlType=%d\n", pfSqlType ); 
   switch (pfSqlType)
     {
@@ -524 +524 @@
 
   SQLSMALLINT pfSqlType;
-  SQLUINTEGER pcbColDef;
+  SQLULEN ColumnSize;
   SQLSMALLINT pibScale;
   SQLSMALLINT pfNullable;
@@ -530 +530 @@
   status = SQLDescribeCol(dbd->hstmt, nfield+1,
                           (SQLCHAR*)fieldName, SQLMAXWORD, NULL,
-                          &pfSqlType, &pcbColDef,
+                          &pfSqlType, &ColumnSize,
                           &pibScale, &pfNullable);
 
@@ -596 +596 @@
   // variables for SQLGetData function
   SQLPOINTER pointer;
-  SQLINTEGER pcbValue;
+  SQLLEN pcbValue;
   int size;
   char szErrMsg[256];
@@ -690 +690 @@
 {
   SQLRETURN status;
-  SQLINTEGER num_available=0, num_required=MAX_TEXT_FIELD_LENGTH;
+  SQLINTEGER num_required=MAX_TEXT_FIELD_LENGTH;
+  SQLLEN num_available=0;
   UCHAR *str, *long_str;
 
@@ -743 +744 @@
 
   SQLPOINTER pointer;
-  SQLINTEGER pcbValue;
+  SQLLEN pcbValue;
   int size;
   char *errmsg;
@@ -773 +774 @@
     case SQL_TYPE_TIMESTAMP:
 #endif
+      // printf( "preparing to extract SQL_TYPE_TIMESTAMP\n" );
       size        = sizeof(struct tagTIMESTAMP_STRUCT);
       x_timestamp = (struct tagTIMESTAMP_STRUCT *)malloc(size);
@@ -794 +796 @@
     return 0; 
   }
-
   /* pcbValue must be the length of the data available to return.
    * But also can be: 
@@ -827 +828 @@
     case SQL_TYPE_TIMESTAMP:
 #endif
+#ifdef __DUMP_TIMESTAMP__
+      printf( "year = %hd\n", x_timestamp->year );
+      printf( "month = %hd\n", x_timestamp->month );
+      printf( "day = %hd\n", x_timestamp->day );
+      printf( "hour = %hd\n", x_timestamp->hour );
+      printf( "minute = %hd\n", x_timestamp->minute );
+      printf( "second = %hd\n", x_timestamp->second );
+      printf( "fraction = %d\n", x_timestamp->fraction );
+#endif
       (*dateval)->year    = (unsigned short)(x_timestamp->year);
       (*dateval)->month   = (unsigned short)(x_timestamp->month);
@@ -833 +843 @@
       (*dateval)->minute  = (unsigned short)(x_timestamp->minute);
       (*dateval)->second  = (unsigned short)(x_timestamp->second);
-      (*dateval)->msecond = (unsigned short)(x_timestamp->fraction);
+      // The fraction of a second, in billionths of a second.  Possible values are 0 to 999,999,999.
+      //(*dateval)->msecond = (unsigned short)(x_timestamp->fraction);
+      if ( x_timestamp->fraction > 999999999 )
+        {
+        (*dateval)->msecond = 999;
+        }
+      else
+        {
+        (*dateval)->msecond = (unsigned short)(x_timestamp->fraction/1000000.0);
+        }
+#ifdef __DUMP_TIMESTAMP__
+      printf( "(*dateval)->msecond = %d\n", (*dateval)->msecond );
+#endif
     }