Minor improvements to the ai_logger function

Author: marcobambini

src/sqlite-ai.c

@@ -46,7 +46,7 @@ SQLITE_EXTENSION_INIT1
 #define MIN_ALLOC_MESSAGES                      256
 #define MAX_LORAS                               64      // max 2 or 3 LoRa adapters are used (usually just one)
 
-#define LOG_TABLE_DECLARATION                   "CREATE TEMP TABLE ai_log (id INTEGER PRIMARY KEY, stamp DATETIME DEFAULT CURRENT_TIMESTAMP, type TEXT, message TEXT);"
+#define LOG_TABLE_DECLARATION                   "CREATE TEMP TABLE IF NOT EXISTS ai_log (id INTEGER PRIMARY KEY, stamp DATETIME DEFAULT CURRENT_TIMESTAMP, type TEXT, message TEXT);"
 #define LOG_TABLE_INSERT_STMT                   "INSERT INTO ai_log (type, message) VALUES (?, ?);"
 
 // CONTEXT OPTIONS
@@ -747,7 +747,7 @@ void ai_logger (enum ggml_log_level level, const char *text, void *user_data) {
     // printf("%s %s\n", type, text);
 
     const char *values[] = {type, text};
-    int types[] = {SQLITE_TEXT, SQLITE_TEXT};
+    int types[] = {(type == NULL) ? SQLITE_NULL : SQLITE_TEXT, SQLITE_TEXT};
     int lens[] = {-1, -1};
     sqlite_db_write(NULL, ai->db, LOG_TABLE_INSERT_STMT, values, types, lens, 2);
 }

src/sqlite-ai.h

@@ -24,7 +24,7 @@
 extern "C" {
 #endif
 
-#define SQLITE_AI_VERSION "0.7.2"
+#define SQLITE_AI_VERSION "0.7.3"
 
 SQLITE_AI_API int sqlite3_ai_init (sqlite3 *db, char **pzErrMsg, const sqlite3_api_routines *pApi);
 

src/utils.c

@@ -289,16 +289,19 @@ bool sqlite_sanity_function (sqlite3_context *context, const char *func_name, in
 }
 
 int sqlite_db_write (sqlite3_context *context, sqlite3 *db, const char *sql, const char **values, int types[], int lens[], int count) {
-    sqlite3_stmt *pstmt = NULL;
-    
     // compile sql
+    sqlite3_stmt *pstmt = NULL;
     int rc = sqlite3_prepare_v2(db, sql, -1, &pstmt, NULL);
     if (rc != SQLITE_OK) goto cleanup;
 
+    // ensure parameter count matches
+    int nparams = sqlite3_bind_parameter_count(pstmt);
+    if (nparams != count) {rc = SQLITE_MISMATCH; goto cleanup;}
+    
     // check bindings
     for (int i=0; i<count; ++i) {
-        // sanity check input
-        if ((types[i] != SQLITE_NULL) && (values[i] == NULL)) {
+        // treat NULL value as NULL binding
+        if (values[i] == NULL) {
             rc = sqlite3_bind_null(pstmt, i+1);
             continue;
         }