Merge pull request #269 from MasoniteFramework/fix/268

fixing issue with updating scope

setup.py

@@ -6,7 +6,7 @@
     # Versions should comply with PEP440.  For a discussion on single-sourcing
     # the version across setup.py and the project code, see
     # https://packaging.python.org/en/latest/single_source_version.html
-    version='0.9.1',
+    version='0.9.2',
     package_dir={'': 'src'},
 
     description='The Official Masonite ORM',

src/masoniteorm/models/Model.py

@@ -225,7 +225,7 @@ def find(cls, record_id, query=False):
         if query:
             return builder.to_sql()
         else:
-            return builder.get()
+            return builder.first()
 
     def first_or_new(self):
         pass

src/masoniteorm/query/grammars/BaseGrammar.py

@@ -214,12 +214,12 @@ def _compile_key_value_equals(self, qmark=False):
                 sql += sql_string.format(
                     column=self._table_column_string(column),
                     value=value if not qmark else "?",
-                    separator=",",
+                    separator=", ",
                 )
                 if qmark:
                     self._bindings += (value,)
 
-            sql = sql.rstrip(", ")
+        sql = sql.rstrip(", ")
 
         return sql
 
@@ -394,7 +394,7 @@ def process_wheres(self, qmark=False, strip_first_where=False):
 
                 if not isinstance(where.bindings, (list, tuple)):
                     raise ValueError(
-                        f"Binings must be tuple or list. Received {type(where.bindings)}"
+                        f"Bindings must be tuple or list. Received {type(where.bindings)}"
                     )
 
                 if where.bindings:

src/masoniteorm/scopes/TimeStampsScope.py

@@ -1,5 +1,7 @@
 from .BaseScope import BaseScope
 
+from ..expressions.expressions import UpdateQueryExpression
+
 
 class TimeStampsScope(BaseScope):
     """Global scope class to add soft deleting to models."""
@@ -9,6 +11,10 @@ def on_boot(self, builder):
             "_timestamps", self.set_timestamp_create, action="insert"
         )
 
+        builder.set_global_scope(
+            "_timestamp_update", self.set_timestamp_update, action="update"
+        )
+
     def on_remove(self, builder):
         pass
 
@@ -18,9 +24,20 @@ def set_timestamp(owner_cls, query):
     def set_timestamp_create(self, builder):
         if not builder._model.__timestamps__:
             return builder
+
         builder._creates.update(
             {
                 "updated_at": builder._model.get_new_date().to_datetime_string(),
                 "created_at": builder._model.get_new_date().to_datetime_string(),
             }
         )
+
+    def set_timestamp_update(self, builder):
+        if not builder._model.__timestamps__:
+            return builder
+
+        builder._updates += (
+            UpdateQueryExpression(
+                {"updated_at": builder._model.get_new_date().to_datetime_string()}
+            ),
+        )

tests/mysql/builder/test_query_builder.py

@@ -15,6 +15,8 @@ class Articles(Model):
 
 
 class User(Model):
+    __timestamps__ = False
+
     @has_many("id", "user_id")
     def articles(self):
         return Articles

tests/postgres/builder/test_postgres_query_builder.py

@@ -20,6 +20,10 @@ def get_default_query_grammar(cls):
         return
 
 
+class ModelTest(Model):
+    __timestamps__ = False
+
+
 class BaseTestQueryBuilder:
     def get_builder(self, table="users"):
         connection = MockConnectionFactory().make("postgres")
@@ -28,7 +32,7 @@ def get_builder(self, table="users"):
             connection_class=connection,
             connection="postgres",
             table=table,
-            model=Model(),
+            model=ModelTest(),
         )
 
     def test_sum(self):