Skip to content

Commit bc85aa8

Browse files
Zoran Cvetkovzorancv
Zoran Cvetkov
authored and
zorancv
committed
add qotes
1 parent 36f55ff commit bc85aa8

File tree

2 files changed

+22
-22
lines changed

2 files changed

+22
-22
lines changed

‎store/postgres/src/relational/ddl_tests.rs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -221,8 +221,6 @@ fn generate_ddl() {
221221
let il = IndexList::mock_thing_index_list();
222222
let layout = test_layout(THING_GQL);
223223
let sql = layout.as_ddl(Some(il)).expect("Failed to generate DDL");
224-
println!("SQL: {}", sql);
225-
println!("THING_DDL_ON_COPY: {}", THING_DDL_ON_COPY);
226224
check_eqv(THING_DDL_ON_COPY, &sql);
227225

228226
let layout = test_layout(MUSIC_GQL);
@@ -486,9 +484,9 @@ create index thing_block_range_closed
486484
on "sgd0815"."thing"(coalesce(upper(block_range), 2147483647))
487485
where coalesce(upper(block_range), 2147483647) < 2147483647;
488486
create index attr_0_0_thing_id
489-
on sgd0815."thing" using btree (id);
487+
on sgd0815."thing" using btree ("id");
490488
create index attr_0_1_thing_big_thing
491-
on sgd0815."thing" using gist (big_thing, block_range);
489+
on sgd0815."thing" using gist ("big_thing", block_range);
492490
493491
494492
create table "sgd0815"."scalar" (
@@ -513,7 +511,7 @@ create index scalar_block_range_closed
513511
on "sgd0815"."scalar"(coalesce(upper(block_range), 2147483647))
514512
where coalesce(upper(block_range), 2147483647) < 2147483647;
515513
create index attr_1_0_scalar_id
516-
on sgd0815."scalar" using btree (id);
514+
on sgd0815."scalar" using btree ("id");
517515
518516
519517
create table "sgd0815"."file_thing" (
@@ -532,7 +530,7 @@ create index file_thing_block_range_closed
532530
on "sgd0815"."file_thing"(coalesce(upper(block_range), 2147483647))
533531
where coalesce(upper(block_range), 2147483647) < 2147483647;
534532
create index attr_2_0_file_thing_id
535-
on sgd0815."file_thing" using btree (id);
533+
on sgd0815."file_thing" using btree ("id");
536534
"#;
537535

538536
const BOOKS_GQL: &str = r#"type Author @entity {

‎store/postgres/src/relational/index.rs

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -211,8 +211,8 @@ impl Expr {
211211

212212
fn to_sql(&self) -> String {
213213
match self {
214-
Expr::Column(name) => name.to_string(),
215-
Expr::Prefix(name, kind) => kind.to_sql(name),
214+
Expr::Column(name) => format!("\"{}\"", name),
215+
Expr::Prefix(name, kind) => kind.to_sql(&format!("\"{}\"", name)),
216216
Expr::Vid => VID_COLUMN.to_string(),
217217
Expr::Block => BLOCK_COLUMN.to_string(),
218218
Expr::BlockRange => BLOCK_RANGE_COLUMN.to_string(),
@@ -942,14 +942,14 @@ fn parse() {
942942
let exp = CreateIndex::from(exp);
943943
assert_eq!(exp, act);
944944

945-
let defn = defn.replace('\"', "").to_ascii_lowercase();
945+
let defn = defn.to_ascii_lowercase();
946946
assert_eq!(defn, act.to_sql(false, false).unwrap());
947947
}
948948

949949
use TestCond::*;
950950
use TestExpr::*;
951951

952-
let sql = "create index attr_1_0_token_id on sgd44.token using btree (id)";
952+
let sql = "create index attr_1_0_token_id on sgd44.token using btree (\"id\")";
953953
let exp = Parsed {
954954
unique: false,
955955
name: "attr_1_0_token_id",
@@ -962,7 +962,7 @@ fn parse() {
962962
parse_one(sql, exp);
963963

964964
let sql =
965-
"create index attr_1_1_token_symbol on sgd44.token using btree (\"left\"(symbol, 256))";
965+
"create index attr_1_1_token_symbol on sgd44.token using btree (left(\"symbol\", 256))";
966966
let exp = Parsed {
967967
unique: false,
968968
name: "attr_1_1_token_symbol",
@@ -974,7 +974,8 @@ fn parse() {
974974
};
975975
parse_one(sql, exp);
976976

977-
let sql = "create index attr_1_5_token_trade_volume on sgd44.token using btree (trade_volume)";
977+
let sql =
978+
"create index attr_1_5_token_trade_volume on sgd44.token using btree (\"trade_volume\")";
978979
let exp = Parsed {
979980
unique: false,
980981
name: "attr_1_5_token_trade_volume",
@@ -1022,7 +1023,8 @@ fn parse() {
10221023
};
10231024
parse_one(sql, exp);
10241025

1025-
let sql = "create index token_id_block_range_excl on sgd44.token using gist (id, block_range)";
1026+
let sql =
1027+
"create index token_id_block_range_excl on sgd44.token using gist (\"id\", block_range)";
10261028
let exp = Parsed {
10271029
unique: false,
10281030
name: "token_id_block_range_excl",
@@ -1034,7 +1036,7 @@ fn parse() {
10341036
};
10351037
parse_one(sql, exp);
10361038

1037-
let sql="create index attr_1_11_pool_owner on sgd411585.pool using btree (\"substring\"(owner, 1, 64))";
1039+
let sql="create index attr_1_11_pool_owner on sgd411585.pool using btree (substring(\"owner\", 1, 64))";
10381040
let exp = Parsed {
10391041
unique: false,
10401042
name: "attr_1_11_pool_owner",
@@ -1047,7 +1049,7 @@ fn parse() {
10471049
parse_one(sql, exp);
10481050

10491051
let sql =
1050-
"create index attr_1_20_pool_vault_id on sgd411585.pool using gist (vault_id, block_range)";
1052+
"create index attr_1_20_pool_vault_id on sgd411585.pool using gist (\"vault_id\", block_range)";
10511053
let exp = Parsed {
10521054
unique: false,
10531055
name: "attr_1_20_pool_vault_id",
@@ -1059,7 +1061,8 @@ fn parse() {
10591061
};
10601062
parse_one(sql, exp);
10611063

1062-
let sql = "create index attr_1_22_pool_tokens_list on sgd411585.pool using gin (tokens_list)";
1064+
let sql =
1065+
"create index attr_1_22_pool_tokens_list on sgd411585.pool using gin (\"tokens_list\")";
10631066
let exp = Parsed {
10641067
unique: false,
10651068
name: "attr_1_22_pool_tokens_list",
@@ -1071,7 +1074,7 @@ fn parse() {
10711074
};
10721075
parse_one(sql, exp);
10731076

1074-
let sql = "create index manual_partial_pool_total_liquidity on sgd411585.pool using btree (total_liquidity) where (coalesce(upper(block_range), 2147483647) > 15635000)";
1077+
let sql = "create index manual_partial_pool_total_liquidity on sgd411585.pool using btree (\"total_liquidity\") where (coalesce(upper(block_range), 2147483647) > 15635000)";
10751078
let exp = Parsed {
10761079
unique: false,
10771080
name: "manual_partial_pool_total_liquidity",
@@ -1083,7 +1086,7 @@ fn parse() {
10831086
};
10841087
parse_one(sql, exp);
10851088

1086-
let sql = "create index manual_swap_pool_timestamp_id on sgd217942.swap using btree (pool, \"timestamp\", id)";
1089+
let sql = "create index manual_swap_pool_timestamp_id on sgd217942.swap using btree (\"pool\", \"timestamp\", \"id\")";
10871090
let exp = Parsed {
10881091
unique: false,
10891092
name: "manual_swap_pool_timestamp_id",
@@ -1095,7 +1098,7 @@ fn parse() {
10951098
};
10961099
parse_one(sql, exp);
10971100

1098-
let sql = "CREATE INDEX brin_scy ON sgd314614.scy USING brin (\"block$\", vid)";
1101+
let sql = "CREATE INDEX brin_scy ON sgd314614.scy USING brin (block$, vid)";
10991102
let exp = Parsed {
11001103
unique: false,
11011104
name: "brin_scy",
@@ -1107,8 +1110,7 @@ fn parse() {
11071110
};
11081111
parse_one(sql, exp);
11091112

1110-
let sql =
1111-
"CREATE INDEX brin_scy ON sgd314614.scy USING brin (\"block$\", vid) where (amount > 0)";
1113+
let sql = "CREATE INDEX brin_scy ON sgd314614.scy USING brin (block$, vid) where (amount > 0)";
11121114
let exp = Parsed {
11131115
unique: false,
11141116
name: "brin_scy",
@@ -1121,7 +1123,7 @@ fn parse() {
11211123
parse_one(sql, exp);
11221124

11231125
let sql =
1124-
"CREATE INDEX manual_token_random_cond ON sgd44.token USING btree (decimals) WHERE (decimals > (5)::numeric)";
1126+
"CREATE INDEX manual_token_random_cond ON sgd44.token USING btree (\"decimals\") WHERE (decimals > (5)::numeric)";
11251127
let exp = Parsed {
11261128
unique: false,
11271129
name: "manual_token_random_cond",

0 commit comments

Comments
 (0)