@@ -17,7 +17,7 @@ pub async fn get_db_connection() -> DbPoolConnection {
1717#[ cfg( feature = "dev" ) ]
1818pub async fn create_batabase ( ) {
1919 let db_pool: DbPoolConnection = get_db_connection ( ) . await ;
20- let _ = sqlx :: query ( & format ! ( "CREATE DATABASE {};" , DATABASE_NAME ) )
20+ let _ = query ( & format ! ( "CREATE DATABASE {};" , DATABASE_NAME ) )
2121 . execute ( & db_pool)
2222 . await ;
2323}
@@ -26,15 +26,15 @@ pub async fn create_batabase() {
2626#[ cfg( feature = "dev" ) ]
2727pub async fn create_table ( ) {
2828 let db_pool: DbPoolConnection = get_db_connection ( ) . await ;
29- let _ = sqlx :: query ( & format ! (
29+ let _ = query ( & format ! (
3030 "CREATE TABLE IF NOT EXISTS {} (
3131 id SERIAL PRIMARY KEY, randomNumber INT NOT NULL
3232 );" ,
3333 TABLE_NAME_WORLD
3434 ) )
3535 . execute ( & db_pool)
3636 . await ;
37- let _ = sqlx :: query ( & format ! (
37+ let _ = query ( & format ! (
3838 "CREATE TABLE IF NOT EXISTS {} (
3939 id SERIAL PRIMARY KEY, message VARCHAR NOT NULL
4040 );" ,
@@ -45,10 +45,9 @@ pub async fn create_table() {
4545}
4646
4747#[ inline]
48- #[ cfg( feature = "dev" ) ]
4948pub async fn insert_records ( ) {
5049 let db_pool: DbPoolConnection = get_db_connection ( ) . await ;
51- let row: PgRow = sqlx :: query ( & format ! ( "SELECT COUNT(*) FROM {}" , TABLE_NAME_WORLD ) )
50+ let row: PgRow = query ( & format ! ( "SELECT COUNT(*) FROM {}" , TABLE_NAME_WORLD ) )
5251 . fetch_one ( & db_pool)
5352 . await
5453 . unwrap ( ) ;
@@ -58,29 +57,29 @@ pub async fn insert_records() {
5857 return ;
5958 }
6059 let missing_count: i64 = limit - count;
61- let mut rng: rand :: prelude :: ThreadRng = rand :: rng ( ) ;
60+ let mut rng: ThreadRng = rng ( ) ;
6261 let mut values: Vec < String > = Vec :: new ( ) ;
6362 for _ in 0 ..missing_count {
6463 let random_number: i32 = rng. random_range ( 1 ..=RANDOM_MAX ) ;
6564 values. push ( format ! ( "(DEFAULT, {})" , random_number) ) ;
6665 }
67- let query : String = format ! (
66+ let sql : String = format ! (
6867 "INSERT INTO {} (id, randomNumber) VALUES {}" ,
6968 TABLE_NAME_WORLD ,
7069 values. join( "," )
7170 ) ;
72- let _ = sqlx :: query ( & query ) . execute ( & db_pool) . await ;
71+ let _ = query ( & sql ) . execute ( & db_pool) . await ;
7372 let mut values: Vec < String > = Vec :: new ( ) ;
7473 for _ in 0 ..missing_count {
7574 let random_number: String = rng. random_range ( 1 ..=RANDOM_MAX ) . to_string ( ) ;
7675 values. push ( format ! ( "(DEFAULT, {})" , random_number) ) ;
7776 }
78- let query : String = format ! (
77+ let sql : String = format ! (
7978 "INSERT INTO {} (id, message) VALUES {}" ,
8079 TABLE_NAME_FORTUNE ,
8180 values. join( "," )
8281 ) ;
83- let _ = sqlx :: query ( & query ) . execute ( & db_pool) . await ;
82+ let _ = query ( & sql ) . execute ( & db_pool) . await ;
8483}
8584
8685#[ inline]
@@ -91,7 +90,7 @@ pub async fn init_cache() {
9190 "SELECT id, randomNumber FROM {} LIMIT {}" ,
9291 TABLE_NAME_WORLD , RANDOM_MAX
9392 ) ;
94- if let Ok ( rows) = sqlx :: query ( & sql) . fetch_all ( & db_pool) . await {
93+ if let Ok ( rows) = query ( & sql) . fetch_all ( & db_pool) . await {
9594 for row in rows {
9695 let id: i32 = row. get ( KEY_ID ) ;
9796 let random_number: i32 = row. get ( KEY_RANDOM_NUMBER ) ;
@@ -165,8 +164,8 @@ pub async fn init_db() {
165164 {
166165 create_batabase ( ) . await ;
167166 create_table ( ) . await ;
168- insert_records ( ) . await ;
169167 }
168+ insert_records ( ) . await ;
170169 init_cache ( ) . await ;
171170}
172171
@@ -177,7 +176,7 @@ pub async fn random_world_row(db_pool: &DbPoolConnection) -> QueryRow {
177176 "SELECT id, randomNumber FROM {} WHERE id = {}" ,
178177 TABLE_NAME_WORLD , random_id
179178 ) ;
180- if let Ok ( rows) = sqlx :: query ( & sql) . fetch_one ( db_pool) . await {
179+ if let Ok ( rows) = query ( & sql) . fetch_one ( db_pool) . await {
181180 let random_number: i32 = rows. get ( KEY_RANDOM_NUMBER ) ;
182181 return QueryRow :: new ( random_id, random_number) ;
183182 }
@@ -189,7 +188,7 @@ pub async fn update_world_rows(limit: Queries) -> Vec<QueryRow> {
189188 let db_pool: DbPoolConnection = get_db_connection ( ) . await ;
190189 let ( sql, data) = get_update_data ( limit) . await ;
191190 spawn ( async move {
192- let _ = sqlx :: query ( & sql) . execute ( & db_pool) . await ;
191+ let _ = query ( & sql) . execute ( & db_pool) . await ;
193192 } ) ;
194193 data
195194}
@@ -198,10 +197,7 @@ pub async fn update_world_rows(limit: Queries) -> Vec<QueryRow> {
198197pub async fn all_world_row ( ) -> Vec < PgRow > {
199198 let db_pool: DbPoolConnection = get_db_connection ( ) . await ;
200199 let sql: String = format ! ( "SELECT id, message FROM {}" , TABLE_NAME_FORTUNE ) ;
201- let res: Vec < PgRow > = sqlx:: query ( & sql)
202- . fetch_all ( & db_pool)
203- . await
204- . unwrap_or_default ( ) ;
200+ let res: Vec < PgRow > = query ( & sql) . fetch_all ( & db_pool) . await . unwrap_or_default ( ) ;
205201 return res;
206202}
207203
0 commit comments