Implement save

Author: owjs3901

Cargo.lock

@@ -74,13 +74,13 @@ describe.sequential('sqlite', async () => {
 
         @Column({
           default: Func.now(),
+          type: DevupModelColumnType.DateTime,
         })
         createdAt: Date
       }
 
       const hasRevision = await pool.hasRevision()
       expect(hasRevision).toBe(false)
-      console.log('hasRevision', hasRevision)
       if (!hasRevision) {
         await pool.setupRevision()
       }
@@ -92,12 +92,12 @@ describe.sequential('sqlite', async () => {
       const revisionSql = await pool.getRevisionSql(nextRevision, true)
       expect(revisionSql).toEqual([
         {
-          sql: `CREATE TABLE user (id INTEGER NOT NULL, username VARCHAR(255) NOT NULL DEFAULT \`devup\`, tag TEXT NULL, created_at DATE NOT NULL DEFAULT CURRENT_TIMESTAMP, PRIMARY KEY (id))`,
+          sql: `CREATE TABLE user (id INTEGER NOT NULL, username VARCHAR(255) NOT NULL DEFAULT \`devup\`, tag TEXT NULL, created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, PRIMARY KEY (id))`,
           params: [],
         },
       ])
       expect(await pool.getCurrentRevision()).toBe(0)
-      // // migrate to next revision
+      // migrate to next revision
       await pool.migrate(nextRevision)
 
       expect(await pool.getCurrentRevision()).toBe(1)
@@ -107,7 +107,6 @@ describe.sequential('sqlite', async () => {
         id: 1,
         tag: '',
       })
-
       await pool.save(user)
       expect(await pool.fetchAll('SELECT COUNT(*) as count FROM user')).toEqual(
         [
@@ -117,7 +116,16 @@ describe.sequential('sqlite', async () => {
         ],
       )
       const ac = await pool.begin()
-      await pool.save(user, ac)
+      // assign __devup_instance_id to user
+      await pool.save(
+        User.create({
+          username: 'devup',
+          createdAt: new Date(),
+          id: 3,
+          tag: '',
+        }),
+        ac,
+      )
 
       expect(await pool.fetchAll('SELECT COUNT(*) as count FROM user')).toEqual(
         [
@@ -135,6 +143,17 @@ describe.sequential('sqlite', async () => {
           },
         ],
       )
+      console.log(user)
+
+      // user.id = 100
+      // await pool.save(user)
+      // expect(await pool.fetchAll('SELECT COUNT(*) as count FROM user')).toEqual(
+      //   [
+      //     {
+      //       count: 2,
+      //     },
+      //   ],
+      // )
       // await user.save()
 
       // const user2 = new User()

__tests__/sql/index.test.ts

@@ -16,12 +16,10 @@ pub enum DevupModelColumnType {
     Float,
     Number,
     Date,
-    Time {
-        timezone: bool,
-    },
-    DateTime {
-        timezone: bool,
-    },
+    // timezone
+    Time(bool),
+    // timezone
+    DateTime(bool),
     Binary,
     Enum(HashSet<String>),
 

core/model/src/column.rs

@@ -1,6 +1,8 @@
 use model::{DevupModel, add_model};
 use napi::{Env, JsFunction, JsObject, JsString, bindgen_prelude::*};
 
+use crate::utils::{console_dir, log};
+
 /// Model decorator
 #[napi(js_name = "Model")]
 pub fn model(env: Env, name: Option<String>) -> Result<JsFunction> {
@@ -18,17 +20,32 @@ pub fn model(env: Env, name: Option<String>) -> Result<JsFunction> {
         .unwrap()
         .to_string()
     });
+    let cls = cls.into_unknown();
 
-    let fields = ctx.env.from_js_value(get_metadata.call(
+    println!("get_metadata:");
+    let f = get_metadata.call(
       None,
       &[
         &ctx.env.create_string("devup-api:fields")?.into_unknown(),
-        &cls.into_unknown(),
+        &cls,
       ],
-    )?)?;
+    )?;
+    {
+      let f = get_metadata.call(
+        None,
+        &[
+          &ctx.env.create_string("devup-api:fields")?.into_unknown(),
+          &cls,
+        ],
+      )?;
+      console_dir(&env, f)?;
+    }
+
+    let fields = ctx.env.from_js_value(f);
+    println!("fields: {:?}", fields);
     add_model(DevupModel {
       name: model_name,
-      fields,
+      fields: fields?,
     })
     .map_err(|e| napi::Error::from_reason(e.to_string()))?;
 

libs/node/model/src/model.rs

@@ -7,3 +7,13 @@ pub fn log(env: &Env, value: JsUnknown) -> Result<()> {
   log_fn.call(None, &[value])?;
   Ok(())
 }
+
+pub fn console_dir(env: &Env, value: JsUnknown) -> Result<()> {
+  let global = env.get_global()?;
+  let console: JsObject = global.get_named_property("console")?;
+  let log_fn = console.get_named_property::<JsFunction>("dir")?;
+  let mut options = env.create_object()?;
+  options.set_named_property("depth", env.get_null())?;
+  log_fn.call(None, &[value, options.into_unknown()])?;
+  Ok(())
+}

libs/node/model/src/utils.rs

@@ -35,8 +35,8 @@ impl From<JsDevupModelColumnType> for DevupModelColumnType {
             JsDevupModelColumnType::Float => DevupModelColumnType::Float,
             JsDevupModelColumnType::Number => DevupModelColumnType::Number,
             JsDevupModelColumnType::Date => DevupModelColumnType::Date,
-            JsDevupModelColumnType::Time => DevupModelColumnType::Time { timezone: false },
-            JsDevupModelColumnType::DateTime => DevupModelColumnType::DateTime { timezone: false },
+            JsDevupModelColumnType::Time => DevupModelColumnType::Time(true),
+            JsDevupModelColumnType::DateTime => DevupModelColumnType::DateTime(true),
             JsDevupModelColumnType::Binary => DevupModelColumnType::Binary,
             JsDevupModelColumnType::Enum => DevupModelColumnType::Enum(HashSet::new()),
             JsDevupModelColumnType::Any => DevupModelColumnType::Any,

libs/node/struct/src/column/devup_model_column_type.rs

@@ -7,3 +7,4 @@ edition = "2024"
 sqlx = { version = "0.8" }
 async-trait = "0.1"
 model = { path = "../../../core/model" }
+serde_json = "1.0.140"

sql/core/database_strategy/Cargo.toml

@@ -1,18 +1,46 @@
+use std::sync::Arc;
+
 use async_trait::async_trait;
-use model::column::DevupModelColumn;
-use sqlx::{Any, Error, Pool, Transaction};
+use model::{
+    DevupModel,
+    column::{DevupModelColumn, DevupModelColumnType},
+};
+use serde_json::{Map, Value};
+use sqlx::{Any, AnyConnection, Error, Pool, Transaction};
 
 pub enum QueryParams {
     Number,
     QuestionMark,
 }
 
+pub struct InsertResult {
+    pub instance: Map<String, Value>,
+    pub instance_id: Map<String, Value>,
+}
+
+#[derive(Debug)]
+pub enum BindWrapper {
+    Bind(Value),
+    Direct(Value),
+}
+
 #[async_trait]
 pub trait DatabaseStrategy: Send + Sync {
     async fn has_revision(&self, pool: &Pool<Any>) -> Result<bool, Error>;
     async fn setup_revision(&self, tx: &mut Transaction<'_, Any>) -> Result<(), Error>;
     fn convert_sql_column_type(&self, column: &DevupModelColumn) -> String;
+    // fn convert_value_to_sql_value(
+    //     &self,
+    //     value: String,
+    //     column_type: &DevupModelColumnType,
+    // ) -> String;
     fn get_query_params(&self) -> QueryParams;
     fn get_auto_increment_sql(&self) -> Option<String>;
     fn get_default_function_sql(&self, default: &str) -> String;
+    async fn insert_sql_and_return_instance(
+        &self,
+        tx: &mut AnyConnection,
+        model: Arc<DevupModel>,
+        obj: &Value,
+    ) -> Result<InsertResult, Error>;
 }