Skip to content

Commit 24d2113

Browse files
committed
fix: downcrate rbatis
1 parent 3237312 commit 24d2113

File tree

5 files changed

+16
-18
lines changed

5 files changed

+16
-18
lines changed

Cargo.lock

Lines changed: 2 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ opentelemetry-semantic-conventions = { version = "0.16.0", optional = true }
3939
opentelemetry-http = { version = "0.13.0", optional = true }
4040
paste = "1.0.14"
4141
prost-types = "0.13.0"
42-
rbatis = "4.5.21"
43-
rbdc-pg = { version = "4.5.6", optional = true }
44-
rbdc-mysql = { version = "4.5.7", optional = true }
45-
rbdc-mssql = { version = "4.5.4", optional = true }
42+
rbatis = "=4.5.33"
43+
rbdc-pg = { version = "4.5.17", optional = true }
44+
rbdc-mysql = { version = "4.5.17", optional = true }
45+
rbdc-mssql = { version = "4.5.7", optional = true }
4646
rbs = "4.5.13"
4747
serde = { version = "1.0.197", features = ["derive"] }
4848
serde_json = "1.0.115"

src/config.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,8 +279,8 @@ pub fn read_permission_matrix(
279279
pub async fn sync_preset(connection: &DatabaseConnection) -> Result<()> {
280280
if let Some(preset) = CONFIG.preset() {
281281
let transaction = connection.acquire_begin().await?;
282-
let transaction = transaction.defer_async(|tx| async move {
283-
if !tx.done() {
282+
let mut transaction = transaction.defer_async(|mut tx| async move {
283+
if !tx.done {
284284
let _ = tx.rollback().await;
285285
}
286286
});

src/database/schema/feedback/field.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ impl From<feedback_fusion_common::proto::PromptResponse> for PromptResponse {
375375
}
376376

377377
crud!(PromptResponse {});
378-
impl_select_page_wrapper!(PromptResponse {select_page_by_prompt(prompt: &str) => "WHERE prompt = #{prompt}"});
378+
impl_select_page_wrapper!(PromptResponse {select_page_by_prompt(prompt: &str) => "`WHERE prompt = #{prompt}`"});
379379

380380
save_as_json!(FieldData, data);
381381

src/services/v1/response.rs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ pub async fn create_responses(
3939
let data = request.into_inner();
4040
// start transaction
4141
let transaction = context.connection().acquire_begin().await?;
42-
let transaction = transaction.defer_async(|tx| async move {
43-
if !tx.done() {
42+
let mut transaction = transaction.defer_async(|mut tx| async move {
43+
if !tx.done {
4444
let _ = tx.rollback().await;
4545
}
4646
});
@@ -118,6 +118,9 @@ pub async fn get_responses(
118118
let page_request = data.page_request();
119119
let connection = context.connection();
120120

121+
122+
error!("{:?}", page_request);
123+
121124
// select a page of responses
122125
let responses = database_request!(
123126
PromptResponse::select_page_by_prompt_wrapper(
@@ -129,6 +132,8 @@ pub async fn get_responses(
129132
"Select responses by prompt"
130133
)?;
131134

135+
error!("{:?}", responses);
136+
132137
let records = if responses.total > 0 {
133138
database_request!(
134139
field_responses(

0 commit comments

Comments
 (0)