fix(fetch): sync fetch and single quotes

Author: Daniele Briggi

src/cloudsync.c

@@ -360,11 +360,7 @@ char *db_version_build_query (sqlite3 *db) {
 
     // the good news is that the query can be computed in SQLite without the need to do any extra computation from the host language
     const char *sql = "WITH table_names AS ("
-                    #ifdef SQLITE_WASM_EXTRA_INIT
                       "SELECT format('%w', name) as tbl_name "
-                    #else
-                      "SELECT format(\"%w\", name) as tbl_name "
-                    #endif
                       "FROM sqlite_master "
                       "WHERE type='table' "
                       "AND name LIKE '%_cloudsync'"
@@ -3284,6 +3280,7 @@ APIEXPORT int sqlite3_cloudsync_init (sqlite3 *db, char **pzErrMsg, const sqlite
 
     // register eponymous only changes virtual table
     rc = cloudsync_vtab_register_changes (db, data);
+    fprintf(stderr, "clousync.c init - rc: %d\n", rc);
     if (rc != SQLITE_OK) return rc;
 
     // load config, if exists

src/dbutils.c

@@ -419,11 +419,7 @@ bool dbutils_table_sanity_check (sqlite3 *db, sqlite3_context *context, const ch
             // the affinity of a column is determined by the declared type of the column,
             // according to the following rules in the order shown:
             // 1. If the declared type contains the string "INT" then it is assigned INTEGER affinity.
-            #ifdef SQLITE_WASM_EXTRA_INIT
             sql = sqlite3_snprintf((int)blen, buffer, "SELECT count(*) FROM pragma_table_info('%w') WHERE pk=1 AND \"type\" LIKE '%%INT%%';", name);
-            #else
-            sql = sqlite3_snprintf((int)blen, buffer, "SELECT count(*) FROM pragma_table_info('%w') WHERE pk=1 AND \"type\" LIKE \"%%INT%%\";", name);
-            #endif
             sqlite3_int64 count2 = dbutils_int_select(db, sql);
             if (count == count2) {
                 dbutils_context_result_error(context, "Table %s uses an single-column INTEGER primary key. For CRDT replication, primary keys must be globally unique. Consider using a TEXT primary key with UUIDs or ULID to avoid conflicts across nodes. If you understand the risk and still want to use this INTEGER primary key, set the third argument of the cloudsync_init function to 1 to skip this check.", name);

src/network.c

@@ -145,8 +145,11 @@ NETWORK_RESULT network_receive_buffer (network_data *data, const char *endpoint,
     } else {
         strcpy(attr.requestMethod, "GET");
     }
-    attr.attributes = EMSCRIPTEN_FETCH_LOAD_TO_MEMORY | EMSCRIPTEN_FETCH_SYNCHRONOUS;
-
+    attr.onerror = NULL; // No progress callback
+    attr.onsuccess = NULL; // No success callback
+    attr.onprogress = NULL; // No progress callback
+    attr.attributes = EMSCRIPTEN_FETCH_LOAD_TO_MEMORY | EMSCRIPTEN_FETCH_SYNCHRONOUS | EMSCRIPTEN_FETCH_REPLACE;
+    
     // Prepare header array (alternating key, value, NULL-terminated)
     const char *headers[11];
     int h = 0;
@@ -195,10 +198,27 @@ NETWORK_RESULT network_receive_buffer (network_data *data, const char *endpoint,
         attr.requestData = "";
         attr.requestDataSize = 0;
     }
-
+    //endpoint = "https://echo.free.beeceptor.com";
     emscripten_fetch_t *fetch = emscripten_fetch(&attr, endpoint); // Blocks here until the operation is complete.
     NETWORK_RESULT result = {0, NULL, 0, NULL, NULL};
+    fprintf(stderr, "network_receive_buffer: %s %s\n", attr.requestMethod, endpoint);
+    fprintf(stderr, "emscripten_fetch returned, fetch pointer: %p\n", fetch);
+    fprintf(stderr, "network_receive_buffer: status %u, numBytes %zu\n", fetch->status, fetch->numBytes);
+    fprintf(stderr, "network_receive_buffer: statusText %s\n", fetch->statusText ? fetch->statusText : "NULL");
+    fprintf(stderr, "network_receive_buffer: readyState %u\n", fetch->readyState);
+    fprintf(stderr, "network_receive_buffer: data pointer %p\n", fetch->data);
+    
+    if (fetch->readyState != 4) {
+        fprintf(stderr, "ERROR: fetch not completed, readyState=%u\n", fetch->readyState);
+        result.code = CLOUDSYNC_NETWORK_ERROR;
+        result.buffer = strdup("Network request did not complete");
+        emscripten_fetch_close(fetch);
+        if (custom_key) free(custom_key);
+        return result;
+    }
+    
     if (fetch->status == 200) {
+        fprintf(stderr, "status is 200 OK\n");
         result.code = (fetch->numBytes > 0) ? CLOUDSYNC_NETWORK_BUFFER : CLOUDSYNC_NETWORK_OK;
         result.buffer = (char *)malloc(fetch->numBytes + 1);
         if (result.buffer && fetch->numBytes > 0) {
@@ -822,7 +842,7 @@ void cloudsync_network_set_apikey (sqlite3_context *context, int argc, sqlite3_v
 void cloudsync_network_has_unsent_changes (sqlite3_context *context, int argc, sqlite3_value **argv) {
     sqlite3 *db = sqlite3_context_db_handle(context);
 
-    char *sql = "SELECT max(db_version), hex(site_id) FROM cloudsync_changes() WHERE site_id == (SELECT site_id FROM cloudsync_site_id WHERE rowid=0)";
+    char *sql = "SELECT max(db_version), hex(site_id) FROM cloudsync_changes WHERE site_id == (SELECT site_id FROM cloudsync_site_id WHERE rowid=0)";
     int last_local_change = (int)dbutils_int_select(db, sql);
     if (last_local_change == 0) {
         sqlite3_result_int(context, 0);

src/vtab.c

@@ -137,33 +137,18 @@ char *build_changes_sql (sqlite3 *db, const char *idxs) {
     "changes_query AS ( "
     "    SELECT "
     "        'SELECT "
-    #ifdef SQLITE_WASM_EXTRA_INIT
-    "        ''' || table_name || ''' AS tbl, "
+    "        ''' || \"table_name\" || ''' AS tbl, "
     "        t1.pk AS pk, "
     "        t1.col_name AS col_name, "
-    "        cloudsync_col_value(''' || table_name || ''', t1.col_name, t1.pk) AS col_value, "
+    "        cloudsync_col_value(''' || \"table_name\" || ''', t1.col_name, t1.pk) AS col_value, "
     "        t1.col_version AS col_version, "
     "        t1.db_version AS db_version, "
     "        site_tbl.site_id AS site_id, "
     "        t1.seq AS seq, "
     "        COALESCE(t2.col_version, 1) AS cl "
-    "     FROM ''' || table_meta || ''' AS t1 "
+    "     FROM ''' || \"table_meta\" || ''' AS t1 "
     "     LEFT JOIN cloudsync_site_id AS site_tbl ON t1.site_id = site_tbl.rowid "
-    "     LEFT JOIN ''' || table_meta || ''' AS t2 ON t1.pk = t2.pk AND t2.col_name = ''" CLOUDSYNC_TOMBSTONE_VALUE "'' "
-    #else
-    "        \"' || \"table_name\" || '\" AS tbl, "
-    "        t1.pk AS pk, "
-    "        t1.col_name AS col_name, "
-    "        cloudsync_col_value(\"' || \"table_name\" || '\", t1.col_name, t1.pk) AS col_value, "
-    "        t1.col_version AS col_version, "
-    "        t1.db_version AS db_version, "
-    "        site_tbl.site_id AS site_id, "
-    "        t1.seq AS seq, "
-    "        COALESCE(t2.col_version, 1) AS cl "
-    "     FROM \"' || \"table_meta\" || '\" AS t1 "
-    "     LEFT JOIN cloudsync_site_id AS site_tbl ON t1.site_id = site_tbl.rowid "
-    "     LEFT JOIN \"' || \"table_meta\" || '\" AS t2 ON t1.pk = t2.pk AND t2.col_name = ''" CLOUDSYNC_TOMBSTONE_VALUE "'' "
-    #endif
+    "     LEFT JOIN ''' || \"table_meta\" || ''' AS t2 ON t1.pk = t2.pk AND t2.col_name = ''" CLOUDSYNC_TOMBSTONE_VALUE "'' "
     "     WHERE col_value IS NOT ''" CLOUDSYNC_RLS_RESTRICTED_VALUE "''' "
     "    AS query_string FROM table_names "
     "), "