Get better errors by using prepare_v2

hdbc · Mar 30, 2011 · 256145d · 256145d
1 parent 02e9b17
commit 256145d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/Database/HDBC/Sqlite3/Statement.hsc b/Database/HDBC/Sqlite3/Statement.hsc
@@ -153,9 +153,11 @@ fstep dbo p =
                                           {seState = "",
                                            seNativeError = 0,
                                            seErrorMsg = "In HDBC step, internal processing error (got SQLITE_ERROR with no error)"})
-         x -> throwSqlError $ SqlError {seState = "",
-                                   seNativeError = fromIntegral x,
-                                   seErrorMsg = "In HDBC step, unexpected result from sqlite3_step"}
+         x -> checkError "step" dbo x
+              >> (throwSqlError $ SqlError 
+                                {seState = "",
+                                 seNativeError = fromIntegral x,
+                                 seErrorMsg = "In HDBC step, internal processing error (got error code with no error)"})
 
 fexecute sstate args = modifyMVar (stomv sstate) doexecute
     where doexecute (Executed sto) = doexecute (Prepared sto)
@@ -216,7 +218,7 @@ fexecuteRaw dbo query =
           case result of
             #{const SQLITE_OK} -> return ()
             s -> do
-              checkError "exec" dbo #{const SQLITE_ERROR}
+              checkError "exec" dbo s
               throwSqlError $ SqlError
                  {seState = "",
                   seNativeError = fromIntegral s,

diff --git a/hdbc-sqlite3-helper.c b/hdbc-sqlite3-helper.c
@@ -91,8 +91,14 @@ int sqlite3_prepare2(finalizeonce *fdb, const char *zSql,
 #ifdef DEBUG_HDBC_SQLITE3
   fprintf(stderr, "\nCalling prepare on %p", db);
 #endif
+#if SQLITE_VERSION_NUMBER > 3003011
+  res = sqlite3_prepare_v2(db, zSql, nBytes, &ppst,
+                        pzTail);
+#else
   res = sqlite3_prepare(db, zSql, nBytes, &ppst,
                         pzTail);
+#endif
+
   /* We don't try to deallocate this in Haskell if there
      was an error. */
   if (res != SQLITE_OK) {