Remove generics on InsertIntoCrud

Author: simolus3

crates/core/src/schema/mod.rs

@@ -66,7 +66,7 @@ pub fn register(db: *mut sqlite::sqlite3, state: Rc<DatabaseState>) -> Result<()
             Some(create_raw_trigger_sqlite),
             None,
             None,
-            Some(DatabaseState::destroy_rc),
+            None,
         )?;
     }
     Ok(())

crates/core/src/schema/raw_table.rs

@@ -108,16 +108,13 @@ pub fn generate_raw_table_trigger(
         buffer.insert_into_powersync_crud(InsertIntoCrud {
             op: write,
             table: &as_schema_table,
-            id_expr: from_fn(|f| {
-                if write == WriteType::Delete {
-                    f.write_str("OLD.")
-                } else {
-                    f.write_str("NEW.")
-                }?;
-                f.write_str(".id")
-            }),
+            id_expr: if write == WriteType::Delete {
+                "OLD.id"
+            } else {
+                "NEW.id"
+            },
             type_name: &table.name,
-            data: Some(from_fn(|f| {
+            data: Some(&from_fn(|f| {
                 match write {
                     WriteType::Insert => {}
                     WriteType::Update => todo!(),

crates/core/src/utils/sql_buffer.rs

@@ -108,15 +108,10 @@ impl SqlBuffer {
     }
 
     /// Writes an `INSERT INTO powersync_crud` statement.
-    pub fn insert_into_powersync_crud<Id, Data, Metadata>(
+    pub fn insert_into_powersync_crud(
         &mut self,
-        insert: InsertIntoCrud<Id, Data, Metadata>,
-    ) -> Result<(), PowerSyncError>
-    where
-        Id: Display,
-        Data: Display,
-        Metadata: Display,
-    {
+        insert: InsertIntoCrud,
+    ) -> Result<(), PowerSyncError> {
         let old_values = if insert.op == WriteType::Insert {
             // Inserts don't have previous values we'd have to track.
             None
@@ -306,18 +301,13 @@ impl<'a> CommaSeparated<'a> {
     }
 }
 
-pub struct InsertIntoCrud<'a, Id, Data, Metadata>
-where
-    Id: Display,
-    Data: Display,
-    Metadata: Display,
-{
+pub struct InsertIntoCrud<'a> {
     pub op: WriteType,
-    pub id_expr: Id,
+    pub id_expr: &'a str,
     pub type_name: &'a str,
-    pub data: Option<Data>,
+    pub data: Option<&'a dyn Display>,
     pub table: &'a SchemaTable<'a>,
-    pub metadata: Option<Metadata>,
+    pub metadata: Option<&'a str>,
 }
 
 #[derive(Clone, Copy, PartialEq)]

crates/core/src/views.rs

@@ -85,7 +85,7 @@ pub fn powersync_trigger_delete_sql(table_info: &Table) -> Result<String, PowerS
             table: &as_schema_table,
             id_expr: "OLD.id",
             type_name: name,
-            data: None::<&'static str>,
+            data: None,
             metadata: None::<&'static str>,
         })?;
 
@@ -106,7 +106,7 @@ pub fn powersync_trigger_delete_sql(table_info: &Table) -> Result<String, PowerS
                 table: &as_schema_table,
                 id_expr: "OLD.id",
                 type_name: name,
-                data: None::<&'static str>,
+                data: None,
                 metadata: Some("NEW._metadata"),
             })?;
         }
@@ -151,7 +151,7 @@ pub fn powersync_trigger_insert_sql(table_info: &Table) -> Result<String, PowerS
                 id_expr: "NEW.id",
                 table: &as_schema_table,
                 type_name: name,
-                data: Some(from_fn(|f| {
+                data: Some(&from_fn(|f| {
                     write!(f, "json(powersync_diff('{{}}', {:}))", json_fragment)
                 })),
                 metadata: if table_info.options.flags.include_metadata() {
@@ -208,7 +208,7 @@ pub fn powersync_trigger_update_sql(table_info: &Table) -> Result<String, PowerS
             id_expr: "NEW.id",
             table: &as_schema_table,
             type_name: name,
-            data: Some(from_fn(|f| {
+            data: Some(&from_fn(|f| {
                 write!(
                     f,
                     "json(powersync_diff({json_fragment_old}, {json_fragment_new}))"