From a556d90f7143fe3ec8b42e973aa2067c36dc284b Mon Sep 17 00:00:00 2001 From: Sik Yoon Date: Sun, 24 Mar 2024 21:53:39 +0900 Subject: [PATCH] Add connection close --- src/database_control.rs | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/src/database_control.rs b/src/database_control.rs index 9def34b..b73fa8e 100644 --- a/src/database_control.rs +++ b/src/database_control.rs @@ -21,7 +21,7 @@ pub async fn exists_table(table_name: &String) -> bool { let mut conn = conn_result.unwrap(); let exists_table = sqlx::query(&query_base).fetch_all(&mut conn).await.unwrap(); - + conn.close().await; !exists_table.is_empty() } @@ -62,6 +62,7 @@ pub async fn exists_record(table_name: &String, condition: &Option) -> b } let result = exists_record.unwrap(); + conn.close().await; if result.success == 0 { false } else { @@ -134,6 +135,7 @@ pub async fn new_table( sleep(Duration::from_millis(200)).await; query_result = sqlx::query(&query).execute(&mut conn).await; } + conn.close().await?; Ok(()) } @@ -152,6 +154,7 @@ pub async fn drop_table(table_name: &String) -> Result let mut conn = conn_result.unwrap(); let query_result = sqlx::query(&query).execute(&mut conn).await; + conn.close().await?; query_result } @@ -182,6 +185,7 @@ pub async fn copy_table_data( query_result = sqlx::query(&query).execute(&mut conn).await; sleep(Duration::from_millis(200)).await; } + conn.close().await?; Ok(()) } @@ -230,7 +234,7 @@ pub async fn insert_one_record( let mut conn = conn_result.unwrap(); let query_result = sqlx::query(&query).execute(&mut conn).await; - + conn.close().await?; query_result } @@ -268,7 +272,7 @@ pub async fn copy_record( let mut conn = conn_result.unwrap(); let query_result = sqlx::query(&query).execute(&mut conn).await; - + conn.close().await?; query_result } @@ -327,6 +331,7 @@ pub async fn insert_records( query_result = sqlx::query(&query).execute(&mut conn).await; sleep(Duration::from_millis(200)).await; } + conn.close().await?; Ok(()) } @@ -379,7 +384,7 @@ pub async fn update_record( let mut conn = conn_result.unwrap(); let query_result = sqlx::query(&query).execute(&mut conn).await; - + conn.close().await?; query_result } @@ -432,7 +437,7 @@ pub async fn update_record2( let mut conn = conn_result.unwrap(); let query_result = sqlx::query(&query).execute(&mut conn).await; - + conn.close().await?; query_result } @@ -483,7 +488,7 @@ pub async fn update_record3( let mut conn = conn_result.unwrap(); let query_result = sqlx::query(&query).execute(&mut conn).await; - + conn.close().await?; query_result } @@ -577,7 +582,7 @@ pub async fn update_records( let mut conn = conn_result.unwrap(); let query_result = sqlx::query(&query).execute(&mut conn).await; - + conn.close().await?; query_result } @@ -603,7 +608,7 @@ pub async fn delete_record( let mut conn = conn_result.unwrap(); let query_result = sqlx::query(&query).execute(&mut conn).await; - + conn.close().await?; query_result } @@ -635,7 +640,7 @@ pub async fn count_rows(table_name: &String) -> Result { Ok(T) => Ok(T.cnt), Err(E) => return Err(E), }; - + conn.close().await?; result } @@ -661,6 +666,7 @@ pub async fn delete_all_rows( query_result = sqlx::query(&query).execute(&mut conn).await; sleep(Duration::from_millis(200)).await; } + conn.close().await?; Ok(()) } @@ -718,6 +724,7 @@ where } } } + conn.close().await?; Ok(query_result_vec) } @@ -754,6 +761,6 @@ where let mut conn = conn_result.unwrap(); let mut query_result: Vec = sqlx::query_as::<_, T>(&query).fetch_all(&mut conn).await?; - + conn.close().await?; Ok(query_result) }