masonite-orm 2.22.0__tar.gz → 2.22.2__tar.gz

{masonite-orm-2.22.0/src/masonite_orm.egg-info → masonite-orm-2.22.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: masonite-orm
-Version: 2.22.0
+Version: 2.22.2
 Summary: The Official Masonite ORM
 Home-page: https://github.com/masoniteframework/orm
 Author: Joe Mancuso

{masonite-orm-2.22.0 → masonite-orm-2.22.2}/setup.py

@@ -8,7 +8,7 @@ setup(
     # 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="2.22.0",
+    version="2.22.2",
     package_dir={"": "src"},
     description="The Official Masonite ORM",
     long_description=long_description,

{masonite-orm-2.22.0 → masonite-orm-2.22.2/src/masonite_orm.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: masonite-orm
-Version: 2.22.0
+Version: 2.22.2
 Summary: The Official Masonite ORM
 Home-page: https://github.com/masoniteframework/orm
 Author: Joe Mancuso

{masonite-orm-2.22.0 → masonite-orm-2.22.2}/src/masoniteorm/connections/BaseConnection.py

@@ -76,3 +76,12 @@ class BaseConnection:
             yield result
 
             result = self.format_cursor_results(self._cursor.fetchmany(amount))
+
+    def enable_disable_foreign_keys(self):
+        foreign_keys = self.full_details.get("foreign_keys")
+        platform = self.get_default_platform()()
+
+        if foreign_keys:
+            self._connection.execute(platform.enable_foreign_key_constraints())
+        elif foreign_keys is not None:
+            self._connection.execute(platform.disable_foreign_key_constraints())

{masonite-orm-2.22.0 → masonite-orm-2.22.2}/src/masoniteorm/connections/MSSQLConnection.py

@@ -70,6 +70,8 @@ class MSSQLConnection(BaseConnection):
             autocommit=True,
         )
 
+        self.enable_disable_foreign_keys()
+
         self.open = 1
         return self
 

{masonite-orm-2.22.0 → masonite-orm-2.22.2}/src/masoniteorm/connections/MySQLConnection.py

@@ -78,6 +78,9 @@ class MySQLConnection(BaseConnection):
             db=self.database,
             **self.options
         )
+
+        self.enable_disable_foreign_keys()
+
         self.open = 1
 
         return self

{masonite-orm-2.22.0 → masonite-orm-2.22.2}/src/masoniteorm/connections/PostgresConnection.py

@@ -69,6 +69,8 @@ class PostgresConnection(BaseConnection):
 
         self._connection.autocommit = True
 
+        self.enable_disable_foreign_keys()
+
         self.open = 1
 
         return self

{masonite-orm-2.22.0 → masonite-orm-2.22.2}/src/masoniteorm/connections/SQLiteConnection.py

@@ -63,6 +63,9 @@ class SQLiteConnection(BaseConnection):
         self._connection.create_function("REGEXP", 2, regexp)
 
         self._connection.row_factory = sqlite3.Row
+
+        self.enable_disable_foreign_keys()
+
         self.open = 1
 
         return self

{masonite-orm-2.22.0 → masonite-orm-2.22.2}/src/masoniteorm/query/QueryBuilder.py

@@ -1957,7 +1957,7 @@ class QueryBuilder(ObservesEvents):
                 if isinstance(related_result, Collection):
                     related.register_related(relation_key, model, map_related)
                 else:
-                    model.add_relation({relation_key: related_result or None})
+                    model.add_relation({relation_key: map_related or None})
         else:
             hydrated_model.add_relation({relation_key: related_result or None})
         return self

{masonite-orm-2.22.0 → masonite-orm-2.22.2}/src/masoniteorm/relationships/BaseRelationship.py

@@ -52,7 +52,7 @@ class BaseRelationship:
             object -- Either returns a builder or a hydrated model.
         """
         attribute = self.fn.__name__
-        relationship = self.fn(self)()
+        relationship = self.fn(instance)()
         self.set_keys(instance, attribute)
         self._related_builder = relationship.builder
 

{masonite-orm-2.22.0 → masonite-orm-2.22.2}/src/masoniteorm/schema/platforms/MySQLPlatform.py

@@ -176,11 +176,16 @@ class MySQLPlatform(Platform):
                 else:
                     default = ""
 
+                column_constraint = ""
+                if column.column_type == "enum":
+                    values = ", ".join(f"'{x}'" for x in column.values)
+                    column_constraint = f"({values})"
                 add_columns.append(
                     self.add_column_string()
                     .format(
                         name=self.get_column_string().format(column=column.name),
                         data_type=self.type_map.get(column.column_type, ""),
+                        column_constraint=column_constraint,
                         length=length,
                         constraint="PRIMARY KEY" if column.primary else "",
                         nullable="NULL" if column.is_null else "NOT NULL",
@@ -333,14 +338,14 @@ class MySQLPlatform(Platform):
 
     def add_column_string(self):
         return (
-            "ADD {name} {data_type}{length}{signed} {nullable}{default}{after}{comment}"
+            "ADD {name} {data_type}{length}{column_constraint}{signed} {nullable}{default}{after}{comment}"
         )
 
     def drop_column_string(self):
         return "DROP COLUMN {name}"
 
     def change_column_string(self):
-        return "MODIFY {name}{data_type}{length} {nullable}{default} {constraint}"
+        return "MODIFY {name}{data_type}{length}{column_constraint} {nullable}{default} {constraint}"
 
     def rename_column_string(self):
         return "CHANGE {old} {to}"

{masonite-orm-2.22.0 → masonite-orm-2.22.2}/src/masoniteorm/schema/platforms/PostgresPlatform.py

@@ -194,6 +194,11 @@ class PostgresPlatform(Platform):
                 else:
                     default = ""
 
+                column_constraint = ""
+                if column.column_type == "enum":
+                    values = ", ".join(f"'{x}'" for x in column.values)
+                    column_constraint = f" CHECK({column.name} IN ({values}))"
+
                 add_columns.append(
                     self.add_column_string()
                     .format(
@@ -201,6 +206,7 @@ class PostgresPlatform(Platform):
                         data_type=self.type_map.get(column.column_type, ""),
                         length=length,
                         constraint="PRIMARY KEY" if column.primary else "",
+                        column_constraint=column_constraint,
                         nullable="NULL" if column.is_null else "NOT NULL",
                         default=default,
                         after=(" AFTER " + self.wrap_column(column._after))
@@ -263,12 +269,18 @@ class PostgresPlatform(Platform):
             changed_sql = []
 
             for name, column in table.changed_columns.items():
+
+                column_constraint = ""
+                if column.column_type == "enum":
+                    values = ", ".join(f"'{x}'" for x in column.values)
+                    column_constraint = f" CHECK({column.name} IN ({values}))"
                 changed_sql.append(
                     self.modify_column_string()
                     .format(
                         name=self.wrap_column(name),
                         data_type=self.type_map.get(column.column_type),
-                        nullable="NULL" if column.is_null else "NOT NULL",
+                        column_constraint=column_constraint,
+                        constraint="PRIMARY KEY" if column.primary else "",
                         length="(" + str(column.length) + ")"
                         if column.column_type not in self.types_without_lengths
                         else "",
@@ -380,13 +392,13 @@ class PostgresPlatform(Platform):
         return "ALTER TABLE {table} {columns}"
 
     def add_column_string(self):
-        return "ADD COLUMN {name} {data_type}{length} {nullable}{default} {constraint}"
+        return "ADD COLUMN {name} {data_type}{length}{column_constraint} {nullable}{default} {constraint}"
 
     def drop_column_string(self):
         return "DROP COLUMN {name}"
 
     def modify_column_string(self):
-        return "ALTER COLUMN {name} TYPE {data_type}{length}"
+        return "ALTER COLUMN {name} TYPE {data_type}{length}{column_constraint} {constraint}"
 
     def rename_column_string(self):
         return "RENAME COLUMN {old} TO {to}"

{masonite-orm-2.22.0 → masonite-orm-2.22.2}/src/masoniteorm/schema/platforms/SQLitePlatform.py

@@ -171,15 +171,21 @@ class SQLitePlatform(Platform):
                 else:
                     default = ""
                 constraint = ""
+                column_constraint = ""
                 if column.name in diff.added_foreign_keys:
                     foreign_key = diff.added_foreign_keys[column.name]
                     constraint = f" REFERENCES {self.wrap_table(foreign_key.foreign_table)}({self.wrap_column(foreign_key.foreign_column)})"
+                if column.column_type == "enum":
+                    values = ", ".join(f"'{x}'" for x in column.values)
+                    column_constraint = f" CHECK('{column.name}' IN({values}))"
 
                 sql.append(
-                    "ALTER TABLE {table} ADD COLUMN {name} {data_type}{signed} {nullable}{default}{constraint}".format(
+                    self.add_column_string()
+                    .format(
                         table=self.wrap_table(diff.name),
                         name=self.wrap_column(column.name),
                         data_type=self.type_map.get(column.column_type, ""),
+                        column_constraint=column_constraint,
                         nullable="NULL" if column.is_null else "NOT NULL",
                         default=default,
                         signed=" " + self.signed.get(column._signed)
@@ -291,6 +297,11 @@ class SQLitePlatform(Platform):
     def get_column_string(self):
         return '"{column}"'
 
+    def add_column_string(self):
+        return (
+            "ALTER TABLE {table} ADD COLUMN {name} {data_type}{column_constraint}{signed} {nullable}{default}{constraint}"
+        )
+
     def create_column_length(self, column_type):
         if column_type in self.types_without_lengths:
             return ""