fix: missing escape column name for SQL query clauses

tests/sqlite/tests/bulk_delete/mod.rs

@@ -34,7 +34,7 @@ fn delete_from_with_where() {
         let q = Order2::all()
             .where_col(|x| x.oid.equal(1))
             .delete_sql(Syntax::Sqlite);
-        assert_eq!(q, "DELETE FROM orders WHERE ( orders.oid = ? )");
+        assert_eq!(q, "DELETE FROM orders WHERE ( orders.\"oid\" = ? )");
     })
 }
 
@@ -47,7 +47,7 @@ fn should_be_able_to_delete_with_limit() {
             .delete_sql(Syntax::Sqlite);
         assert_eq!(
             q,
-            "DELETE FROM orders WHERE (  orders.oid IN (SELECT t1.\"oid\" FROM orders t1 ORDER BY t1.oid ASC LIMIT 3 OFFSET 0 )  )"
+            "DELETE FROM orders WHERE (  orders.\"oid\" IN (SELECT t1.\"oid\" FROM orders t1 ORDER BY t1.\"oid\" ASC LIMIT 3 OFFSET 0 )  )"
         );
     })
 }
@@ -60,7 +60,7 @@ fn should_be_able_to_delete_with_existsin() {
             .delete_sql(Syntax::Sqlite);
         assert_eq!(
             q,
-            "DELETE FROM orders WHERE ( EXISTS ( SELECT pid FROM Products t1 WHERE t1.pid > ? AND t1.pid = orders.product_id ) )"
+            "DELETE FROM orders WHERE ( EXISTS ( SELECT \"pid\" FROM Products t1 WHERE t1.\"pid\" > ? AND t1.\"pid\" = orders.\"product_id\" ) )"
         );
     })
 }
@@ -74,7 +74,7 @@ fn should_be_able_to_delete_with_wherein_with_limit() {
             .delete_sql(Syntax::Sqlite);
         assert_eq!(
             q,
-            "DELETE FROM orders WHERE (  orders.product_id IN (SELECT t1.pid FROM Products t1 WHERE t1.pid > ? ORDER BY 1 LIMIT 1 OFFSET 0 )  )"
+            "DELETE FROM orders WHERE (  orders.\"product_id\" IN (SELECT t1.\"pid\" FROM Products t1 WHERE t1.\"pid\" > ? ORDER BY 1 LIMIT 1 OFFSET 0 )  )"
         );
     })
 }

tests/sqlite/tests/bulk_update/mod.rs

@@ -37,7 +37,7 @@ fn should_be_able_to_update_table_with_where() {
             .to_sql(Syntax::Sqlite);
         assert_eq!(
             q,
-            "UPDATE Products SET \"name\"=? WHERE ( Products.pid = ? )"
+            "UPDATE Products SET \"name\"=? WHERE ( Products.\"pid\" = ? )"
         );
     })
 }
@@ -51,7 +51,7 @@ fn should_be_able_to_update_table_with_where_exists_from_map_query() {
             .to_sql(Syntax::Sqlite);
         assert_eq!(
             q,
-            "UPDATE Products SET \"name\"=? WHERE ( EXISTS ( SELECT product_id FROM orders t1 WHERE t1.oid = ? AND t1.product_id = Products.pid ) )"
+            "UPDATE Products SET \"name\"=? WHERE ( EXISTS ( SELECT \"product_id\" FROM orders t1 WHERE t1.\"oid\" = ? AND t1.\"product_id\" = Products.\"pid\" ) )"
         );
     })
 }
@@ -66,7 +66,7 @@ fn should_be_able_to_update_table_with_where_in_from_map_query_with_limit() {
             .to_sql(Syntax::Sqlite);
         assert_eq!(
             q,
-            "UPDATE Products SET \"name\"=? WHERE (  Products.pid IN (SELECT t1.product_id FROM orders t1 WHERE t1.oid = ? ORDER BY 1 LIMIT 1 OFFSET 0 )  )"
+            "UPDATE Products SET \"name\"=? WHERE (  Products.\"pid\" IN (SELECT t1.\"product_id\" FROM orders t1 WHERE t1.\"oid\" = ? ORDER BY 1 LIMIT 1 OFFSET 0 )  )"
         );
     })
 }
@@ -80,7 +80,7 @@ fn should_be_able_to_update_with_just_limit() {
             .to_sql(Syntax::Sqlite);
         assert_eq!(
             q,
-            "UPDATE Products SET \"name\"=? WHERE (  Products.pid IN (SELECT t1.\"pid\" FROM Products t1 ORDER BY 1 LIMIT 1 OFFSET 0 )  )"
+            "UPDATE Products SET \"name\"=? WHERE (  Products.\"pid\" IN (SELECT t1.\"pid\" FROM Products t1 ORDER BY 1 LIMIT 1 OFFSET 0 )  )"
         );
     })
 }

tests/sqlite/tests/select_col/mod.rs

@@ -93,7 +93,7 @@ fn should_be_able_to_select_join_with_where() {
             .to_sql(Syntax::Sqlite);
         assert_eq!(
             q,
-            "SELECT t1.\"oid\", t2.\"pid\" FROM orders t1 JOIN Products t2 ON t1.\"product_id\" = t2.\"pid\" WHERE ( t1.oid = ? )"
+            "SELECT t1.\"oid\", t2.\"pid\" FROM orders t1 JOIN Products t2 ON t1.\"product_id\" = t2.\"pid\" WHERE ( t1.\"oid\" = ? )"
         );
     })
 }
@@ -110,7 +110,7 @@ fn should_be_able_to_select_where_in_join() {
             .to_sql(Syntax::Sqlite);
         assert_eq!(
             q,
-            "SELECT t1.\"oid\", t2.\"pid\" FROM orders t1 JOIN Products t2 ON t1.\"product_id\" = t2.\"pid\" WHERE ( t2.pid = ? )"
+            "SELECT t1.\"oid\", t2.\"pid\" FROM orders t1 JOIN Products t2 ON t1.\"product_id\" = t2.\"pid\" WHERE ( t2.\"pid\" = ? )"
         );
     })
 }
@@ -247,9 +247,7 @@ fn should_be_able_to_write_order_by_with_table_and_column_aliases() {
         let query = Order2::all()
             .select(|o| o.oid)
             .select_as(|o| o.name, "aliased_column")
-            .left_join(|o| o.product, {
-                Product2::all().select(|p| p.pid)
-            })
+            .left_join(|o| o.product, { Product2::all().select(|p| p.pid) })
             .order_manual("$.oid DESC")
             .order_manual("t2.pid DESC")
             .order_manual("aliased_column ASC");

tests/sqlite/tests/sub_query_tests/mod.rs

@@ -1,7 +1,7 @@
 use super::get_conn;
+use welds::connections::TransactStart;
 use welds::Syntax;
 use welds::WeldsModel;
-use welds::connections::TransactStart;
 
 #[derive(Debug, WeldsModel)]
 #[welds(db(Sqlite))]
@@ -30,15 +30,15 @@ fn exist_in_mapping_query_source_belongs() {
             .to_sql(Syntax::Sqlite);
         assert_eq!(
             q1,
-            "SELECT t2.\"pid\", t2.\"name\" FROM Products t2 WHERE ( EXISTS ( SELECT product_id FROM orders t1 WHERE t1.product_id = t2.pid ) )"
+            "SELECT t2.\"pid\", t2.\"name\" FROM Products t2 WHERE ( EXISTS ( SELECT \"product_id\" FROM orders t1 WHERE t1.\"product_id\" = t2.\"pid\" ) )"
         );
         let q2 = Order2::all()
             .limit(1)
             .map_query(|o| o.product)
             .to_sql(Syntax::Sqlite);
         assert_eq!(
             q2,
-            "SELECT t2.\"pid\", t2.\"name\" FROM Products t2 WHERE (  t2.pid IN (SELECT t1.product_id FROM orders t1  ORDER BY 1 LIMIT 1 OFFSET 0 )  )"
+            "SELECT t2.\"pid\", t2.\"name\" FROM Products t2 WHERE (  t2.\"pid\" IN (SELECT t1.\"product_id\" FROM orders t1  ORDER BY 1 LIMIT 1 OFFSET 0 )  )"
         );
     })
 }
@@ -51,7 +51,7 @@ fn should_be_able_to_join_limit_and_order_all_at_once() {
             .order_by_asc(|o| o.oid)
             .map_query(|o| o.product)
             .to_sql(Syntax::Sqlite);
-        let expected = "SELECT t2.\"pid\", t2.\"name\" FROM Products t2 WHERE (  t2.pid IN (SELECT t1.product_id FROM orders t1  ORDER BY t1.oid ASC LIMIT 1 OFFSET 0 )  )";
+        let expected = "SELECT t2.\"pid\", t2.\"name\" FROM Products t2 WHERE (  t2.\"pid\" IN (SELECT t1.\"product_id\" FROM orders t1  ORDER BY t1.\"oid\" ASC LIMIT 1 OFFSET 0 )  )";
         assert_eq!(expected, sql);
     })
 }
@@ -64,15 +64,15 @@ fn exist_in_mapping_query_source_many() {
             .to_sql(Syntax::Sqlite);
         assert_eq!(
             q1,
-            "SELECT t2.\"oid\", t2.\"product_id\" FROM orders t2 WHERE ( EXISTS ( SELECT pid FROM Products t1 WHERE t1.pid = t2.product_id ) )"
+            "SELECT t2.\"oid\", t2.\"product_id\" FROM orders t2 WHERE ( EXISTS ( SELECT \"pid\" FROM Products t1 WHERE t1.\"pid\" = t2.\"product_id\" ) )"
         );
         let q2 = Product2::all()
             .limit(1)
             .map_query(|o| o.orders)
             .to_sql(Syntax::Sqlite);
         assert_eq!(
             q2,
-            "SELECT t2.\"oid\", t2.\"product_id\" FROM orders t2 WHERE (  t2.product_id IN (SELECT t1.pid FROM Products t1  ORDER BY 1 LIMIT 1 OFFSET 0 )  )"
+            "SELECT t2.\"oid\", t2.\"product_id\" FROM orders t2 WHERE (  t2.\"product_id\" IN (SELECT t1.\"pid\" FROM Products t1  ORDER BY 1 LIMIT 1 OFFSET 0 )  )"
         );
     })
 }
@@ -86,7 +86,7 @@ fn exist_in_sub_query_source_belongs() {
             .to_sql(Syntax::Sqlite);
         assert_eq!(
             q1,
-            "SELECT t1.\"pid\", t1.\"name\" FROM Products t1 WHERE ( EXISTS ( SELECT product_id FROM orders t2 WHERE t2.product_id = t1.pid ) )"
+            "SELECT t1.\"pid\", t1.\"name\" FROM Products t1 WHERE ( EXISTS ( SELECT \"product_id\" FROM orders t2 WHERE t2.\"product_id\" = t1.\"pid\" ) )"
         );
 
         let sub2 = Order2::all().limit(1);
@@ -95,7 +95,7 @@ fn exist_in_sub_query_source_belongs() {
             .to_sql(Syntax::Sqlite);
         assert_eq!(
             q2,
-            "SELECT t1.\"pid\", t1.\"name\" FROM Products t1 WHERE (  t1.pid IN (SELECT t2.product_id FROM orders t2  ORDER BY 1 LIMIT 1 OFFSET 0 )  )"
+            "SELECT t1.\"pid\", t1.\"name\" FROM Products t1 WHERE (  t1.\"pid\" IN (SELECT t2.\"product_id\" FROM orders t2  ORDER BY 1 LIMIT 1 OFFSET 0 )  )"
         );
     })
 }
@@ -109,7 +109,7 @@ fn exist_in_sub_query_source_many() {
             .to_sql(Syntax::Sqlite);
         assert_eq!(
             q1,
-            "SELECT t1.\"oid\", t1.\"product_id\" FROM orders t1 WHERE ( EXISTS ( SELECT pid FROM Products t2 WHERE t2.pid = t1.product_id ) )"
+            "SELECT t1.\"oid\", t1.\"product_id\" FROM orders t1 WHERE ( EXISTS ( SELECT \"pid\" FROM Products t2 WHERE t2.\"pid\" = t1.\"product_id\" ) )"
         );
 
         let sub2 = Product2::all().limit(1);
@@ -118,7 +118,7 @@ fn exist_in_sub_query_source_many() {
             .to_sql(Syntax::Sqlite);
         assert_eq!(
             q2,
-            "SELECT t1.\"oid\", t1.\"product_id\" FROM orders t1 WHERE (  t1.product_id IN (SELECT t2.pid FROM Products t2  ORDER BY 1 LIMIT 1 OFFSET 0 )  )"
+            "SELECT t1.\"oid\", t1.\"product_id\" FROM orders t1 WHERE (  t1.\"product_id\" IN (SELECT t2.\"pid\" FROM Products t2  ORDER BY 1 LIMIT 1 OFFSET 0 )  )"
         );
     })
 }
@@ -136,7 +136,7 @@ fn three_levels_down() {
 
         assert_eq!(
             q,
-            "SELECT t3.\"pid\", t3.\"name\" FROM Products t3 WHERE ( t3.pid = ? AND EXISTS ( SELECT product_id FROM orders t2 WHERE t2.oid = ? AND t2.product_id = t3.pid AND EXISTS ( SELECT pid FROM Products t1 WHERE t1.pid = ? AND t1.pid = t2.product_id ) ) )"
+            "SELECT t3.\"pid\", t3.\"name\" FROM Products t3 WHERE ( t3.\"pid\" = ? AND EXISTS ( SELECT \"product_id\" FROM orders t2 WHERE t2.\"oid\" = ? AND t2.\"product_id\" = t3.\"pid\" AND EXISTS ( SELECT \"pid\" FROM Products t1 WHERE t1.\"pid\" = ? AND t1.\"pid\" = t2.\"product_id\" ) ) )"
         );
     })
 }

tests/sqlite_sync/tests/bulk_delete/mod.rs

@@ -31,7 +31,7 @@ fn delete_from_with_where() {
     let q = Order2::all()
         .where_col(|x| x.oid.equal(1))
         .delete_sql(Syntax::Sqlite);
-    assert_eq!(q, "DELETE FROM orders WHERE ( orders.oid = ? )");
+    assert_eq!(q, "DELETE FROM orders WHERE ( orders.\"oid\" = ? )");
 }
 
 #[test]
@@ -42,7 +42,7 @@ fn should_be_able_to_delete_with_limit() {
         .delete_sql(Syntax::Sqlite);
     assert_eq!(
             q,
-            "DELETE FROM orders WHERE (  orders.oid IN (SELECT t1.\"oid\" FROM orders t1 ORDER BY t1.oid ASC LIMIT 3 OFFSET 0 )  )"
+            "DELETE FROM orders WHERE (  orders.\"oid\" IN (SELECT t1.\"oid\" FROM orders t1 ORDER BY t1.\"oid\" ASC LIMIT 3 OFFSET 0 )  )"
         );
 }
 
@@ -53,7 +53,7 @@ fn should_be_able_to_delete_with_existsin() {
         .delete_sql(Syntax::Sqlite);
     assert_eq!(
             q,
-            "DELETE FROM orders WHERE ( EXISTS ( SELECT pid FROM Products t1 WHERE t1.pid > ? AND t1.pid = orders.product_id ) )"
+            "DELETE FROM orders WHERE ( EXISTS ( SELECT \"pid\" FROM Products t1 WHERE t1.\"pid\" > ? AND t1.\"pid\" = orders.\"product_id\" ) )"
         );
 }
 
@@ -65,6 +65,6 @@ fn should_be_able_to_delete_with_wherein_with_limit() {
         .delete_sql(Syntax::Sqlite);
     assert_eq!(
             q,
-            "DELETE FROM orders WHERE (  orders.product_id IN (SELECT t1.pid FROM Products t1 WHERE t1.pid > ? ORDER BY 1 LIMIT 1 OFFSET 0 )  )"
+            "DELETE FROM orders WHERE (  orders.\"product_id\" IN (SELECT t1.\"pid\" FROM Products t1 WHERE t1.\"pid\" > ? ORDER BY 1 LIMIT 1 OFFSET 0 )  )"
         );
 }

tests/sqlite_sync/tests/bulk_update/mod.rs

@@ -34,7 +34,7 @@ fn should_be_able_to_update_table_with_where() {
         .to_sql(Syntax::Sqlite);
     assert_eq!(
         q,
-        "UPDATE Products SET \"name\"=? WHERE ( Products.pid = ? )"
+        "UPDATE Products SET \"name\"=? WHERE ( Products.\"pid\" = ? )"
     );
 }
 
@@ -46,7 +46,7 @@ fn should_be_able_to_update_table_with_where_exists_from_map_query() {
         .to_sql(Syntax::Sqlite);
     assert_eq!(
             q,
-            "UPDATE Products SET \"name\"=? WHERE ( EXISTS ( SELECT product_id FROM orders t1 WHERE t1.oid = ? AND t1.product_id = Products.pid ) )"
+            "UPDATE Products SET \"name\"=? WHERE ( EXISTS ( SELECT \"product_id\" FROM orders t1 WHERE t1.\"oid\" = ? AND t1.\"product_id\" = Products.\"pid\" ) )"
         );
 }
 
@@ -59,7 +59,7 @@ fn should_be_able_to_update_table_with_where_in_from_map_query_with_limit() {
         .to_sql(Syntax::Sqlite);
     assert_eq!(
             q,
-            "UPDATE Products SET \"name\"=? WHERE (  Products.pid IN (SELECT t1.product_id FROM orders t1 WHERE t1.oid = ? ORDER BY 1 LIMIT 1 OFFSET 0 )  )"
+            "UPDATE Products SET \"name\"=? WHERE (  Products.\"pid\" IN (SELECT t1.\"product_id\" FROM orders t1 WHERE t1.\"oid\" = ? ORDER BY 1 LIMIT 1 OFFSET 0 )  )"
         );
 }
 
@@ -71,6 +71,6 @@ fn should_be_able_to_update_with_just_limit() {
         .to_sql(Syntax::Sqlite);
     assert_eq!(
             q,
-            "UPDATE Products SET \"name\"=? WHERE (  Products.pid IN (SELECT t1.\"pid\" FROM Products t1 ORDER BY 1 LIMIT 1 OFFSET 0 )  )"
+            "UPDATE Products SET \"name\"=? WHERE (  Products.\"pid\" IN (SELECT t1.\"pid\" FROM Products t1 ORDER BY 1 LIMIT 1 OFFSET 0 )  )"
         );
 }

tests/sqlite_sync/tests/select_col/mod.rs

@@ -82,7 +82,7 @@ fn should_be_able_to_select_join_with_where() {
         .to_sql(Syntax::Sqlite);
     assert_eq!(
             q,
-            "SELECT t1.\"oid\", t2.\"pid\" FROM orders t1 JOIN Products t2 ON t1.\"product_id\" = t2.\"pid\" WHERE ( t1.oid = ? )"
+            "SELECT t1.\"oid\", t2.\"pid\" FROM orders t1 JOIN Products t2 ON t1.\"product_id\" = t2.\"pid\" WHERE ( t1.\"oid\" = ? )"
         );
 }
 
@@ -97,7 +97,7 @@ fn should_be_able_to_select_where_in_join() {
         .to_sql(Syntax::Sqlite);
     assert_eq!(
             q,
-            "SELECT t1.\"oid\", t2.\"pid\" FROM orders t1 JOIN Products t2 ON t1.\"product_id\" = t2.\"pid\" WHERE ( t2.pid = ? )"
+            "SELECT t1.\"oid\", t2.\"pid\" FROM orders t1 JOIN Products t2 ON t1.\"product_id\" = t2.\"pid\" WHERE ( t2.\"pid\" = ? )"
         );
 }
 

tests/sqlite_sync/tests/sub_query_tests/mod.rs

@@ -29,15 +29,15 @@ fn exist_in_mapping_query_source_belongs() {
         .to_sql(Syntax::Sqlite);
     assert_eq!(
             q1,
-            "SELECT t2.\"pid\", t2.\"name\" FROM Products t2 WHERE ( EXISTS ( SELECT product_id FROM orders t1 WHERE t1.product_id = t2.pid ) )"
+            "SELECT t2.\"pid\", t2.\"name\" FROM Products t2 WHERE ( EXISTS ( SELECT \"product_id\" FROM orders t1 WHERE t1.\"product_id\" = t2.\"pid\" ) )"
         );
     let q2 = Order2::all()
         .limit(1)
         .map_query(|o| o.product)
         .to_sql(Syntax::Sqlite);
     assert_eq!(
             q2,
-            "SELECT t2.\"pid\", t2.\"name\" FROM Products t2 WHERE (  t2.pid IN (SELECT t1.product_id FROM orders t1  ORDER BY 1 LIMIT 1 OFFSET 0 )  )"
+            "SELECT t2.\"pid\", t2.\"name\" FROM Products t2 WHERE (  t2.\"pid\" IN (SELECT t1.\"product_id\" FROM orders t1  ORDER BY 1 LIMIT 1 OFFSET 0 )  )"
         );
 }
 
@@ -48,7 +48,7 @@ fn should_be_able_to_join_limit_and_order_all_at_once() {
         .order_by_asc(|o| o.oid)
         .map_query(|o| o.product)
         .to_sql(Syntax::Sqlite);
-    let expected = "SELECT t2.\"pid\", t2.\"name\" FROM Products t2 WHERE (  t2.pid IN (SELECT t1.product_id FROM orders t1  ORDER BY t1.oid ASC LIMIT 1 OFFSET 0 )  )";
+    let expected = "SELECT t2.\"pid\", t2.\"name\" FROM Products t2 WHERE (  t2.\"pid\" IN (SELECT t1.\"product_id\" FROM orders t1  ORDER BY t1.\"oid\" ASC LIMIT 1 OFFSET 0 )  )";
     assert_eq!(expected, sql);
 }
 
@@ -59,15 +59,15 @@ fn exist_in_mapping_query_source_many() {
         .to_sql(Syntax::Sqlite);
     assert_eq!(
             q1,
-            "SELECT t2.\"oid\", t2.\"product_id\" FROM orders t2 WHERE ( EXISTS ( SELECT pid FROM Products t1 WHERE t1.pid = t2.product_id ) )"
+            "SELECT t2.\"oid\", t2.\"product_id\" FROM orders t2 WHERE ( EXISTS ( SELECT \"pid\" FROM Products t1 WHERE t1.\"pid\" = t2.\"product_id\" ) )"
         );
     let q2 = Product2::all()
         .limit(1)
         .map_query(|o| o.orders)
         .to_sql(Syntax::Sqlite);
     assert_eq!(
             q2,
-            "SELECT t2.\"oid\", t2.\"product_id\" FROM orders t2 WHERE (  t2.product_id IN (SELECT t1.pid FROM Products t1  ORDER BY 1 LIMIT 1 OFFSET 0 )  )"
+            "SELECT t2.\"oid\", t2.\"product_id\" FROM orders t2 WHERE (  t2.\"product_id\" IN (SELECT t1.\"pid\" FROM Products t1  ORDER BY 1 LIMIT 1 OFFSET 0 )  )"
         );
 }
 
@@ -79,7 +79,7 @@ fn exist_in_sub_query_source_belongs() {
         .to_sql(Syntax::Sqlite);
     assert_eq!(
             q1,
-            "SELECT t1.\"pid\", t1.\"name\" FROM Products t1 WHERE ( EXISTS ( SELECT product_id FROM orders t2 WHERE t2.product_id = t1.pid ) )"
+            "SELECT t1.\"pid\", t1.\"name\" FROM Products t1 WHERE ( EXISTS ( SELECT \"product_id\" FROM orders t2 WHERE t2.\"product_id\" = t1.\"pid\" ) )"
         );
 
     let sub2 = Order2::all().limit(1);
@@ -88,7 +88,7 @@ fn exist_in_sub_query_source_belongs() {
         .to_sql(Syntax::Sqlite);
     assert_eq!(
             q2,
-            "SELECT t1.\"pid\", t1.\"name\" FROM Products t1 WHERE (  t1.pid IN (SELECT t2.product_id FROM orders t2  ORDER BY 1 LIMIT 1 OFFSET 0 )  )"
+            "SELECT t1.\"pid\", t1.\"name\" FROM Products t1 WHERE (  t1.\"pid\" IN (SELECT t2.\"product_id\" FROM orders t2  ORDER BY 1 LIMIT 1 OFFSET 0 )  )"
         );
 }
 
@@ -100,7 +100,7 @@ fn exist_in_sub_query_source_many() {
         .to_sql(Syntax::Sqlite);
     assert_eq!(
             q1,
-            "SELECT t1.\"oid\", t1.\"product_id\" FROM orders t1 WHERE ( EXISTS ( SELECT pid FROM Products t2 WHERE t2.pid = t1.product_id ) )"
+            "SELECT t1.\"oid\", t1.\"product_id\" FROM orders t1 WHERE ( EXISTS ( SELECT \"pid\" FROM Products t2 WHERE t2.\"pid\" = t1.\"product_id\" ) )"
         );
 
     let sub2 = Product2::all().limit(1);
@@ -109,7 +109,7 @@ fn exist_in_sub_query_source_many() {
         .to_sql(Syntax::Sqlite);
     assert_eq!(
             q2,
-            "SELECT t1.\"oid\", t1.\"product_id\" FROM orders t1 WHERE (  t1.product_id IN (SELECT t2.pid FROM Products t2  ORDER BY 1 LIMIT 1 OFFSET 0 )  )"
+            "SELECT t1.\"oid\", t1.\"product_id\" FROM orders t1 WHERE (  t1.\"product_id\" IN (SELECT t2.\"pid\" FROM Products t2  ORDER BY 1 LIMIT 1 OFFSET 0 )  )"
         );
 }
 
@@ -125,7 +125,7 @@ fn three_levels_down() {
 
     assert_eq!(
             q,
-            "SELECT t3.\"pid\", t3.\"name\" FROM Products t3 WHERE ( t3.pid = ? AND EXISTS ( SELECT product_id FROM orders t2 WHERE t2.oid = ? AND t2.product_id = t3.pid AND EXISTS ( SELECT pid FROM Products t1 WHERE t1.pid = ? AND t1.pid = t2.product_id ) ) )"
+            "SELECT t3.\"pid\", t3.\"name\" FROM Products t3 WHERE ( t3.\"pid\" = ? AND EXISTS ( SELECT \"product_id\" FROM orders t2 WHERE t2.\"oid\" = ? AND t2.\"product_id\" = t3.\"pid\" AND EXISTS ( SELECT \"pid\" FROM Products t1 WHERE t1.\"pid\" = ? AND t1.\"pid\" = t2.\"product_id\" ) ) )"
         );
 }