Revert "Try to insert non-numberic value without default value."

This reverts commit 3356023.

Author: langyo

examples/proxy_gluesql_example/Cargo.toml

@@ -8,7 +8,6 @@ publish = false
 [workspace]
 
 [dependencies]
-anyhow = "^1"
 async-std = { version = "1.12", features = ["attributes", "tokio1"] }
 serde_json = { version = "1" }
 serde = { version = "1" }

examples/proxy_gluesql_example/src/entity/post.rs

@@ -1,11 +1,11 @@
-use sea_orm::{entity::prelude::*, ActiveValue::*};
+use sea_orm::entity::prelude::*;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel, Deserialize, Serialize)]
 #[sea_orm(table_name = "posts")]
 pub struct Model {
     #[sea_orm(primary_key)]
-    pub id: Uuid,
+    pub id: i64,
 
     pub title: String,
     pub text: String,
@@ -14,15 +14,4 @@ pub struct Model {
 #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
 pub enum Relation {}
 
-#[async_trait::async_trait]
-impl ActiveModelBehavior for ActiveModel {
-    async fn before_save<C>(self, _db: &C, _insert: bool) -> Result<Self, DbErr>
-    where
-        C: ConnectionTrait,
-    {
-        println!("Before save");
-        let mut ret = self.clone();
-        ret.id = Set(Uuid::new_v4());
-        Ok(ret)
-    }
-}
+impl ActiveModelBehavior for ActiveModel {}

examples/proxy_gluesql_example/src/main.rs

@@ -4,16 +4,15 @@
 
 mod entity;
 
-use anyhow::{anyhow, Result};
 use std::{
     collections::BTreeMap,
     sync::{Arc, Mutex},
 };
 
 use gluesql::{memory_storage::MemoryStorage, prelude::Glue};
 use sea_orm::{
-    ActiveModelTrait, ActiveValue::Set, Database, DbBackend, DbErr, EntityTrait,
-    ProxyDatabaseTrait, ProxyExecResult, ProxyRow, Statement,
+    ActiveValue::Set, Database, DbBackend, DbErr, EntityTrait, ProxyDatabaseTrait, ProxyExecResult,
+    ProxyRow, Statement,
 };
 
 use entity::post::{ActiveModel, Entity};
@@ -100,12 +99,6 @@ impl ProxyDatabaseTrait for ProxyDb {
                                                     val.unwrap_or(0).to_string(),
                                                     false,
                                                 ),
-                                                sea_orm::Value::Uuid(val) => {
-                                                    Value::SingleQuotedString(match val {
-                                                        Some(val) => val.to_string(),
-                                                        None => "".to_string(),
-                                                    })
-                                                }
                                                 _ => todo!(),
                                             };
                                         }
@@ -139,14 +132,14 @@ impl ProxyDatabaseTrait for ProxyDb {
 }
 
 #[async_std::main]
-async fn main() -> Result<()> {
+async fn main() {
     let mem = MemoryStorage::default();
     let mut glue = Glue::new(mem);
 
     glue.execute(
         r#"
             CREATE TABLE IF NOT EXISTS posts (
-                id UUID PRIMARY KEY,
+                id INTEGER PRIMARY KEY,
                 title TEXT NOT NULL,
                 text TEXT NOT NULL
             )
@@ -167,41 +160,32 @@ async fn main() -> Result<()> {
     println!("Initialized");
 
     let data = ActiveModel {
+        id: Set(11),
         title: Set("Homo".to_owned()),
         text: Set("いいよ、来いよ".to_owned()),
-        ..Default::default()
     };
-
-    println!("data: {:?}", data);
-    let ret = data.insert(&db).await.map_err(|err| anyhow!("{:?}", err))?;
-    println!("ret: {:?}", ret);
-
+    Entity::insert(data).exec(&db).await.unwrap();
     let data = ActiveModel {
+        id: Set(45),
         title: Set("Homo".to_owned()),
         text: Set("そうだよ".to_owned()),
-        ..Default::default()
     };
-    let ret = data.insert(&db).await.map_err(|err| anyhow!("{:?}", err))?;
-    println!("ret: {:?}", ret);
-
+    Entity::insert(data).exec(&db).await.unwrap();
     let data = ActiveModel {
+        id: Set(14),
         title: Set("Homo".to_owned()),
         text: Set("悔い改めて".to_owned()),
-        ..Default::default()
     };
-    let ret = data.insert(&db).await.map_err(|err| anyhow!("{:?}", err))?;
-    println!("ret: {:?}", ret);
+    Entity::insert(data).exec(&db).await.unwrap();
 
     let list = Entity::find().all(&db).await.unwrap().to_vec();
     println!("Result: {:?}", list);
-
-    Ok(())
 }
 
 #[cfg(test)]
 mod tests {
     #[smol_potat::test]
     async fn try_run() {
-        crate::main().unwrap();
+        crate::main()
     }
 }

src/executor/insert.rs

@@ -256,9 +256,10 @@ where
                 if db_backend == DbBackend::MySql && last_insert_id == 0 {
                     return Err(DbErr::RecordNotInserted);
                 }
-                ValueTypeOf::<A>::try_from_u64(last_insert_id)
-                    .map(|val| Some(val))
-                    .unwrap_or(None)
+                Some(
+                    ValueTypeOf::<A>::try_from_u64(last_insert_id)
+                        .map_err(|_| DbErr::UnpackInsertId)?,
+                )
             } else {
                 None
             }