Fixed cloudsync_network_logout

Author: marcobambini

src/cloudsync.c

@@ -2613,18 +2613,7 @@ int cloudsync_cleanup (cloudsync_context *data, const char *table_name) {
 }
 
 int cloudsync_cleanup_all (cloudsync_context *data) {
-    // cleanup all tables in the data context
-    while (data->tables_count > 0) {
-        cloudsync_table_context *t = data->tables[data->tables_count - 1];
-        table_remove(data, t);
-        table_free(t);
-    }
-    
-    // cleanup database
-    cloudsync_reset_siteid(data);
-    dbutils_settings_cleanup(data);
-    
-    return DBRES_OK;
+    return database_cleanup(data);
 }
 
 int cloudsync_terminate (cloudsync_context *data) {

src/cloudsync.h

@@ -17,7 +17,7 @@
 extern "C" {
 #endif
 
-#define CLOUDSYNC_VERSION                       "0.9.81"
+#define CLOUDSYNC_VERSION                       "0.9.82"
 #define CLOUDSYNC_MAX_TABLENAME_LEN             512
 
 #define CLOUDSYNC_VALUE_NOTSET                  -1

src/database.h

@@ -73,6 +73,7 @@ int  database_create_metatable (cloudsync_context *data, const char *table_name)
 int  database_create_triggers (cloudsync_context *data, const char *table_name, table_algo algo);
 int  database_delete_triggers (cloudsync_context *data, const char *table_name);
 int  database_pk_names (cloudsync_context *data, const char *table_name, char ***names, int *count);
+int  database_cleanup (cloudsync_context *data);
 
 int database_count_pk (cloudsync_context *data, const char *table_name, bool not_null);
 int database_count_nonpk (cloudsync_context *data, const char *table_name);

src/network.c

@@ -934,24 +934,21 @@ void cloudsync_network_logout (sqlite3_context *context, int argc, sqlite3_value
     int nrows, ncols;
     rc = sqlite3_get_table(db, sql, &result, &nrows, &ncols, NULL);
     if (rc != SQLITE_OK) {
-        errmsg = cloudsync_memory_mprintf("Unable to get current cloudsync configuration. %s", sqlite3_errmsg(db));
+        errmsg = cloudsync_memory_mprintf("Unable to get current cloudsync configuration %s", sqlite3_errmsg(db));
         goto finalize;
     }
 
     // run everything in a savepoint
     rc = database_begin_savepoint(data, "cloudsync_logout_savepoint;");
     if (rc != SQLITE_OK) {
-        errmsg = cloudsync_memory_mprintf("Unable to create cloudsync_logout savepoint. %s", sqlite3_errmsg(db));
+        errmsg = cloudsync_memory_mprintf("Unable to create cloudsync_logout savepoint %s", cloudsync_errmsg(data));
         goto finalize;
     }
     savepoint_created = true;
 
-    // TODO: is it right to use the tables in cloudsync_context?
-    // What happen if another connection later augmented another table not originally loaded in this cloudsync_context?
-    // disable cloudsync for all the previously enabled tables: cloudsync_cleanup('*')
     rc = cloudsync_cleanup_all(data);
     if (rc != SQLITE_OK) {
-        errmsg = cloudsync_memory_mprintf("Unable to cleanup current cloudsync configuration. %s", sqlite3_errmsg(db));
+        errmsg = cloudsync_memory_mprintf("Unable to cleanup current database %s", cloudsync_errmsg(data));
         goto finalize;
     }
 

src/postgresql/database_postgresql.c

@@ -808,6 +808,11 @@ int database_select_blob_2int (cloudsync_context *data, const char *sql, char **
     return database_select3_values(data, sql, value, len, value2, value3);
 }
 
+int database_cleanup (cloudsync_context *data) {
+    // NOOP
+    return DBRES_OK;
+}
+
 // MARK: - STATUS -
 int database_errcode (cloudsync_context *data) {
     return cloudsync_errcode(data);

src/sqlite/database_sqlite.c

@@ -451,6 +451,30 @@ int database_count_notnull_without_default (cloudsync_context *data, const char
     return (int)count;
 }
 
+int database_cleanup (cloudsync_context *data) {
+    char *sql = "SELECT name FROM sqlite_master WHERE type='table' AND name NOT LIKE 'cloudsync_%' AND name NOT LIKE '%_cloudsync';";
+    sqlite3 *db = (sqlite3 *)cloudsync_db(data);
+    
+    char **result = NULL;
+    char *errmsg = NULL;
+    int nrows, ncols;
+    int rc = sqlite3_get_table(db, sql, &result, &nrows, &ncols, &errmsg);
+    if (rc != SQLITE_OK) {
+        cloudsync_set_error(data, (errmsg) ? errmsg : "Error retrieving augmented tables", rc);
+        goto exit_cleanup;
+    }
+    
+    for (int i = ncols; i < nrows+ncols; i+=ncols) {
+        int rc2 = cloudsync_cleanup(data, result[i]);
+        if (rc2 != SQLITE_OK) {rc = rc2; goto exit_cleanup;}
+    }
+    
+exit_cleanup:
+    if (result) sqlite3_free_table(result);
+    if (errmsg) sqlite3_free(errmsg);
+    return rc;
+}
+
 // MARK: - TRIGGERS and META -
 
 int database_create_metatable (cloudsync_context *data, const char *table_name) {