fix: force triggers update when reopening a db previously initialized with an old sqlite-sync version

the cloudsync_update function has changed between version 0.8.25 and 0.8.26

Author: andinux

src/cloudsync.c

@@ -3373,6 +3373,9 @@ int cloudsync_register (sqlite3 *db, char **pzErrMsg) {
     // load config, if exists
     if (cloudsync_config_exists(db)) {
         cloudsync_context_init(db, ctx, NULL);
+        
+        // make sure to update internal version to current version
+        dbutils_settings_set_key_value(db, NULL, CLOUDSYNC_KEY_LIBVERSION, CLOUDSYNC_VERSION);
     }
 
     return SQLITE_OK;

src/cloudsync.h

@@ -20,7 +20,7 @@
 extern "C" {
 #endif
 
-#define CLOUDSYNC_VERSION                       "0.8.27"
+#define CLOUDSYNC_VERSION                       "0.8.28"
 
 int sqlite3_cloudsync_init (sqlite3 *db, char **pzErrMsg, const sqlite3_api_routines *pApi);
 

src/dbutils.c

@@ -37,6 +37,8 @@ typedef struct {
     cloudsync_context   *data;
 } dbutils_settings_table_context;
 
+int dbutils_settings_check_version (sqlite3 *db, const char *version);
+
 // MARK: - General -
 
 DATABASE_RESULT dbutils_exec (sqlite3_context *context, sqlite3 *db, const char *sql, const char **values, int types[], int lens[], int count, DATABASE_RESULT results[], int expected_types[], int result_count) {
@@ -498,6 +500,10 @@ int dbutils_delete_triggers (sqlite3 *db, const char *table) {
 int dbutils_check_triggers (sqlite3 *db, const char *table, table_algo algo) {
     DEBUG_DBFUNCTION("dbutils_check_triggers %s", table);
 
+    if (dbutils_settings_check_version(db, "0.8.25") <= 0) {
+        dbutils_delete_triggers(db, table);
+    }
+    
     char *trigger_name = NULL;
     int rc = SQLITE_NOMEM;
 
@@ -795,15 +801,15 @@ int dbutils_settings_get_int_value (sqlite3 *db, const char *key) {
     return (int)strtol(buffer, NULL, 0);
 }
 
-int dbutils_settings_check_version (sqlite3 *db) {
+int dbutils_settings_check_version (sqlite3 *db, const char *version) {
     DEBUG_SETTINGS("dbutils_settings_check_version");
     char buffer[256];
     if (dbutils_settings_get_value(db, CLOUDSYNC_KEY_LIBVERSION, buffer, sizeof(buffer)) == NULL) return -666;
 
     int major1, minor1, patch1;
     int major2, minor2, patch2;
     int count1 = sscanf(buffer, "%d.%d.%d", &major1, &minor1, &patch1);
-    int count2 = sscanf(CLOUDSYNC_VERSION, "%d.%d.%d", &major2, &minor2, &patch2);
+    int count2 = sscanf((version == NULL ? CLOUDSYNC_VERSION : version), "%d.%d.%d", &major2, &minor2, &patch2);
 
     if (count1 != 3 || count2 != 3) return -666;
 
@@ -965,7 +971,9 @@ int dbutils_settings_table_load_callback (void *xdata, int ncols, char **values,
         const char *value = values[i+3];
         if (strcmp(key, "algo")!=0) continue;
 
-        table_add_to_context(db, data, crdt_algo_from_name(value), table_name);
+        if (dbutils_check_triggers(db, table_name, crdt_algo_from_name(value)) != SQLITE_OK) return SQLITE_MISUSE;
+        if (table_add_to_context(db, data, crdt_algo_from_name(value), table_name)  == false) return SQLITE_MISUSE;
+        
         DEBUG_SETTINGS("load tbl_name: %s value: %s", key, value);
     }
 

test/unit.c

@@ -36,7 +36,7 @@ int stmt_execute (sqlite3_stmt *stmt, void *data);
 
 sqlite3_int64 dbutils_select (sqlite3 *db, const char *sql, const char **values, int types[], int lens[], int count, int expected_type);
 int dbutils_settings_table_load_callback (void *xdata, int ncols, char **values, char **names);
-int dbutils_settings_check_version (sqlite3 *db);
+int dbutils_settings_check_version (sqlite3 *db, const char *version);
 bool dbutils_migrate (sqlite3 *db);
 const char *opname_from_value (int value);
 int colname_is_legal (const char *name);
@@ -1887,13 +1887,16 @@ bool do_test_dbutils (void) {
     if (p != NULL) goto finalize;
 
     dbutils_settings_set_key_value(db, NULL, CLOUDSYNC_KEY_LIBVERSION, "0.0.0");
-    int cmp = dbutils_settings_check_version(db);
+    int cmp = dbutils_settings_check_version(db, NULL);
     if (cmp == 0) goto finalize;
 
     dbutils_settings_set_key_value(db, NULL, CLOUDSYNC_KEY_LIBVERSION, CLOUDSYNC_VERSION); 
-    cmp = dbutils_settings_check_version(db);
+    cmp = dbutils_settings_check_version(db, NULL);
     if (cmp != 0) goto finalize;
 
+    cmp = dbutils_settings_check_version(db, "0.8.25");
+    if (cmp <= 0) goto finalize;
+    
     //dbutils_settings_table_load_callback(NULL, 0, NULL, NULL);
     dbutils_migrate(NULL);