Changeset 3447

Timestamp:

07/25/06 13:37:05 (2 years ago)

Author:

jpellerin

Message:

[multi-db] Added check in model validation for models related to other
models using a different connection. Removed special-case stringifying
of _default connection.

Files:

• django/branches/multiple-db-support/django/core/management.py (modified) (4 diffs)

django/branches/multiple-db-support/django/core/management.py

@@ -263 +263 @@
-            if not statements:
-                continue
-            if connection_name is _default:
-                connection_name = '(default)'
-            final_output.append(' -- The following statements are for connection: %s' % connection_name)
-            if reverse:
@@ -682 +680 @@
-    Returns number of errors.
-    """
-
+, model_connection_name
-    from django.db.models.loading import get_app_errors
-    from django.db.models.fields.related import RelatedObject
@@ -693 +691 @@
-    for cls in models.get_models(app):
-        opts = cls._meta
-
+
+
-        # Do field-specific validation.
-        for f in opts.fields:
@@ -730 +729 @@
-                if f.rel.to not in models.get_models():
-                    e.add(opts, "'%s' has relation with model %s, which has not been installed" % (f.name, rel_opts.object_name))
+
+                rel_connection = model_connection_name(f.rel.to)
+                if rel_connection != connection_name:
+                    e.add(opts, "'%s' is configured to use connection '%s' but has relation with '%s', which is configured to use connection '%s'" % (cls.__name__, connection_name, f.rel.to.__name__, rel_connection))
-
-                rel_name = RelatedObject(f.rel.to, cls, f).get_accessor_name()