@@ -194,17 +194,17 @@ impl ExportContext {
194
194
) -> Result < Self > {
195
195
let key_fields = key_fields_schema
196
196
. iter ( )
197
- . map ( |f| f. name . as_str ( ) )
197
+ . map ( |f| format ! ( " \" {} \" " , f. name) )
198
198
. collect :: < Vec < _ > > ( )
199
199
. join ( ", " ) ;
200
200
let value_fields = value_fields_schema
201
201
. iter ( )
202
- . map ( |f| f. name . as_str ( ) )
202
+ . map ( |f| format ! ( " \" {} \" " , f. name) )
203
203
. collect :: < Vec < _ > > ( )
204
204
. join ( ", " ) ;
205
205
let set_value_fields = value_fields_schema
206
206
. iter ( )
207
- . map ( |f| format ! ( "{} = EXCLUDED.{} " , f. name, f. name) )
207
+ . map ( |f| format ! ( "\" {} \" = EXCLUDED.\" {} \" " , f. name, f. name) )
208
208
. collect :: < Vec < _ > > ( )
209
209
. join ( ", " ) ;
210
210
@@ -288,7 +288,9 @@ impl ExportContext {
288
288
if i > 0 {
289
289
query_builder. push ( " AND " ) ;
290
290
}
291
+ query_builder. push ( "\" " ) ;
291
292
query_builder. push ( schema. name . as_str ( ) ) ;
293
+ query_builder. push ( "\" " ) ;
292
294
query_builder. push ( "=" ) ;
293
295
bind_key_field ( & mut query_builder, value) ?;
294
296
}
@@ -547,14 +549,16 @@ impl SetupStatus {
547
549
. await ?;
548
550
}
549
551
for index_name in self . actions . indexes_to_delete . iter ( ) {
550
- let sql = format ! ( "DROP INDEX IF EXISTS {}" , index_name ) ;
552
+ let sql = format ! ( "DROP INDEX IF EXISTS {index_name}" ) ;
551
553
sqlx:: query ( & sql) . execute ( db_pool) . await ?;
552
554
}
553
555
if let Some ( table_upsertion) = & self . actions . table_action . table_upsertion {
554
556
match table_upsertion {
555
557
TableUpsertionAction :: Create { keys, values } => {
556
- let mut fields = ( keys. iter ( ) . map ( |( k, v) | format ! ( "{k} {v} NOT NULL" ) ) )
557
- . chain ( values. iter ( ) . map ( |( k, v) | format ! ( "{k} {v}" ) ) ) ;
558
+ let mut fields = ( keys
559
+ . iter ( )
560
+ . map ( |( name, typ) | format ! ( "\" {name}\" {typ} NOT NULL" ) ) )
561
+ . chain ( values. iter ( ) . map ( |( name, typ) | format ! ( "\" {name}\" {typ}" ) ) ) ;
558
562
let sql = format ! (
559
563
"CREATE TABLE IF NOT EXISTS {table_name} ({}, PRIMARY KEY ({}))" ,
560
564
fields. join( ", " ) ,
@@ -568,13 +572,13 @@ impl SetupStatus {
568
572
} => {
569
573
for column_name in columns_to_delete. iter ( ) {
570
574
let sql = format ! (
571
- "ALTER TABLE {table_name} DROP COLUMN IF EXISTS {column_name}" ,
575
+ "ALTER TABLE {table_name} DROP COLUMN IF EXISTS \" {column_name}\" " ,
572
576
) ;
573
577
sqlx:: query ( & sql) . execute ( db_pool) . await ?;
574
578
}
575
579
for ( column_name, column_type) in columns_to_upsert. iter ( ) {
576
580
let sql = format ! (
577
- "ALTER TABLE {table_name} DROP COLUMN IF EXISTS {column_name}, ADD COLUMN {column_name} {column_type}"
581
+ "ALTER TABLE {table_name} DROP COLUMN IF EXISTS \" {column_name}\" , ADD COLUMN \" {column_name}\" {column_type}"
578
582
) ;
579
583
sqlx:: query ( & sql) . execute ( db_pool) . await ?;
580
584
}
0 commit comments