plain.models 0.33.1__py3-none-any.whl → 0.34.0__py3-none-any.whl

plain/models/migrations/operations/models.py

@@ -92,7 +92,7 @@ class CreateModel(ModelOperation):
 
     def database_forwards(self, package_label, schema_editor, from_state, to_state):
         model = to_state.models_registry.get_model(package_label, self.name)
-        if self.allow_migrate_model(schema_editor.connection.alias, model):
+        if self.allow_migrate_model(schema_editor.connection, model):
             schema_editor.create_model(model)
 
     def describe(self):
@@ -249,7 +249,7 @@ class DeleteModel(ModelOperation):
 
     def database_forwards(self, package_label, schema_editor, from_state, to_state):
         model = from_state.models_registry.get_model(package_label, self.name)
-        if self.allow_migrate_model(schema_editor.connection.alias, model):
+        if self.allow_migrate_model(schema_editor.connection, model):
             schema_editor.delete_model(model)
 
     def references_model(self, name, package_label):
@@ -293,7 +293,7 @@ class RenameModel(ModelOperation):
 
     def database_forwards(self, package_label, schema_editor, from_state, to_state):
         new_model = to_state.models_registry.get_model(package_label, self.new_name)
-        if self.allow_migrate_model(schema_editor.connection.alias, new_model):
+        if self.allow_migrate_model(schema_editor.connection, new_model):
             old_model = from_state.models_registry.get_model(
                 package_label, self.old_name
             )
@@ -384,7 +384,7 @@ class AlterModelTable(ModelOptionOperation):
 
     def database_forwards(self, package_label, schema_editor, from_state, to_state):
         new_model = to_state.models_registry.get_model(package_label, self.name)
-        if self.allow_migrate_model(schema_editor.connection.alias, new_model):
+        if self.allow_migrate_model(schema_editor.connection, new_model):
             old_model = from_state.models_registry.get_model(package_label, self.name)
             schema_editor.alter_db_table(
                 new_model,
@@ -422,7 +422,7 @@ class AlterModelTableComment(ModelOptionOperation):
 
     def database_forwards(self, package_label, schema_editor, from_state, to_state):
         new_model = to_state.models_registry.get_model(package_label, self.name)
-        if self.allow_migrate_model(schema_editor.connection.alias, new_model):
+        if self.allow_migrate_model(schema_editor.connection, new_model):
             old_model = from_state.models_registry.get_model(package_label, self.name)
             schema_editor.alter_db_table_comment(
                 new_model,
@@ -535,7 +535,7 @@ class AddIndex(IndexOperation):
 
     def database_forwards(self, package_label, schema_editor, from_state, to_state):
         model = to_state.models_registry.get_model(package_label, self.model_name)
-        if self.allow_migrate_model(schema_editor.connection.alias, model):
+        if self.allow_migrate_model(schema_editor.connection, model):
             schema_editor.add_index(model, self.index)
 
     def deconstruct(self):
@@ -579,7 +579,7 @@ class RemoveIndex(IndexOperation):
 
     def database_forwards(self, package_label, schema_editor, from_state, to_state):
         model = from_state.models_registry.get_model(package_label, self.model_name)
-        if self.allow_migrate_model(schema_editor.connection.alias, model):
+        if self.allow_migrate_model(schema_editor.connection, model):
             from_model_state = from_state.models[package_label, self.model_name_lower]
             index = from_model_state.get_index_by_name(self.name)
             schema_editor.remove_index(model, index)
@@ -654,7 +654,7 @@ class RenameIndex(IndexOperation):
 
     def database_forwards(self, package_label, schema_editor, from_state, to_state):
         model = to_state.models_registry.get_model(package_label, self.model_name)
-        if not self.allow_migrate_model(schema_editor.connection.alias, model):
+        if not self.allow_migrate_model(schema_editor.connection, model):
             return
 
         if self.old_fields:
@@ -740,7 +740,7 @@ class AddConstraint(IndexOperation):
 
     def database_forwards(self, package_label, schema_editor, from_state, to_state):
         model = to_state.models_registry.get_model(package_label, self.model_name)
-        if self.allow_migrate_model(schema_editor.connection.alias, model):
+        if self.allow_migrate_model(schema_editor.connection, model):
             schema_editor.add_constraint(model, self.constraint)
 
     def deconstruct(self):
@@ -773,7 +773,7 @@ class RemoveConstraint(IndexOperation):
 
     def database_forwards(self, package_label, schema_editor, from_state, to_state):
         model = to_state.models_registry.get_model(package_label, self.model_name)
-        if self.allow_migrate_model(schema_editor.connection.alias, model):
+        if self.allow_migrate_model(schema_editor.connection, model):
             from_model_state = from_state.models[package_label, self.model_name_lower]
             constraint = from_model_state.get_constraint_by_name(self.name)
             schema_editor.remove_constraint(model, constraint)

plain/models/migrations/operations/special.py

@@ -1,5 +1,3 @@
-from plain.models.db import router
-
 from .base import Operation
 
 
@@ -72,10 +70,7 @@ class RunSQL(Operation):
             state_operation.state_forwards(package_label, state)
 
     def database_forwards(self, package_label, schema_editor, from_state, to_state):
-        if router.allow_migrate(
-            schema_editor.connection.alias, package_label, **self.hints
-        ):
-            self._run_sql(schema_editor, self.sql)
+        self._run_sql(schema_editor, self.sql)
 
     def describe(self):
         return "Raw SQL operation"
@@ -132,14 +127,11 @@ class RunPython(Operation):
         # RunPython has access to all models. Ensure that all models are
         # reloaded in case any are delayed.
         from_state.clear_delayed_models_cache()
-        if router.allow_migrate(
-            schema_editor.connection.alias, package_label, **self.hints
-        ):
-            # We now execute the Python code in a context that contains a 'models'
-            # object, representing the versioned models as an app registry.
-            # We could try to override the global cache, but then people will still
-            # use direct imports, so we go with a documentation approach instead.
-            self.code(from_state.models_registry, schema_editor)
+        # We now execute the Python code in a context that contains a 'models'
+        # object, representing the versioned models as an app registry.
+        # We could try to override the global cache, but then people will still
+        # use direct imports, so we go with a documentation approach instead.
+        self.code(from_state.models_registry, schema_editor)
 
     def describe(self):
         return "Raw Python operation"

plain/models/migrations/recorder.py

@@ -53,7 +53,7 @@ class MigrationRecorder:
 
     @property
     def migration_qs(self):
-        return self.Migration.objects.using(self.connection.alias)
+        return self.Migration.objects.all()
 
     def has_table(self):
         """Return True if the plainmigrations table exists."""

plain/models/options.py

@@ -7,7 +7,7 @@ from functools import cached_property
 from plain.exceptions import FieldDoesNotExist
 from plain.models import models_registry
 from plain.models.constraints import UniqueConstraint
-from plain.models.db import DEFAULT_DB_ALIAS, connections
+from plain.models.db import db_connection
 from plain.models.fields import BigAutoField
 from plain.models.manager import Manager
 from plain.utils.datastructures import ImmutableList
@@ -105,7 +105,6 @@ class Options:
 
     def contribute_to_class(self, cls, name):
         from plain.models.backends.utils import truncate_name
-        from plain.models.db import connections
 
         cls._meta = self
         self.model = cls
@@ -155,7 +154,7 @@ class Options:
             self.db_table = f"{self.package_label}_{self.model_name}"
             self.db_table = truncate_name(
                 self.db_table,
-                connections[DEFAULT_DB_ALIAS].ops.max_name_length(),
+                db_connection.ops.max_name_length(),
             )
 
     def _format_names_with_class(self, cls, objs):
@@ -223,11 +222,9 @@ class Options:
 
     def can_migrate(self, connection):
         """
-        Return True if the model can/should be migrated on the `connection`.
-        `connection` can be either a real connection or a connection alias.
+        Return True if the model can/should be migrated on the given
+        `connection` object.
         """
-        if isinstance(connection, str):
-            connection = connections[connection]
         if self.required_db_vendor:
             return self.required_db_vendor == connection.vendor
         if self.required_db_features:

plain/models/preflight.py

@@ -5,21 +5,16 @@ from itertools import chain
 from plain.models.registry import models_registry
 from plain.packages import packages_registry
 from plain.preflight import Error, Warning, register_check
-from plain.runtime import settings
 
 
 @register_check
-def check_database_backends(databases=None, **kwargs):
-    if databases is None:
+def check_database_backends(database=False, **kwargs):
+    if not database:
         return []
 
-    from plain.models.db import connections
+    from plain.models.db import db_connection
 
-    issues = []
-    for alias in databases:
-        conn = connections[alias]
-        issues.extend(conn.validation.check(**kwargs))
-    return issues
+    return db_connection.validation.check(**kwargs)
 
 
 @register_check
@@ -51,24 +46,14 @@ def check_all_models(package_configs=None, **kwargs):
             indexes[model_index.name].append(model._meta.label)
         for model_constraint in model._meta.constraints:
             constraints[model_constraint.name].append(model._meta.label)
-    if settings.DATABASE_ROUTERS:
-        error_class, error_id = Warning, "models.W035"
-        error_hint = (
-            "You have configured settings.DATABASE_ROUTERS. Verify that %s "
-            "are correctly routed to separate databases."
-        )
-    else:
-        error_class, error_id = Error, "models.E028"
-        error_hint = None
     for db_table, model_labels in db_table_models.items():
         if len(model_labels) != 1:
             model_labels_str = ", ".join(model_labels)
             errors.append(
-                error_class(
+                Error(
                     f"db_table '{db_table}' is used by multiple models: {model_labels_str}.",
                     obj=db_table,
-                    hint=(error_hint % model_labels_str) if error_hint else None,
-                    id=error_id,
+                    id="models.E028",
                 )
             )
     for index_name, model_labels in indexes.items():
@@ -200,34 +185,30 @@ def check_lazy_references(package_configs=None, **kwargs):
 
 @register_check
 def check_database_tables(package_configs, **kwargs):
-    from plain.models.db import connections
+    from plain.models.db import db_connection
 
-    databases = kwargs.get("databases", None)
-    if not databases:
+    if not kwargs.get("database", False):
         return []
 
     errors = []
 
-    for database in databases:
-        conn = connections[database]
-        db_tables = conn.introspection.table_names()
-        model_tables = conn.introspection.plain_table_names()
-
-        unknown_tables = set(db_tables) - set(model_tables)
-        unknown_tables.discard("plainmigrations")  # Know this could be there
-        if unknown_tables:
-            table_names = ", ".join(unknown_tables)
-            specific_hint = f'echo "DROP TABLE IF EXISTS {unknown_tables.pop()}" | plain models db-shell'
-            errors.append(
-                Warning(
-                    f"Unknown tables in {database} database: {table_names}",
-                    hint=(
-                        "Tables may be from packages/models that have been uninstalled. "
-                        "Make sure you have a backup and delete the tables manually "
-                        f"(ex. `{specific_hint}`)."
-                    ),
-                    id="plain.models.W001",
-                )
+    db_tables = db_connection.introspection.table_names()
+    model_tables = db_connection.introspection.plain_table_names()
+    unknown_tables = set(db_tables) - set(model_tables)
+    unknown_tables.discard("plainmigrations")  # Know this could be there
+    if unknown_tables:
+        table_names = ", ".join(unknown_tables)
+        specific_hint = f'echo "DROP TABLE IF EXISTS {unknown_tables.pop()}" | plain models db-shell'
+        errors.append(
+            Warning(
+                f"Unknown tables in default database: {table_names}",
+                hint=(
+                    "Tables may be from packages/models that have been uninstalled. "
+                    "Make sure you have a backup and delete the tables manually "
+                    f"(ex. `{specific_hint}`)."
+                ),
+                id="plain.models.W001",
             )
+        )
 
     return errors