Merge pull request #825 from maicol07/2.0

fix: Belongs to many - Table can't be without an underscore
MasoniteFramework · Nov 7, 2022 · 325ec29 · 325ec29
2 parents c91da8d + 8c87f48
commit 325ec29
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/masoniteorm/relationships/BelongsToMany.py b/src/masoniteorm/relationships/BelongsToMany.py
@@ -67,7 +67,7 @@ def apply_query(self, query, owner):
             self._table = "_".join(pivot_tables)
             self.foreign_key = self.foreign_key or f"{pivot_table_1}_id"
             self.local_key = self.local_key or f"{pivot_table_2}_id"
-        else:
+        elif self.local_key is None or self.foreign_key is None:
             pivot_table_1, pivot_table_2 = self._table.split("_", 1)
             self.foreign_key = self.foreign_key or f"{pivot_table_1}_id"
             self.local_key = self.local_key or f"{pivot_table_2}_id"
@@ -185,7 +185,7 @@ def make_query(self, query, relation, eagers=None, callback=None):
             self._table = "_".join(pivot_tables)
             self.foreign_key = self.foreign_key or f"{pivot_table_1}_id"
             self.local_key = self.local_key or f"{pivot_table_2}_id"
-        else:
+        elif self.local_key is None or self.foreign_key is None:
             pivot_table_1, pivot_table_2 = self._table.split("_", 1)
             self.foreign_key = self.foreign_key or f"{pivot_table_1}_id"
             self.local_key = self.local_key or f"{pivot_table_2}_id"
@@ -302,7 +302,7 @@ def relate(self, related_record):
             self._table = "_".join(pivot_tables)
             self.foreign_key = self.foreign_key or f"{pivot_table_1}_id"
             self.local_key = self.local_key or f"{pivot_table_2}_id"
-        else:
+        elif self.local_key is None or self.foreign_key is None:
             pivot_table_1, pivot_table_2 = self._table.split("_", 1)
             self.foreign_key = self.foreign_key or f"{pivot_table_1}_id"
             self.local_key = self.local_key or f"{pivot_table_2}_id"
@@ -368,7 +368,7 @@ def joins(self, builder, clause=None):
             self._table = "_".join(pivot_tables)
             self.foreign_key = self.foreign_key or f"{pivot_table_1}_id"
             self.local_key = self.local_key or f"{pivot_table_2}_id"
-        else:
+        elif self.local_key is None or self.foreign_key is None:
             pivot_table_1, pivot_table_2 = self._table.split("_", 1)
             self.foreign_key = self.foreign_key or f"{pivot_table_1}_id"
             self.local_key = self.local_key or f"{pivot_table_2}_id"