Tests

Author: simolus3

Cargo.toml

@@ -37,4 +37,4 @@ homepage = "https://powersync.com"
 repository = "https://github.com/powersync-ja/powersync-sqlite-core"
 
 [workspace.dependencies]
-sqlite_nostd = { path = "./sqlite-rs-embedded/sqlite_nostd" }
+sqlite_nostd = { path="./sqlite-rs-embedded/sqlite_nostd" }

crates/core/src/json_util.rs

@@ -81,7 +81,7 @@ pub fn register(db: *mut sqlite::sqlite3) -> Result<(), ResultCode> {
 
     db.create_function_v2(
         "powersync_strip_subtype",
-        -1,
+        1,
         sqlite::UTF8 | sqlite::DETERMINISTIC | SQLITE_SUBTYPE | SQLITE_RESULT_SUBTYPE,
         None,
         Some(powersync_strip_subtype),

crates/core/src/views.rs

@@ -415,26 +415,17 @@ fn json_object_fragment<'a>(
     let mut column_names_quoted: Vec<String> = alloc::vec![];
     while let Some(column) = columns.next() {
         let name = &*column.name;
-        let quoted = match &*column.type_name {
-            // We really want the individual columns here to appear as they show up in the database.
-            // For text columns however, it's possible that e.g. NEW.column was created by a JSON
-            // function, meaning that it has a JSON subtype active - causing the json_object() call
-            // we're about to emit to include it as a subobject instead of a string.
-            "TEXT" | "text" => format!(
-                "{:}, powersync_strip_subtype({:}.{:})",
-                QuotedString(name),
-                prefix,
-                quote_identifier(name)
-            ),
-            _ => format!(
-                "{:}, {:}.{:}",
-                QuotedString(name),
-                prefix,
-                quote_identifier(name)
-            ),
-        };
 
-        column_names_quoted.push(quoted);
+        // We really want the individual columns here to appear as they show up in the database.
+        // For text columns however, it's possible that e.g. NEW.column was created by a JSON
+        // function, meaning that it has a JSON subtype active - causing the json_object() call
+        // we're about to emit to include it as a subobject instead of a string.
+        column_names_quoted.push(format!(
+            "{:}, powersync_strip_subtype({:}.{:})",
+            QuotedString(name),
+            prefix,
+            quote_identifier(name)
+        ));
     }
 
     // SQLITE_MAX_COLUMN - 1 (because of the id column)

dart/test/crud_test.dart

@@ -662,7 +662,7 @@ void main() {
       expect(db.select('SELECT * FROM ps_crud'), hasLength(1));
     });
 
-    test('json values are included as text', () {
+    test('preserves values in text column', () {
       db
         ..execute('select powersync_replace_schema(?)', [
           json.encode({
@@ -675,31 +675,44 @@ void main() {
               }
             ]
           })
-        ])
-        ..execute('INSERT INTO items (id, col) VALUES (uuid(), json_object())');
+        ]);
+
+      db.execute('INSERT INTO items (id, col) VALUES (uuid(), json_object())');
+      final [insert] = db.select('SELECT data FROM ps_crud');
+      expect(json.decode(insert['data']), containsPair('data', {'col': '{}'}));
+      db.execute('DELETE FROM ps_crud');
 
+      db.execute('UPDATE items SET col = NULL;');
       final [update] = db.select('SELECT data FROM ps_crud');
-      expect(json.decode(update['data']), containsPair('data', {'col': '{}'}));
+      expect(json.decode(update['data']), containsPair('data', {'col': null}));
+      db.execute('DELETE FROM ps_crud');
     });
 
-    test('null values are included as null', () {
+    test('preserves mismatched type', () {
       db
         ..execute('select powersync_replace_schema(?)', [
           json.encode({
             'tables': [
               {
                 'name': 'items',
                 'columns': [
-                  {'name': 'col', 'type': 'text'}
+                  {'name': 'col', 'type': 'int'}
                 ],
               }
             ]
           })
         ])
-        ..execute('INSERT INTO items (id, col) VALUES (uuid(), null)');
-
-      final [update] = db.select('SELECT data FROM ps_crud');
-      expect(json.decode(update['data']), containsPair('data', {}));
+        ..execute('insert into items (id, col) values (uuid(), json_object())')
+        ..execute('insert into items (id, col) values (uuid(), null)')
+        ..execute('insert into items (id, col) values (uuid(), ?)',
+            ['not an integer']);
+
+      final data = db.select('SELECT data FROM ps_crud');
+      expect(data.map((row) => jsonDecode(row['data'])), [
+        containsPair('data', {'col': '{}'}),
+        containsPair('data', {}),
+        containsPair('data', {'col': 'not an integer'}),
+      ]);
     });
   });
 }