Refined tests

Updated on_value and on_null tests to prove that an 'on' (aka column comparison) is not actually required
MasoniteFramework · Aug 21, 2021 · ad97d58 · ad97d58
1 parent 00a2bec
commit ad97d58
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 10 deletions.
diff --git a/src/masoniteorm/testing/BaseTestCaseSelectGrammar.py b/src/masoniteorm/testing/BaseTestCaseSelectGrammar.py
@@ -293,7 +293,6 @@ def test_can_compile_join_clause(self):
     def test_can_compile_join_clause_with_value(self):
         clause = (
             JoinClause("report_groups as rg")
-            .on("bgt.fund", "=", "rg.fund")
             .on_value("bgt.active", "=", "1")
             .or_on_value("bgt.acct", "=", "1234")
         )
@@ -307,7 +306,6 @@ def test_can_compile_join_clause_with_value(self):
     def test_can_compile_join_clause_with_null(self):
         clause = (
             JoinClause("report_groups as rg")
-            .on("bgt.fund", "=", "rg.fund")
             .on_null("bgt.acct")
             .or_on_not_null("bgt.dept")
         )

diff --git a/tests/mssql/grammar/test_mssql_select_grammar.py b/tests/mssql/grammar/test_mssql_select_grammar.py
@@ -312,14 +312,14 @@ def can_compile_join_clause_with_value(self):
         builder = self.get_builder()
         builder.where("age", "not like", "%name%").to_sql()
         """
-        return "SELECT * FROM [users] INNER JOIN [report_groups] AS [rg] ON [bgt].[fund] = [rg].[fund] AND [bgt].[active] = '1' OR [bgt].[acct] = '1234'"
+        return "SELECT * FROM [users] INNER JOIN [report_groups] AS [rg] ON [bgt].[active] = '1' OR [bgt].[acct] = '1234'"
 
     def can_compile_join_clause_with_null(self):
         """
         builder = self.get_builder()
         builder.where("age", "not like", "%name%").to_sql()
         """
-        return "SELECT * FROM [users] INNER JOIN [report_groups] AS [rg] ON [bgt].[fund] = [rg].[fund] AND [acct] IS NULL OR [dept] IS NOT NULL"
+        return "SELECT * FROM [users] INNER JOIN [report_groups] AS [rg] ON [acct] IS NULL OR [dept] IS NOT NULL"
 
     def can_compile_join_clause_with_lambda(self):
         """

diff --git a/tests/mysql/grammar/test_mysql_select_grammar.py b/tests/mysql/grammar/test_mysql_select_grammar.py
@@ -306,14 +306,14 @@ def can_compile_join_clause_with_value(self):
         builder = self.get_builder()
         builder.where("age", "not like", "%name%").to_sql()
         """
-        return "SELECT * FROM `users` INNER JOIN `report_groups` AS `rg` ON `bgt`.`fund` = `rg`.`fund` AND `bgt`.`active` = '1' OR `bgt`.`acct` = '1234'"
+        return "SELECT * FROM `users` INNER JOIN `report_groups` AS `rg` ON `bgt`.`active` = '1' OR `bgt`.`acct` = '1234'"
 
     def can_compile_join_clause_with_null(self):
         """
         builder = self.get_builder()
         builder.where("age", "not like", "%name%").to_sql()
         """
-        return "SELECT * FROM `users` INNER JOIN `report_groups` AS `rg` ON `bgt`.`fund` = `rg`.`fund` AND `acct` IS NULL OR `dept` IS NOT NULL"
+        return "SELECT * FROM `users` INNER JOIN `report_groups` AS `rg` ON `acct` IS NULL OR `dept` IS NOT NULL"
 
     def can_compile_join_clause_with_lambda(self):
         """

diff --git a/tests/postgres/grammar/test_select_grammar.py b/tests/postgres/grammar/test_select_grammar.py
@@ -308,14 +308,14 @@ def can_compile_join_clause_with_value(self):
         builder = self.get_builder()
         builder.where("age", "not like", "%name%").to_sql()
         """
-        return """SELECT * FROM "users" INNER JOIN "report_groups" AS "rg" ON "bgt"."fund" = "rg"."fund" AND "bgt"."active" = '1' OR "bgt"."acct" = '1234'"""
+        return """SELECT * FROM "users" INNER JOIN "report_groups" AS "rg" ON "bgt"."active" = '1' OR "bgt"."acct" = '1234'"""
 
     def can_compile_join_clause_with_null(self):
         """
         builder = self.get_builder()
         builder.where("age", "not like", "%name%").to_sql()
         """
-        return """SELECT * FROM "users" INNER JOIN "report_groups" AS "rg" ON "bgt"."fund" = "rg"."fund" AND "acct" IS NULL OR "dept" IS NOT NULL"""
+        return """SELECT * FROM "users" INNER JOIN "report_groups" AS "rg" ON "acct" IS NULL OR "dept" IS NOT NULL"""
 
     def can_compile_join_clause_with_lambda(self):
         """

diff --git a/tests/sqlite/grammar/test_sqlite_select_grammar.py b/tests/sqlite/grammar/test_sqlite_select_grammar.py
@@ -308,14 +308,14 @@ def can_compile_join_clause_with_value(self):
         builder = self.get_builder()
         builder.where("age", "not like", "%name%").to_sql()
         """
-        return """SELECT * FROM "users" INNER JOIN "report_groups" AS "rg" ON "bgt"."fund" = "rg"."fund" AND "bgt"."active" = '1' OR "bgt"."acct" = '1234'"""
+        return """SELECT * FROM "users" INNER JOIN "report_groups" AS "rg" ON "bgt"."active" = '1' OR "bgt"."acct" = '1234'"""
 
     def can_compile_join_clause_with_null(self):
         """
         builder = self.get_builder()
         builder.where("age", "not like", "%name%").to_sql()
         """
-        return """SELECT * FROM "users" INNER JOIN "report_groups" AS "rg" ON "bgt"."fund" = "rg"."fund" AND "acct" IS NULL OR "dept" IS NOT NULL"""
+        return """SELECT * FROM "users" INNER JOIN "report_groups" AS "rg" ON "acct" IS NULL OR "dept" IS NOT NULL"""
 
     def can_compile_join_clause_with_lambda(self):
         """