From 78f7ca3a697af952cc8a8766ca60380a6f2ef528 Mon Sep 17 00:00:00 2001 From: Hamir Mahal Date: Fri, 4 Oct 2024 16:32:23 -0700 Subject: [PATCH] refactor: remove raw string hashes for readability --- src/executor/cursor.rs | 32 +++++++------- src/executor/query.rs | 2 +- src/query/join.rs | 92 ++++++++++++++++++++-------------------- tests/self_join_tests.rs | 16 +++---- 4 files changed, 71 insertions(+), 71 deletions(-) diff --git a/src/executor/cursor.rs b/src/executor/cursor.rs index ef061b5ae..e8f453f11 100644 --- a/src/executor/cursor.rs +++ b/src/executor/cursor.rs @@ -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(), @@ -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(), @@ -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(), @@ -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(), @@ -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(), @@ -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(), @@ -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(), @@ -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(), @@ -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(), @@ -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(), @@ -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(), @@ -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(), @@ -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(), @@ -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(), @@ -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(), @@ -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", ] .join(" ") .as_str(), diff --git a/src/executor/query.rs b/src/executor/query.rs index ce3ae4c88..f9ce1713f 100644 --- a/src/executor/query.rs +++ b/src/executor/query.rs @@ -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()] ) ); diff --git a/src/query/join.rs b/src/query/join.rs index 6ed56de0c..c3d4d9096 100644 --- a/src/query/join.rs +++ b/src/query/join.rs @@ -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(" ") ); @@ -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(" ") ); @@ -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(" ") ); @@ -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(" ") ); @@ -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(" ") ); @@ -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(" ") ); @@ -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(" ") ); @@ -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(" ") ); diff --git a/tests/self_join_tests.rs b/tests/self_join_tests.rs index dd3fe904e..bbbf6c877 100644 --- a/tests/self_join_tests.rs +++ b/tests/self_join_tests.rs @@ -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(" ") ); @@ -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(" ") );