Fix/760

src/masoniteorm/commands/MigrateRefreshCommand.py

@@ -23,7 +23,7 @@ def handle(self):
             connection=self.option("connection"),
             migration_directory=self.option("directory"),
             config_path=self.option("config"),
-            schema=self.option("schema")
+            schema=self.option("schema"),
         )
 
         migration.refresh(self.option("migration"))

src/masoniteorm/commands/stubs/table_migration.stub

@@ -15,4 +15,5 @@ class __MIGRATION_NAME__(Migration):
         """
         Revert the migrations.
         """
-        pass
+        with self.schema.table("__TABLE_NAME__") as table:
+            pass

src/masoniteorm/connections/ConnectionResolver.py

@@ -112,7 +112,9 @@ def get_schema_builder(self, connection="default", schema=None):
         from ..schema import Schema
 
         return Schema(
-            connection=connection, connection_details=self.get_connection_details(), schema=schema
+            connection=connection,
+            connection_details=self.get_connection_details(),
+            schema=schema,
         )
 
     def get_query_builder(self, connection="default"):

src/masoniteorm/migrations/Migration.py

@@ -34,7 +34,10 @@ def __init__(
         DATABASES = DB.get_connection_details()
 
         self.schema = Schema(
-            connection=connection, connection_details=DATABASES, dry=dry, schema=self.schema_name
+            connection=connection,
+            connection_details=DATABASES,
+            dry=dry,
+            schema=self.schema_name,
         )
 
         self.migration_model = MigrationModel.on(self.connection)
@@ -137,7 +140,9 @@ def migrate(self, migration="all", output=False):
                     f"<comment>Migrating:</comment> <question>{migration}</question>"
                 )
 
-            migration_class = migration_class(connection=self.connection, schema=self.schema_name)
+            migration_class = migration_class(
+                connection=self.connection, schema=self.schema_name
+            )
 
             if output:
                 migration_class.schema.dry()
@@ -187,7 +192,9 @@ def rollback(self, migration="all", output=False):
                 self.command_class.line(f"<error>Not Found: {migration}</error>")
                 continue
 
-            migration_class = migration_class(connection=self.connection, schema=self.schema_name)
+            migration_class = migration_class(
+                connection=self.connection, schema=self.schema_name
+            )
 
             if output:
                 migration_class.schema.dry()
@@ -237,9 +244,7 @@ def reset(self, migration="all"):
 
         if not len(migrations):
             if self.command_class:
-                self.command_class.line(
-                    "<info>Nothing to reset</info>"
-                )
+                self.command_class.line("<info>Nothing to reset</info>")
             else:
                 print("Nothing to reset")
 
@@ -250,7 +255,9 @@ def reset(self, migration="all"):
                 )
 
             try:
-                self.locate(migration)(connection=self.connection, schema=self.schema_name).down()
+                self.locate(migration)(
+                    connection=self.connection, schema=self.schema_name
+                ).down()
             except TypeError:
                 self.command_class.line(f"<error>Not Found: {migration}</error>")
                 continue

src/masoniteorm/models/Model.py

@@ -1000,7 +1000,7 @@ def detach_many(self, relation, relating_records):
             else:
                 related_record.save()
 
-            related.detach_related(self, related_record)
+            related.detach(self, related_record)
 
     def related(self, relation):
         related = getattr(self.__class__, relation)

src/masoniteorm/query/QueryBuilder.py

@@ -1405,7 +1405,7 @@ def update(self, updates: dict, dry=False, force=False):
         if model and not model.__force_update__ and not force:
             changes = {}
             for attribute, value in updates.items():
-                if model.__original_attributes__.get(attribute, None) != value:
+                if model.__original_attributes__.get(attribute, None) != value or value is None:
                     changes.update({attribute: value})
             updates = changes
 

src/masoniteorm/relationships/BaseRelationship.py

@@ -139,8 +139,8 @@ def get_with_count_query(self, builder, callback):
         return return_query
 
     def attach(self, current_model, related_record):
-        return current_model.update(
-            {self.local_key: getattr(related_record, self.foreign_key)}
+        return related_record.update(
+            {self.foreign_key: getattr(current_model, self.local_key)}
         )
 
     def get_related(self, query, relation, eagers=None, callback=None):
@@ -183,9 +183,7 @@ def relate(self, related_record):
         )
 
     def detach(self, current_model, related_record):
-        return current_model.where(
-            {self.local_key: getattr(related_record, self.foreign_key)}
-        ).delete()
+        return related_record.update({self.foreign_key: None})
 
     def attach_related(self, current_model, related_record):
         return related_record.update(

src/masoniteorm/relationships/BelongsToMany.py

@@ -552,7 +552,7 @@ def detach(self, current_model, related_record):
             .table(self._table)
             .without_global_scopes()
             .where(data)
-            .delete()
+            .update({self.foreign_key: None, self.local_key: None})
         )
 
     def attach_related(self, current_model, related_record):

src/masoniteorm/schema/Schema.py

@@ -205,9 +205,11 @@ def new_connection(self):
         if self._dry:
             return
 
-        self._connection = self.connection_class(
-            **self.get_connection_information()
-        ).set_schema(self.schema).make_connection()
+        self._connection = (
+            self.connection_class(**self.get_connection_information())
+            .set_schema(self.schema)
+            .make_connection()
+        )
 
         return self._connection
 

tests/mysql/relationships/test_relationships.py

@@ -75,7 +75,9 @@ def test_relationship_where_has(self):
     def test_relationship_where_has_nested(self):
         sql = (
             User.where("name", "Joe")
-            .where_has("profile.identification", lambda q: q.where("identification_id", 1))
+            .where_has(
+                "profile.identification", lambda q: q.where("identification_id", 1)
+            )
             .to_sql()
         )