Changeset ba2393a in tol

Timestamp:

Nov 9, 2015, 5:17:08 PM (11 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

9ae89b6

Parents:

9637442

Message:

Refs #1893

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

File:

• tol/dbdrivers/libtolsqlite.c (modified) (6 diffs)

tol/dbdrivers/libtolsqlite.c

@@ -50 +50 @@
   int num_rows;
   int current_tuple;
+  int result_step;
 } sqlited;
 
@@ -93 +94 @@
   dbd->num_rows = 0;
   dbd->current_tuple = 0;
+  dbd->result_step = 0;
 
   rc = sqlite3_open_v2(database, &(dbd->conn),
@@ -171 +173 @@
   if(ok!=SQLITE_OK)
   { // Error
+    stdOutWriter("\nERROR: [sqlite_OpenQuery] \n");
     stdOutWriter(sqlite3_errmsg(dbd->conn));
+    stdOutWriter("\nquery:\n");
+    stdOutWriter(query);    
+    stdOutWriter("\n");
     return 0; 
   } 
-  dbd->num_cols = sqlite3_data_count(dbd->result);
+  dbd->num_cols = sqlite3_column_count(dbd->result);
   return 1;
 }
@@ -185 +191 @@
 DLLEXPORT(int) sqlite_ExecQuery(sqlited *dbd, const char *query)
 {
-  const char *pzTail=0;
-  int ok = sqlite3_prepare_v2(
-    dbd->conn,       /* Database handle */
-    query,           /* SQL statement, UTF-8 encoded */
-    strlen(query),   /* Maximum length of zSql in bytes. */
-    &(dbd->result),  /* OUT: Statement handle */
-    &pzTail           /* OUT: Pointer to unused portion of zSql */
+  char *errmsg=0;
+  int ok_exec;
+  ok_exec = sqlite3_exec(
+    dbd->conn,                                  /* An open database */
+    query,                           /* SQL to be evaluated */
+    NULL,  /* Callback function */
+    NULL,                                    /* 1st argument to callback */
+    &errmsg                              /* Error msg written here */
   );
-  if(ok!=SQLITE_OK)
+  if(ok_exec!=SQLITE_OK)
   { // Error
-    stdOutWriter(sqlite3_errmsg(dbd->conn));
+    stdOutWriter("\nERROR: [sqlite_ExecQuery] \n");
+    stdOutWriter(errmsg);
+    stdOutWriter("\nquery:\n");
+    stdOutWriter(query);    
+    stdOutWriter("\n");
     return 0; 
   } 
@@ -207 +218 @@
 DLLEXPORT(int) sqlite_GetNext(sqlited *dbd)
 {
-  int ok = sqlite3_step(dbd->result);    
-  if(ok!=SQLITE_DONE) {
-    stdOutWriter(sqlite3_errmsg(dbd->conn));
-    return(0);
-  }
-  return(1);
+  if(dbd->result_step==SQLITE_DONE) { return(0); }
+  dbd->result_step = sqlite3_step(dbd->result); 
+  if(dbd->result_step==SQLITE_ROW) { return(1); }
+  if(dbd->result_step==SQLITE_DONE) { return(1); }
+  stdOutWriter(sqlite3_errmsg(dbd->conn));
+  return(0);
 }
 
@@ -250 +261 @@
   for(n=0;name[n];n++) { name[n] = tolower(name[n]); }  
   if((n>3) & (name[0]=='d') & (name[1]=='t') & (name[2]=='_')) 
+  { dbType = TypeDBDate; }
+  else if((n>3) & (name[0]=='d') & (name[1]=='d') & (name[2]=='_')) 
   { dbType = TypeDBDate; }
   else if((type==SQLITE_INTEGER) || (type==SQLITE_FLOAT))