Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor: remove raw string hashes for readability #2381

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

refactor: remove raw string hashes for readability #2381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions src/executor/cursor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,7 +508,7 @@ mod tests {
r#"FROM "fruit""#,
r#"WHERE "fruit"."id" < $1"#,
r#"ORDER BY "fruit"."id" ASC"#,
r#"LIMIT $2"#,
r"LIMIT $2",
]
.join(" ")
.as_str(),
Expand Down Expand Up @@ -562,7 +562,7 @@ mod tests {
r#"FROM "fruit""#,
r#"WHERE "fruit"."id" < $1"#,
r#"ORDER BY "fruit"."id" ASC"#,
r#"LIMIT $2"#,
r"LIMIT $2",
]
.join(" ")
.as_str(),
Expand Down Expand Up @@ -1082,7 +1082,7 @@ mod tests {
r#"FROM "fruit""#,
r#"WHERE "fruit"."id" > $1"#,
r#"ORDER BY "fruit"."id" DESC"#,
r#"LIMIT $2"#,
r"LIMIT $2",
]
.join(" ")
.as_str(),
Expand Down Expand Up @@ -1134,7 +1134,7 @@ mod tests {
r#"FROM "fruit""#,
r#"WHERE "fruit"."id" > $1"#,
r#"ORDER BY "fruit"."id" DESC"#,
r#"LIMIT $2"#,
r"LIMIT $2",
]
.join(" ")
.as_str(),
Expand Down Expand Up @@ -1196,7 +1196,7 @@ mod tests {
r#"WHERE "fruit"."id" > $1"#,
r#"AND "fruit"."id" < $2"#,
r#"ORDER BY "fruit"."id" DESC"#,
r#"LIMIT $3"#,
r"LIMIT $3",
]
.join(" ")
.as_str(),
Expand Down Expand Up @@ -1250,7 +1250,7 @@ mod tests {
r#"WHERE "fruit"."id" < $1"#,
r#"AND "fruit"."id" > $2"#,
r#"ORDER BY "fruit"."id" DESC"#,
r#"LIMIT $3"#,
r"LIMIT $3",
]
.join(" ")
.as_str(),
Expand Down Expand Up @@ -1327,7 +1327,7 @@ mod tests {
r#"SELECT "example"."id", "example"."category""#,
r#"FROM "example""#,
r#"ORDER BY "example"."category" ASC, "example"."id" ASC"#,
r#"LIMIT $1"#,
r"LIMIT $1",
]
.join(" ")
.as_str(),
Expand Down Expand Up @@ -1365,7 +1365,7 @@ mod tests {
r#"SELECT "example"."id", "example"."category""#,
r#"FROM "example""#,
r#"ORDER BY "example"."category" ASC, "example"."id" ASC"#,
r#"LIMIT $1"#,
r"LIMIT $1",
]
.join(" ")
.as_str(),
Expand Down Expand Up @@ -1405,7 +1405,7 @@ mod tests {
r#"WHERE ("example"."category" = $1 AND "example"."id" > $2)"#,
r#"OR "example"."category" > $3"#,
r#"ORDER BY "example"."category" ASC, "example"."id" ASC"#,
r#"LIMIT $4"#,
r"LIMIT $4",
]
.join(" ")
.as_str(),
Expand Down Expand Up @@ -1451,7 +1451,7 @@ mod tests {
r#"WHERE ("example"."category" = $1 AND "example"."id" > $2)"#,
r#"OR "example"."category" > $3"#,
r#"ORDER BY "example"."category" ASC, "example"."id" ASC"#,
r#"LIMIT $4"#,
r"LIMIT $4",
]
.join(" ")
.as_str(),
Expand Down Expand Up @@ -1496,7 +1496,7 @@ mod tests {
r#"WHERE ("example"."category" = $1 AND "example"."id" < $2)"#,
r#"OR "example"."category" < $3"#,
r#"ORDER BY "example"."category" DESC, "example"."id" DESC"#,
r#"LIMIT $4"#,
r"LIMIT $4",
]
.join(" ")
.as_str(),
Expand Down Expand Up @@ -1542,7 +1542,7 @@ mod tests {
r#"WHERE ("example"."category" = $1 AND "example"."id" < $2)"#,
r#"OR "example"."category" < $3"#,
r#"ORDER BY "example"."category" DESC, "example"."id" DESC"#,
r#"LIMIT $4"#,
r"LIMIT $4",
]
.join(" ")
.as_str(),
Expand Down Expand Up @@ -1585,7 +1585,7 @@ mod tests {
r#"SELECT "m"."x", "m"."y", "m"."z""#,
r#"FROM "m""#,
r#"ORDER BY "m"."x" ASC, "m"."y" ASC, "m"."z" ASC"#,
r#"LIMIT $1"#,
r"LIMIT $1",
]
.join(" ")
.as_str(),
Expand Down Expand Up @@ -1624,7 +1624,7 @@ mod tests {
r#"SELECT "m"."x", "m"."y", "m"."z""#,
r#"FROM "m""#,
r#"ORDER BY "m"."x" ASC, "m"."y" ASC, "m"."z" ASC"#,
r#"LIMIT $1"#,
r"LIMIT $1",
]
.join(" ")
.as_str(),
Expand Down Expand Up @@ -1666,7 +1666,7 @@ mod tests {
r#"OR ("m"."x" = $4 AND "m"."y" > $5)"#,
r#"OR "m"."x" > $6"#,
r#"ORDER BY "m"."x" ASC, "m"."y" ASC, "m"."z" ASC"#,
r#"LIMIT $7"#,
r"LIMIT $7",
]
.join(" ")
.as_str(),
Expand Down Expand Up @@ -1717,7 +1717,7 @@ mod tests {
r#"OR ("m"."x" = $4 AND "m"."y" > $5)"#,
r#"OR "m"."x" > $6"#,
r#"ORDER BY "m"."x" ASC, "m"."y" ASC, "m"."z" ASC"#,
r#"LIMIT $7"#,
r"LIMIT $7",
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@billy1624 do you want me to revert the changes in this file for consistency?

]
.join(" ")
.as_str(),
Expand Down
2 changes: 1 addition & 1 deletion src/executor/query.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1427,7 +1427,7 @@ mod tests {
DbBackend::MySql.build(&with_query),
Statement::from_sql_and_values(
DbBackend::MySql,
r#"WITH RECURSIVE `cte_traversal` (`id`, `depth`, `next`, `value`) AS (SELECT `id`, ?, `next`, `value` FROM `table` UNION ALL (SELECT `id`, `depth` + ?, `next`, `value` FROM `table` INNER JOIN `cte_traversal` ON `cte_traversal`.`next` = `table`.`id`)) SELECT * FROM `cte_traversal`"#,
r"WITH RECURSIVE `cte_traversal` (`id`, `depth`, `next`, `value`) AS (SELECT `id`, ?, `next`, `value` FROM `table` UNION ALL (SELECT `id`, `depth` + ?, `next`, `value` FROM `table` INNER JOIN `cte_traversal` ON `cte_traversal`.`next` = `table`.`id`)) SELECT * FROM `cte_traversal`",
[1.into(), 1.into()]
)
);
Expand Down
92 changes: 46 additions & 46 deletions src/query/join.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,11 +335,11 @@ mod tests {
.build(DbBackend::MySql)
.to_string(),
[
r#"SELECT `filling`.`id`, `filling`.`name`, `filling`.`vendor_id`"#,
r#"FROM `filling`"#,
r#"INNER JOIN `cake_filling` AS `r0` ON `r0`.`filling_id` = `filling`.`id`"#,
r#"INNER JOIN `cake` AS `r1` ON `r1`.`id` = `r0`.`cake_id`"#,
r#"WHERE `r1`.`id` = 12"#,
r"SELECT `filling`.`id`, `filling`.`name`, `filling`.`vendor_id`",
r"FROM `filling`",
r"INNER JOIN `cake_filling` AS `r0` ON `r0`.`filling_id` = `filling`.`id`",
r"INNER JOIN `cake` AS `r1` ON `r1`.`id` = `r0`.`cake_id`",
r"WHERE `r1`.`id` = 12",
]
.join(" ")
);
Expand All @@ -358,12 +358,12 @@ mod tests {
.build(DbBackend::MySql)
.to_string(),
[
r#"SELECT `vendor`.`id`, `vendor`.`name`"#,
r#"FROM `vendor`"#,
r#"INNER JOIN `filling` AS `r0` ON `r0`.`vendor_id` = `vendor`.`id`"#,
r#"INNER JOIN `cake_filling` AS `r1` ON `r1`.`filling_id` = `r0`.`id`"#,
r#"INNER JOIN `cake` AS `r2` ON `r2`.`id` = `r1`.`cake_id`"#,
r#"WHERE `r2`.`id` = 18"#,
r"SELECT `vendor`.`id`, `vendor`.`name`",
r"FROM `vendor`",
r"INNER JOIN `filling` AS `r0` ON `r0`.`vendor_id` = `vendor`.`id`",
r"INNER JOIN `cake_filling` AS `r1` ON `r1`.`filling_id` = `r0`.`id`",
r"INNER JOIN `cake` AS `r2` ON `r2`.`id` = `r1`.`cake_id`",
r"WHERE `r2`.`id` = 18",
]
.join(" ")
);
Expand All @@ -377,11 +377,11 @@ mod tests {
.build(DbBackend::MySql)
.to_string(),
[
r#"SELECT `cake`.`id` AS `A_id`, `cake`.`name` AS `A_name`,"#,
r#"`r1`.`id` AS `B_id`, `r1`.`name` AS `B_name`, `r1`.`vendor_id` AS `B_vendor_id`"#,
r#"FROM `cake`"#,
r#"LEFT JOIN `cake_filling` AS `r0` ON `cake`.`id` = `r0`.`cake_id`"#,
r#"LEFT JOIN `filling` AS `r1` ON `r0`.`filling_id` = `r1`.`id`"#,
r"SELECT `cake`.`id` AS `A_id`, `cake`.`name` AS `A_name`,",
r"`r1`.`id` AS `B_id`, `r1`.`name` AS `B_name`, `r1`.`vendor_id` AS `B_vendor_id`",
r"FROM `cake`",
r"LEFT JOIN `cake_filling` AS `r0` ON `cake`.`id` = `r0`.`cake_id`",
r"LEFT JOIN `filling` AS `r1` ON `r0`.`filling_id` = `r1`.`id`",
]
.join(" ")
);
Expand All @@ -395,12 +395,12 @@ mod tests {
.build(DbBackend::MySql)
.to_string(),
[
r#"SELECT `cake`.`id` AS `A_id`, `cake`.`name` AS `A_name`,"#,
r#"`r2`.`id` AS `B_id`, `r2`.`name` AS `B_name`"#,
r#"FROM `cake`"#,
r#"LEFT JOIN `cake_filling` AS `r0` ON `cake`.`id` = `r0`.`cake_id`"#,
r#"LEFT JOIN `filling` AS `r1` ON `r0`.`filling_id` = `r1`.`id`"#,
r#"LEFT JOIN `vendor` AS `r2` ON `r1`.`vendor_id` = `r2`.`id`"#,
r"SELECT `cake`.`id` AS `A_id`, `cake`.`name` AS `A_name`,",
r"`r2`.`id` AS `B_id`, `r2`.`name` AS `B_name`",
r"FROM `cake`",
r"LEFT JOIN `cake_filling` AS `r0` ON `cake`.`id` = `r0`.`cake_id`",
r"LEFT JOIN `filling` AS `r1` ON `r0`.`filling_id` = `r1`.`id`",
r"LEFT JOIN `vendor` AS `r2` ON `r1`.`vendor_id` = `r2`.`id`",
]
.join(" ")
);
Expand Down Expand Up @@ -434,12 +434,12 @@ mod tests {
.build(DbBackend::MySql)
.to_string(),
[
r#"SELECT `vendor`.`id`, `vendor`.`name`"#,
r#"FROM `vendor`"#,
r#"INNER JOIN `filling` AS `r0` ON `r0`.`vendor_id` = `vendor`.`id`"#,
r#"INNER JOIN `cake_filling` AS `r1` ON `r1`.`filling_id` = `r0`.`id`"#,
r#"INNER JOIN `cake` AS `r2` ON `r2`.`id` = `r1`.`cake_id` AND `r2`.`name` LIKE '%cheese%'"#,
r#"WHERE `r2`.`id` = 18"#,
r"SELECT `vendor`.`id`, `vendor`.`name`",
r"FROM `vendor`",
r"INNER JOIN `filling` AS `r0` ON `r0`.`vendor_id` = `vendor`.`id`",
r"INNER JOIN `cake_filling` AS `r1` ON `r1`.`filling_id` = `r0`.`id`",
r"INNER JOIN `cake` AS `r2` ON `r2`.`id` = `r1`.`cake_id` AND `r2`.`name` LIKE '%cheese%'",
r"WHERE `r2`.`id` = 18",
]
.join(" ")
);
Expand All @@ -457,12 +457,12 @@ mod tests {
.build(DbBackend::MySql)
.to_string(),
[
r#"SELECT `vendor`.`id`, `vendor`.`name`"#,
r#"FROM `vendor`"#,
r#"INNER JOIN `filling` AS `r0` ON `r0`.`vendor_id` = `vendor`.`id`"#,
r#"INNER JOIN `cake_filling` AS `r1` ON `r1`.`filling_id` = `r0`.`id`"#,
r#"INNER JOIN `cake_filling` AS `r2` ON `r2`.`cake_id` = `r1`.`id` AND `r2`.`name` LIKE '%cheese%'"#,
r#"WHERE `r2`.`id` = 18"#,
r"SELECT `vendor`.`id`, `vendor`.`name`",
r"FROM `vendor`",
r"INNER JOIN `filling` AS `r0` ON `r0`.`vendor_id` = `vendor`.`id`",
r"INNER JOIN `cake_filling` AS `r1` ON `r1`.`filling_id` = `r0`.`id`",
r"INNER JOIN `cake_filling` AS `r2` ON `r2`.`cake_id` = `r1`.`id` AND `r2`.`name` LIKE '%cheese%'",
r"WHERE `r2`.`id` = 18",
]
.join(" ")
);
Expand All @@ -476,12 +476,12 @@ mod tests {
.build(DbBackend::MySql)
.to_string(),
[
r#"SELECT `cake`.`id` AS `A_id`, `cake`.`name` AS `A_name`,"#,
r#"`r2`.`id` AS `B_id`, `r2`.`name` AS `B_name`"#,
r#"FROM `cake`"#,
r#"LEFT JOIN `cake_filling` AS `r0` ON `cake`.`id` = `r0`.`cake_id` AND `cake`.`name` LIKE '%cheese%'"#,
r#"LEFT JOIN `filling` AS `r1` ON `r0`.`filling_id` = `r1`.`id`"#,
r#"LEFT JOIN `vendor` AS `r2` ON `r1`.`vendor_id` = `r2`.`id`"#,
r"SELECT `cake`.`id` AS `A_id`, `cake`.`name` AS `A_name`,",
r"`r2`.`id` AS `B_id`, `r2`.`name` AS `B_name`",
r"FROM `cake`",
r"LEFT JOIN `cake_filling` AS `r0` ON `cake`.`id` = `r0`.`cake_id` AND `cake`.`name` LIKE '%cheese%'",
r"LEFT JOIN `filling` AS `r1` ON `r0`.`filling_id` = `r1`.`id`",
r"LEFT JOIN `vendor` AS `r2` ON `r1`.`vendor_id` = `r2`.`id`",
]
.join(" ")
);
Expand All @@ -495,12 +495,12 @@ mod tests {
.build(DbBackend::MySql)
.to_string(),
[
r#"SELECT `cake`.`id` AS `A_id`, `cake`.`name` AS `A_name`,"#,
r#"`r2`.`id` AS `B_id`, `r2`.`name` AS `B_name`"#,
r#"FROM `cake`"#,
r#"LEFT JOIN `cake` AS `r0` ON `cake_filling`.`cake_id` = `r0`.`id` AND `cake_filling`.`name` LIKE '%cheese%'"#,
r#"LEFT JOIN `filling` AS `r1` ON `r0`.`filling_id` = `r1`.`id`"#,
r#"LEFT JOIN `vendor` AS `r2` ON `r1`.`vendor_id` = `r2`.`id`"#,
r"SELECT `cake`.`id` AS `A_id`, `cake`.`name` AS `A_name`,",
r"`r2`.`id` AS `B_id`, `r2`.`name` AS `B_name`",
r"FROM `cake`",
r"LEFT JOIN `cake` AS `r0` ON `cake_filling`.`cake_id` = `r0`.`id` AND `cake_filling`.`name` LIKE '%cheese%'",
r"LEFT JOIN `filling` AS `r1` ON `r0`.`filling_id` = `r1`.`id`",
r"LEFT JOIN `vendor` AS `r2` ON `r1`.`vendor_id` = `r2`.`id`",
]
.join(" ")
);
Expand Down
16 changes: 8 additions & 8 deletions tests/self_join_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,10 @@ fn find_linked_001() {
.build(DbBackend::MySql)
.to_string(),
[
r#"SELECT `self_join`.`uuid`, `self_join`.`uuid_ref`, `self_join`.`time`"#,
r#"FROM `self_join`"#,
r#"INNER JOIN `self_join` AS `r0` ON `r0`.`uuid_ref` = `self_join`.`uuid`"#,
r#"WHERE `r0`.`uuid` = '00000000-0000-0000-0000-000000000000'"#,
r"SELECT `self_join`.`uuid`, `self_join`.`uuid_ref`, `self_join`.`time`",
r"FROM `self_join`",
r"INNER JOIN `self_join` AS `r0` ON `r0`.`uuid_ref` = `self_join`.`uuid`",
r"WHERE `r0`.`uuid` = '00000000-0000-0000-0000-000000000000'",
]
.join(" ")
);
Expand All @@ -120,10 +120,10 @@ fn find_also_linked_001() {
.build(DbBackend::MySql)
.to_string(),
[
r#"SELECT `self_join`.`uuid` AS `A_uuid`, `self_join`.`uuid_ref` AS `A_uuid_ref`, `self_join`.`time` AS `A_time`,"#,
r#"`r0`.`uuid` AS `B_uuid`, `r0`.`uuid_ref` AS `B_uuid_ref`, `r0`.`time` AS `B_time`"#,
r#"FROM `self_join`"#,
r#"LEFT JOIN `self_join` AS `r0` ON `self_join`.`uuid_ref` = `r0`.`uuid`"#,
r"SELECT `self_join`.`uuid` AS `A_uuid`, `self_join`.`uuid_ref` AS `A_uuid_ref`, `self_join`.`time` AS `A_time`,",
r"`r0`.`uuid` AS `B_uuid`, `r0`.`uuid_ref` AS `B_uuid_ref`, `r0`.`time` AS `B_time`",
r"FROM `self_join`",
r"LEFT JOIN `self_join` AS `r0` ON `self_join`.`uuid_ref` = `r0`.`uuid`",
]
.join(" ")
);
Expand Down