network: add support for connection strings with sqlitecloud schema

Author: andinux

src/dbutils.c

@@ -1012,8 +1012,7 @@ int dbutils_update_schema_hash(sqlite3 *db, uint64_t *hash) {
     if (hash && *hash == h) return SQLITE_CONSTRAINT;
 
     char sql[1024];
-    //
-    snprintf(sql, sizeof(sql), "INSERT INTO %s (hash) VALUES (%lld);", CLOUDSYNC_SCHEMA_VERSIONS_NAME, h);
+    snprintf(sql, sizeof(sql), "INSERT INTO %s (hash) VALUES (%lld);", CLOUDSYNC_SCHEMA_VERSIONS_NAME, (sqlite3_int64)h);
     int rc = sqlite3_exec(db, sql, NULL, NULL, NULL);
 
     if (hash) *hash = h;

src/network.c

@@ -334,7 +334,7 @@ int extract_query_param(const char *query, const char *key, char *output, size_t
     return -3; // Key not found
 }
 
-bool network_compute_endpoints (sqlite3_context *context, network_data *data, const char *connection_string) {
+bool network_compute_endpoints (sqlite3_context *context, network_data *data, const char *conn_string) {
     // compute endpoints
     bool result = false;
 
@@ -348,12 +348,16 @@ bool network_compute_endpoints (sqlite3_context *context, network_data *data, co
     char *check_endpoint = NULL;
     char *upload_endpoint = NULL;
 
+    char *conn_string_https = NULL;
+    
     CURLUcode rc = CURLUE_OUT_OF_MEMORY;
     CURLU *url = curl_url();
     if (!url) goto finalize;
 
+    conn_string_https = cloudsync_string_replace_prefix(conn_string, "sqlitecloud://", "https://");
+    
     // set URL: https://UUID.g5.sqlite.cloud:443/chinook.sqlite?apikey=hWDanFolRT9WDK0p54lufNrIyfgLZgtMw6tb6fbPmpo
-    rc = curl_url_set(url, CURLUPART_URL, connection_string, 0);
+    rc = curl_url_set(url, CURLUPART_URL, conn_string_https, 0);
     if (rc != CURLE_OK) goto finalize;
 
     // https (MANDATORY)
@@ -421,6 +425,7 @@ bool network_compute_endpoints (sqlite3_context *context, network_data *data, co
     if (database) curl_free(database);
     if (query) curl_free(query);
     if (url) curl_url_cleanup(url);
+    if (conn_string_https && conn_string_https != conn_string) cloudsync_memory_free(conn_string_https);
 
     return result;
 }

src/utils.c

@@ -151,6 +151,29 @@ void cloudsync_rowid_decode (sqlite3_int64 rowid, sqlite3_int64 *db_version, sql
     *db_version = (sqlite3_int64)(urowid >> 30);
 }
 
+char *cloudsync_string_replace_prefix(const char *input, char *prefix, char *replacement) {
+    //const char *prefix = "sqlitecloud://";
+    //const char *replacement = "https://";
+    size_t prefix_len = strlen(prefix);
+    size_t replacement_len = strlen(replacement);
+
+    if (strncmp(input, prefix, prefix_len) == 0) {
+        // Allocate memory for new string
+        size_t input_len = strlen(input);
+        size_t new_len = input_len - prefix_len + replacement_len;
+        char *result = cloudsync_memory_alloc(new_len + 1); // +1 for null terminator
+        if (!result) return NULL;
+
+        // Copy replacement and the rest of the input string
+        strcpy(result, replacement);
+        strcpy(result + replacement_len, input + prefix_len);
+        return result;
+    }
+
+    // If no match, return the original string
+    return (char *)input;
+}
+
 uint64_t fnv1a_hash(const char *data, size_t len) {
     uint64_t hash = FNV_OFFSET_BASIS;
     for (size_t i = 0; i < len; ++i) {

src/utils.h

@@ -125,6 +125,7 @@ int cloudsync_uuid_v7 (uint8_t value[UUID_LEN]);
 int cloudsync_uuid_v7_compare (uint8_t value1[UUID_LEN], uint8_t value2[UUID_LEN]);
 char *cloudsync_uuid_v7_string (char value[UUID_STR_MAXLEN], bool dash_format);
 char *cloudsync_uuid_v7_stringify (uint8_t uuid[UUID_LEN], char value[UUID_STR_MAXLEN], bool dash_format);
+char *cloudsync_string_replace_prefix(const char *input, char *prefix, char *replacement);
 uint64_t fnv1a_hash(const char *data, size_t len);
 
 void *cloudsync_memory_zeroalloc (uint64_t size);

test/unittest.c

@@ -1760,6 +1760,26 @@ bool do_test_internal_functions (void) {
     return result;
 }
 
+bool do_test_string_replace_prefix(void) {
+    char *host = "rejfwkr.sqlite.cloud";
+    char *prefix = "sqlitecloud://";
+    char *replacement = "https://";
+    
+    char string[512];
+    snprintf(string, sizeof(string), "%s%s", prefix, host);
+    char expected[512];
+    snprintf(expected, sizeof(expected), "%s%s", replacement, host);
+    
+    char *replaced = cloudsync_string_replace_prefix(string, prefix, replacement);
+    if (string == replaced || strcmp(replaced, expected) != 0) return false;
+    if (string != replaced) cloudsync_memory_free(replaced);
+    
+    replaced = cloudsync_string_replace_prefix(expected, prefix, replacement);
+    if (expected != replaced) return false;
+    
+    return true;
+}
+
 // MARK: -
 
 bool do_compare_queries (sqlite3 *db1, const char *sql1, sqlite3 *db2, const char *sql2, int col_to_skip, int col_tombstone, bool display_column) {
@@ -3094,6 +3114,9 @@ int main(int argc, const char * argv[]) {
     result = do_test_internal_functions();
     printf("%-24s %s\n", "Functions Test (Int):", (result) ? "OK" : "FAILED");
 
+    result = do_test_string_replace_prefix();
+    printf("%-24s %s\n", "String Func Test:", (result) ? "OK" : "FAILED");
+
     // close local database
     db = close_db(db);