Skip to content

Commit 06e9566

Browse files
committed
Impelement find
1 parent 22403f1 commit 06e9566

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

sql/core/database_strategy/src/lib.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use std::{io, sync::Arc};
22

33
use api::get_model_storage;
44
use async_trait::async_trait;
5-
use devup_sql::generate_find_sql_result;
5+
use devup_sql::{DevupSqlFindOption, generate_find_sql_result};
66
use inflections::case::to_snake_case;
77
use model::{DevupModel, DevupModelFieldType, ObjectFieldNameType, column::DevupModelColumn};
88
use serde_json::{Map, Value};
@@ -145,11 +145,12 @@ pub trait DatabaseStrategy: Send + Sync {
145145
async fn find(
146146
&self,
147147
model: &DevupModel,
148+
option: Option<DevupSqlFindOption>,
148149
tx: Option<&mut DatabaseTransaction>,
149150
field_name_type: ObjectFieldNameType,
150151
// option: Option<DevupApiQueryOption>,
151152
) -> Result<Vec<Value>, Error> {
152-
let q = generate_find_sql_result(&model, None, &get_model_storage());
153+
let q = generate_find_sql_result(&model, option, &get_model_storage());
153154
let s = &q.to_sql(field_name_type);
154155
dbg!(s);
155156
let result = self.fetch_all(s, &[], tx).await?;

sql/core/devup_database/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@ impl DevupSqlPool {
433433
let result = self
434434
.options
435435
.database_strategy
436-
.find(ref_model, tx, ObjectFieldNameType::CamelCase)
436+
.find(ref_model, None, tx, ObjectFieldNameType::CamelCase)
437437
.await?;
438438
Ok(result)
439439
}

0 commit comments

Comments
 (0)