Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Let last_insert_id optional and flexible. #2393

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

Let last_insert_id optional and flexible. #2393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
be539d2
Rewrite `last_insert_id` type.
langyo Oct 14, 2024
2495b40
Fix CI.
langyo Oct 14, 2024
3356023
Try to insert non-numberic value without default value.
langyo Oct 17, 2024
fb8ea9d
Revert "Try to insert non-numberic value without default value."
langyo Oct 17, 2024
10add18
Rename `TryFromU64` to `TryFromRawValue` for more origin primary key …
langyo Oct 20, 2024
60d0964
Fix clippy.
langyo Oct 20, 2024
35a0c4f
Use uuid as the primary key for proxy example.
langyo Oct 20, 2024
6c476af
Bump `gluesql` to 0.16.
langyo Oct 22, 2024
ce6d75c
Merge branch 'SeaQL:master' into upgrade_exec_result
langyo Oct 22, 2024
e2e6a30
Use string instead of UUID as the primary key type.
langyo Oct 23, 2024
c39a754
Automatically convert and output all primitive values ​​that can be c…
langyo Oct 23, 2024
ec586a1
Merge branch 'master' into upgrade_exec_result
langyo Mar 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions examples/basic/src/operation.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,15 @@ pub async fn insert_and_update(db: &DbConn) -> Result<(), DbErr> {
};
let res = Fruit::insert(pear).exec(db).await?;

println!("Inserted: last_insert_id = {}", res.last_insert_id);

let pear: Option<fruit::Model> = Fruit::find_by_id(res.last_insert_id).one(db).await?;
println!(
"Inserted: last_insert_id = {}",
res.last_insert_id.ok_or(DbErr::UnpackInsertId)?
);

let pear: Option<fruit::Model> =
Fruit::find_by_id(res.last_insert_id.ok_or(DbErr::UnpackInsertId)?)
.one(db)
.await?;

println!("Pear: {pear:?}");

Expand Down
2 changes: 1 addition & 1 deletion examples/graphql_example/service/src/mutation.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ impl Mutation {
let res = Note::insert(active_model).exec(db).await?;

Ok(note::Model {
id: res.last_insert_id,
id: res.last_insert_id.ok_or(DbErr::UnpackInsertId)?,
..form_data
})
}
Expand Down
5 changes: 2 additions & 3 deletions examples/proxy_gluesql_example/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,8 @@ async-trait = { version = "0.1" }

sqlparser = "0.40"
sea-orm = { path = "../../", features = ["proxy", "debug-print"] }
gluesql = { version = "0.15", default-features = false, features = [
"memory-storage",
] }
gluesql = "^0.16"
uuid = "^1"

[dev-dependencies]
smol = { version = "1.2" }
Expand Down
5 changes: 3 additions & 2 deletions examples/proxy_gluesql_example/src/entity/post.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ 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: i64,
#[sea_orm(primary_key, auto_increment = false)]
// FIXME: https://github.com/gluesql/gluesql/issues/1579
pub id: String,

pub title: String,
pub text: String,
Expand Down
105 changes: 48 additions & 57 deletions examples/proxy_gluesql_example/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ use std::{
sync::{Arc, Mutex},
};

use gluesql::{memory_storage::MemoryStorage, prelude::Glue};
use gluesql::prelude::{Glue, MemoryStorage};
use sea_orm::{
ActiveValue::Set, Database, DbBackend, DbErr, EntityTrait, ProxyDatabaseTrait, ProxyExecResult,
ProxyRow, Statement,
ActiveModelTrait, ActiveValue::Set, Database, DbBackend, DbErr, EntityTrait,
ProxyDatabaseTrait, ProxyExecResult, ProxyRow, Statement,
};

use entity::post::{ActiveModel, Entity};
Expand All @@ -30,12 +30,31 @@ impl std::fmt::Debug for ProxyDb {
#[async_trait::async_trait]
impl ProxyDatabaseTrait for ProxyDb {
async fn query(&self, statement: Statement) -> Result<Vec<ProxyRow>, DbErr> {
println!("SQL query: {:?}", statement);
let sql = statement.sql.clone();
let sql = if let Some(values) = statement.values {
// Replace all the '?' with the statement values

statement
.sql
.split("?")
.collect::<Vec<&str>>()
.iter()
.enumerate()
.fold(String::new(), |mut acc, (i, item)| {
acc.push_str(item);
if i < values.0.len() {
acc.push_str(&format!("{}", values.0[i]));
}
acc
})
} else {
statement.sql
};
println!("SQL query: {}", sql);

let mut ret: Vec<ProxyRow> = vec![];
async_std::task::block_on(async {
for payload in self.mem.lock().unwrap().execute(sql).await.unwrap().iter() {
let raw = self.mem.lock().unwrap().execute(sql).await.unwrap();
for payload in raw.iter() {
match payload {
gluesql::prelude::Payload::Select { labels, rows } => {
for row in rows.iter() {
Expand All @@ -50,6 +69,9 @@ impl ProxyDatabaseTrait for ProxyDb {
gluesql::prelude::Value::Str(val) => {
sea_orm::Value::String(Some(Box::new(val.to_owned())))
}
gluesql::prelude::Value::Uuid(val) => sea_orm::Value::Uuid(
Some(Box::new(uuid::Uuid::from_u128(*val))),
),
_ => unreachable!("Unsupported value: {:?}", column),
},
);
Expand All @@ -68,53 +90,20 @@ impl ProxyDatabaseTrait for ProxyDb {
async fn execute(&self, statement: Statement) -> Result<ProxyExecResult, DbErr> {
let sql = if let Some(values) = statement.values {
// Replace all the '?' with the statement values
use sqlparser::ast::{Expr, Value};
use sqlparser::dialect::GenericDialect;
use sqlparser::parser::Parser;

let dialect = GenericDialect {};
let mut ast = Parser::parse_sql(&dialect, statement.sql.as_str()).unwrap();
match &mut ast[0] {
sqlparser::ast::Statement::Insert {
columns, source, ..
} => {
for item in columns.iter_mut() {
item.quote_style = Some('"');
}

if let Some(obj) = source {
match &mut *obj.body {
sqlparser::ast::SetExpr::Values(obj) => {
for (mut item, val) in obj.rows[0].iter_mut().zip(values.0.iter()) {
match &mut item {
Expr::Value(item) => {
*item = match val {
sea_orm::Value::String(val) => {
Value::SingleQuotedString(match val {
Some(val) => val.to_string(),
None => "".to_string(),
})
}
sea_orm::Value::BigInt(val) => Value::Number(
val.unwrap_or(0).to_string(),
false,
),
_ => todo!(),
};
}
_ => todo!(),
}
}
}
_ => todo!(),
}
statement
.sql
.split("?")
.collect::<Vec<&str>>()
.iter()
.enumerate()
.fold(String::new(), |mut acc, (i, item)| {
acc.push_str(item);
if i < values.0.len() {
acc.push_str(&format!("{}", values.0[i]));
}
}
_ => todo!(),
}

let statement = &ast[0];
statement.to_string()
acc
})
} else {
statement.sql
};
Expand All @@ -125,7 +114,7 @@ impl ProxyDatabaseTrait for ProxyDb {
});

Ok(ProxyExecResult {
last_insert_id: 1,
last_insert_id: None,
rows_affected: 1,
})
}
Expand All @@ -139,7 +128,7 @@ async fn main() {
glue.execute(
r#"
CREATE TABLE IF NOT EXISTS posts (
id INTEGER PRIMARY KEY,
id TEXT PRIMARY KEY,
title TEXT NOT NULL,
text TEXT NOT NULL
)
Expand All @@ -160,19 +149,21 @@ async fn main() {
println!("Initialized");

let data = ActiveModel {
id: Set(11),
id: Set(uuid::Uuid::new_v4().to_string()),
title: Set("Homo".to_owned()),
text: Set("いいよ、来いよ".to_owned()),
};
Entity::insert(data).exec(&db).await.unwrap();
data.insert(&db).await.unwrap();

let data = ActiveModel {
id: Set(45),
id: Set(uuid::Uuid::new_v4().to_string()),
title: Set("Homo".to_owned()),
text: Set("そうだよ".to_owned()),
};
Entity::insert(data).exec(&db).await.unwrap();

let data = ActiveModel {
id: Set(14),
id: Set("野兽邸".to_string()),
title: Set("Homo".to_owned()),
text: Set("悔い改めて".to_owned()),
};
Expand Down
96 changes: 80 additions & 16 deletions examples/seaography_example/migration/src/m20230102_000001_seed_bakery_data.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,30 +15,46 @@ impl MigrationTrait for Migration {
profit_margin: Set(10.4),
..Default::default()
};
let sea = Bakery::insert(bakery).exec(db).await?.last_insert_id;
let sea = Bakery::insert(bakery)
.exec(db)
.await?
.last_insert_id
.ok_or(DbErr::UnpackInsertId)?;

let bakery = bakery::ActiveModel {
name: Set("LakeSide Bakery".to_owned()),
profit_margin: Set(5.8),
..Default::default()
};
let lake = Bakery::insert(bakery).exec(db).await?.last_insert_id;
let lake = Bakery::insert(bakery)
.exec(db)
.await?
.last_insert_id
.ok_or(DbErr::UnpackInsertId)?;

let alice = baker::ActiveModel {
name: Set("Alice".to_owned()),
contact: Set("+44 15273388".to_owned()),
bakery_id: Set(Some(sea)),
..Default::default()
};
let alice = Baker::insert(alice).exec(db).await?.last_insert_id;
let alice = Baker::insert(alice)
.exec(db)
.await?
.last_insert_id
.ok_or(DbErr::UnpackInsertId)?;

let bob = baker::ActiveModel {
name: Set("Bob".to_owned()),
contact: Set("+852 12345678".to_owned()),
bakery_id: Set(Some(lake)),
..Default::default()
};
let bob = Baker::insert(bob).exec(db).await?.last_insert_id;
let bob = Baker::insert(bob)
.exec(db)
.await?
.last_insert_id
.ok_or(DbErr::UnpackInsertId)?;

let cake = cake::ActiveModel {
name: Set("Chocolate Cake".to_owned()),
Expand All @@ -47,7 +63,11 @@ impl MigrationTrait for Migration {
bakery_id: Set(Some(sea)),
..Default::default()
};
let choco = Cake::insert(cake).exec(db).await?.last_insert_id;
let choco = Cake::insert(cake)
.exec(db)
.await?
.last_insert_id
.ok_or(DbErr::UnpackInsertId)?;

let mut cake = cake::ActiveModel {
name: Set("Double Chocolate".to_owned()),
Expand All @@ -56,9 +76,17 @@ impl MigrationTrait for Migration {
bakery_id: Set(Some(sea)),
..Default::default()
};
let double_1 = Cake::insert(cake.clone()).exec(db).await?.last_insert_id;
let double_1 = Cake::insert(cake.clone())
.exec(db)
.await?
.last_insert_id
.ok_or(DbErr::UnpackInsertId)?;
cake.bakery_id = Set(Some(lake));
let double_2 = Cake::insert(cake).exec(db).await?.last_insert_id;
let double_2 = Cake::insert(cake)
.exec(db)
.await?
.last_insert_id
.ok_or(DbErr::UnpackInsertId)?;

let mut cake = cake::ActiveModel {
name: Set("Lemon Cake".to_owned()),
Expand All @@ -67,9 +95,17 @@ impl MigrationTrait for Migration {
bakery_id: Set(Some(sea)),
..Default::default()
};
let lemon_1 = Cake::insert(cake.clone()).exec(db).await?.last_insert_id;
let lemon_1 = Cake::insert(cake.clone())
.exec(db)
.await?
.last_insert_id
.ok_or(DbErr::UnpackInsertId)?;
cake.bakery_id = Set(Some(lake));
let lemon_2 = Cake::insert(cake).exec(db).await?.last_insert_id;
let lemon_2 = Cake::insert(cake)
.exec(db)
.await?
.last_insert_id
.ok_or(DbErr::UnpackInsertId)?;

let mut cake = cake::ActiveModel {
name: Set("Strawberry Cake".to_owned()),
Expand All @@ -78,9 +114,17 @@ impl MigrationTrait for Migration {
bakery_id: Set(Some(sea)),
..Default::default()
};
let straw_1 = Cake::insert(cake.clone()).exec(db).await?.last_insert_id;
let straw_1 = Cake::insert(cake.clone())
.exec(db)
.await?
.last_insert_id
.ok_or(DbErr::UnpackInsertId)?;
cake.bakery_id = Set(Some(lake));
let straw_2 = Cake::insert(cake).exec(db).await?.last_insert_id;
let straw_2 = Cake::insert(cake)
.exec(db)
.await?
.last_insert_id
.ok_or(DbErr::UnpackInsertId)?;

let cake = cake::ActiveModel {
name: Set("Orange Cake".to_owned()),
Expand All @@ -89,7 +133,11 @@ impl MigrationTrait for Migration {
bakery_id: Set(Some(lake)),
..Default::default()
};
let orange = Cake::insert(cake).exec(db).await?.last_insert_id;
let orange = Cake::insert(cake)
.exec(db)
.await?
.last_insert_id
.ok_or(DbErr::UnpackInsertId)?;

let mut cake = cake::ActiveModel {
name: Set("New York Cheese".to_owned()),
Expand All @@ -98,9 +146,17 @@ impl MigrationTrait for Migration {
bakery_id: Set(Some(sea)),
..Default::default()
};
let cheese_1 = Cake::insert(cake.clone()).exec(db).await?.last_insert_id;
let cheese_1 = Cake::insert(cake.clone())
.exec(db)
.await?
.last_insert_id
.ok_or(DbErr::UnpackInsertId)?;
cake.bakery_id = Set(Some(lake));
let cheese_2 = Cake::insert(cake).exec(db).await?.last_insert_id;
let cheese_2 = Cake::insert(cake)
.exec(db)
.await?
.last_insert_id
.ok_or(DbErr::UnpackInsertId)?;

let mut cake = cake::ActiveModel {
name: Set("Blueburry Cheese".to_owned()),
Expand All @@ -109,9 +165,17 @@ impl MigrationTrait for Migration {
bakery_id: Set(Some(sea)),
..Default::default()
};
let blue_1 = Cake::insert(cake.clone()).exec(db).await?.last_insert_id;
let blue_1 = Cake::insert(cake.clone())
.exec(db)
.await?
.last_insert_id
.ok_or(DbErr::UnpackInsertId)?;
cake.bakery_id = Set(Some(lake));
let blue_2 = Cake::insert(cake).exec(db).await?.last_insert_id;
let blue_2 = Cake::insert(cake)
.exec(db)
.await?
.last_insert_id
.ok_or(DbErr::UnpackInsertId)?;

let rel = cake_baker::ActiveModel {
cake_id: Set(choco),
Expand Down
Loading