Changeset 2381

Timestamp:

02/24/06 04:25:02 (3 years ago)

Author:

russellm

Message:

magic-removal: Refs #1346 -- Refactored query logic for m2m descriptor fields, and added logic to m2m name methods to allow m2m_recursive tests to create a valid SQL table.

Files:

• django/branches/magic-removal/django/db/models/fields/related.py (modified) (6 diffs)
• django/branches/magic-removal/django/db/models/query.py (modified) (1 diff)
• django/branches/magic-removal/django/db/models/related.py (modified) (1 diff)

django/branches/magic-removal/django/db/models/fields/related.py

@@ -47 +47 @@
-    def contribute_to_class(self, cls, name):
-        sup = super(RelatedField, self)
+
+        # Add an accessor to allow easy determination of the related query path for this field
+        self.related_query_name = curry(self._get_related_query_name, cls._meta)
+
-        if hasattr(sup, 'contribute_to_class'):
-            sup.contribute_to_class(cls, name)
@@ -66 +70 @@
-        related = RelatedObject(other, cls, self)
-        self.contribute_to_related_class(other, related)
+
+    def _get_related_query_name(self, opts):
+        # This method defines the name that can be used to identify this related object
+        # in a table-spanning query. It uses the lower-cased object_name by default,
+        # but this can be overridden with the "related_name" option.
+        return self.rel.related_name or opts.object_name.lower()
-
-class SingleRelatedObjectDescriptor(object):
@@ -242 +252 @@
-
-        if self.rel_type == 'o2m':
-%s__exact' % (rel_field.name, rel_field.rel.to._meta.pk.name)
-
-%s__exact' % (rel_field.name, instance_type._meta.pk.name)
+pk' % rel_field.name
+
+pk' % rel_field.name
-
-        manager.model = self.related.model
@@ -286 +296 @@
-                    params = [instance._get_pk_val()]
-                )
+                return superclass.get_query_set(self).filter(**(self.core_filters))
+
-            def add(self, *objs, **kwargs):
-                _add_m2m_items(self, superclass, rel_model, join_table, source_col_name,
@@ -301 +313 @@
-
-        manager = RelatedManager()
+        
+        manager.core_filters = {'%s__pk' % self.field.related_query_name() : instance._get_pk_val()}
+        
-        manager.model = rel_model
-
@@ -471 +486 @@
-    def _get_m2m_column_name(self, related):
-        "Function that can be curried to provide the source column name for the m2m table"
-
-
+
+
+
+
+
+
-    def _get_m2m_reverse_name(self, related):
-        "Function that can be curried to provide the related column name for the m2m table"
-
+
+
+
+
+
-
-    def isValidIDList(self, field_data, all_data):

django/branches/magic-removal/django/db/models/query.py

@@ -614 +614 @@
-    """
-    if related_query:
-get
+field.related
-    else:
-        matches = [f for f in field_list if f.name == name]

django/branches/magic-removal/django/db/models/related.py

@@ -75 +75 @@
-        # but this can be overridden with the "related_name" option.
-        return self.field.rel.related_name or (self.opts.object_name.lower() + '_set')
-
-    def get_query_name(self):
-        # This method defines the name that can be used to identify this related object
-        # in a table-spanning query. It uses the lower-cased object_name by default,
-        # but this can be overridden with the "related_name" option.
-        return self.field.rel.related_name or self.opts.object_name.lower()