Merge pull request #362 from MasoniteFramework/fix/358

Fix/358

src/masoniteorm/collection/Collection.py

@@ -227,7 +227,7 @@ def merge(self, items):
         self._items += items
         return self
 
-    def pluck(self, value, key=None):
+    def pluck(self, value, key=None, keep_nulls=True):
         if key:
             attributes = {}
         else:
@@ -245,6 +245,9 @@ def pluck(self, value, key=None):
                 iterable = self.all().items()
 
             for k, v in iterable:
+                if keep_nulls is False and v is None:
+                    continue
+
                 if k == value:
                     if key:
                         attributes[self._data_get(item, key)] = self._data_get(

src/masoniteorm/relationships/BaseRelationship.py

@@ -8,6 +8,7 @@ def __init__(self, fn, local_key=None, foreign_key=None):
             self.foreign_key = local_key
         else:
             self.fn = fn
+            self.local_key = local_key
             self.foreign_key = foreign_key
 
     def __set_name__(self, cls, name):

src/masoniteorm/relationships/BelongsTo.py

@@ -35,7 +35,7 @@ def get_related(self, query, relation, eagers=()):
         if isinstance(relation, Collection):
             return builder.where_in(
                 f"{builder.get_table_name()}.{self.foreign_key}",
-                relation.pluck(self.local_key).unique(),
+                relation.pluck(self.local_key, keep_nulls=False).unique(),
             ).get()
         else:
             return builder.where(

src/masoniteorm/relationships/BelongsToMany.py

@@ -183,7 +183,8 @@ def get_related(self, query, relation, eagers=None):
 
         if isinstance(relation, Collection):
             final_result = result.where_in(
-                self.local_owner_key, relation.pluck(self.local_owner_key)
+                self.local_owner_key,
+                relation.pluck(self.local_owner_key, keep_nulls=False),
             ).get()
         else:
             final_result = result.where(

src/masoniteorm/relationships/HasMany.py

@@ -27,7 +27,7 @@ def get_related(self, query, relation, eagers=None):
         if isinstance(relation, Collection):
             return builder.where_in(
                 f"{builder.get_table_name()}.{self.foreign_key}",
-                relation.pluck(self.local_key).unique(),
+                relation.pluck(self.local_key, keep_nulls=False).unique(),
             ).get()
         else:
             return builder.where(

src/masoniteorm/relationships/HasOne.py

@@ -7,10 +7,11 @@ class HasOne(BaseRelationship):
 
     def __init__(self, fn, foreign_key=None, local_key=None):
         if isinstance(fn, str):
-            self.local_key = fn
-            self.foreign_key = local_key
+            self.foreign_key = fn
+            self.local_key = foreign_key or "id"
         else:
             self.fn = fn
+            self.local_key = local_key or "id"
             self.foreign_key = foreign_key
 
     def apply_query(self, foreign, owner):
@@ -44,7 +45,7 @@ def get_related(self, query, relation, eagers=()):
         if isinstance(relation, Collection):
             return builder.where_in(
                 f"{builder.get_table_name()}.{self.foreign_key}",
-                relation.pluck(self.local_key).unique(),
+                relation.pluck(self.local_key, keep_nulls=False).unique(),
             ).get()
         else:
             return builder.where(

tests/mssql/grammar/test_mssql_update_grammar.py

@@ -30,9 +30,7 @@ def test_can_compile_update_with_multiple_where(self):
         self.assertEqual(to_sql, sql)
 
     def test_raw_expression(self):
-        to_sql = self.builder.update(
-            {"name": Raw("[username]")}, dry=True
-        ).to_sql()
+        to_sql = self.builder.update({"name": Raw("[username]")}, dry=True).to_sql()
 
         sql = "UPDATE [users] SET [users].[name] = [username]"
         self.assertEqual(to_sql, sql)

tests/mysql/grammar/test_mysql_update_grammar.py

@@ -60,9 +60,7 @@ def test_can_compile_decrement(self):
         self.assertEqual(to_sql, sql)
 
     def test_raw_expression(self):
-        to_sql = self.builder.update(
-            {"name": Raw("`username`")}, dry=True
-        ).to_sql()
+        to_sql = self.builder.update({"name": Raw("`username`")}, dry=True).to_sql()
 
         sql = getattr(
             self, inspect.currentframe().f_code.co_name.replace("test_", "")

tests/postgres/grammar/test_update_grammar.py

@@ -63,9 +63,7 @@ def test_can_compile_decrement(self):
         self.assertEqual(to_sql, sql)
 
     def test_raw_expression(self):
-        to_sql = self.builder.update(
-            {"name": Raw('"username"')}, dry=True
-        ).to_sql()
+        to_sql = self.builder.update({"name": Raw('"username"')}, dry=True).to_sql()
 
         sql = getattr(
             self, inspect.currentframe().f_code.co_name.replace("test_", "")

tests/sqlite/grammar/test_sqlite_update_grammar.py

@@ -60,9 +60,7 @@ def test_can_compile_decrement(self):
         self.assertEqual(to_sql, sql)
 
     def test_raw_expression(self):
-        to_sql = self.builder.update(
-            {"name": Raw('"username"')}, dry=True
-        ).to_sql()
+        to_sql = self.builder.update({"name": Raw('"username"')}, dry=True).to_sql()
 
         sql = getattr(
             self, inspect.currentframe().f_code.co_name.replace("test_", "")