Changeset 2383

Timestamp:

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

Author:

russellm

Message:

magic-removal: Fixes #1346 -- Added ability for m2m relations to self to be optionally non-symmetrical. Added unit tests for non-symmetrical behaviour.

Files:

• django/branches/magic-removal/django/db/models/fields/related.py (modified) (8 diffs)
• django/branches/magic-removal/tests/modeltests/m2m_recursive/models.py (modified) (3 diffs)

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

@@ -276 +276 @@
-        qn = backend.quote_name
-        this_opts = instance.__class__._meta
+        symmetrical = self.field.rel.symmetrical
-        rel_model = self.field.rel.to
-        rel_opts = rel_model._meta
@@ -302 +303 @@
-                    target_col_name, instance._get_pk_val(), *objs, **kwargs)
-
-n
-
+ symmmetrical
+ and symmetrical
-                    _add_m2m_items(self, superclass, rel_model, join_table, target_col_name,
-                        source_col_name, instance._get_pk_val(), *objs, **kwargs)                    
@@ -313 +314 @@
-                    target_col_name, instance._get_pk_val(), *objs)
-                    
-n
-
+ symmmetrical
+ and symmetrical
-                    _remove_m2m_items(rel_model, join_table, target_col_name,
-                        source_col_name, instance._get_pk_val(), *objs)
@@ -323 +324 @@
-                _clear_m2m_items(join_table, source_col_name, instance._get_pk_val())
-    
-n
-
+ symmmetrical
+ and symmetrical
-                    _clear_m2m_items(join_table, target_col_name, instance._get_pk_val())
-                
@@ -473 +474 @@
-            filter_interface=kwargs.pop('filter_interface', None),
-            limit_choices_to=kwargs.pop('limit_choices_to', None),
-
+
+
-        if kwargs["rel"].raw_id_admin:
-            kwargs.setdefault("validator_list", []).append(self.isValidIDList)
@@ -560 +562 @@
-
-    def contribute_to_related_class(self, cls, related):
-
-
+
+
+
+
+
+
-        self.rel.singular = self.rel.singular or self.rel.to._meta.object_name.lower()
-
@@ -602 +608 @@
-class ManyToMany:
-    def __init__(self, to, singular=None, related_name=None,
-
+, symmetrical=True
-        self.to = to
-        self.singular = singular or None
@@ -610 +616 @@
-        self.edit_inline = False
-        self.raw_id_admin = raw_id_admin
+        self.symmetrical = symmetrical
-        assert not (self.raw_id_admin and self.filter_interface), "ManyToMany relationships may not use both raw_id_admin and filter_interface"

django/branches/magic-removal/tests/modeltests/m2m_recursive/models.py

@@ -4 +4 @@
-In this example, A Person can have many friends, who are also people. Friendship is a 
-symmetrical relationshiup - if I am your friend, you are my friend.
+
+A person can also have many idols - but while I may idolize you, you may not think
+the same of me. 'Idols' is an example of a non-symmetrical m2m field. Only recursive 
+m2m fields may be non-symmetrical, and they are symmetrical by default.
-
-This test validates that the m2m table will create a mangled name for the m2m table if
@@ -14 +18 @@
-    name = models.CharField(maxlength=20)
-    friends = models.ManyToManyField('self')
+    idols = models.ManyToManyField('self', symmetrical=False, related_name='stalkers')
-
-    def __repr__(self):
@@ -90 +95 @@
-
-
+# Add some idols in the direction of field definition
+# Anne idolizes Bill and Chuck
+>>> a.idols.add(b,c)
+
+# Bill idolizes Anne right back
+>>> b.idols.add(a)
+
+# David is idolized by Anne and Chuck - add in reverse direction
+>>> d.stalkers.add(a,c)
+
+# Who are Anne's idols?
+>>> a.idols.all() 
+[Bill, Chuck, David]
+
+# Who is stalking Anne?
+>>> a.stalkers.all()
+[Bill]
+
+# Who are Bill's idols?
+>>> b.idols.all()
+[Anne]
+
+# Who is stalking Bill?
+>>> b.stalkers.all()
+[Anne]
+
+# Who are Chuck's idols?
+>>> c.idols.all()
+[David]
+
+# Who is stalking Chuck?
+>>> c.stalkers.all()
+[Anne]
+
+# Who are David's idols?
+>>> d.idols.all()
+[]
+
+# Who is stalking David
+>>> d.stalkers.all()
+[Anne, Chuck]
+
+# Bill is already being stalked by Anne - add Anne again, but in the reverse direction
+>>> b.stalkers.add(a)
+
+# Who are Anne's idols?
+>>> a.idols.all() 
+[Bill, Chuck, David]
+
+# Who is stalking Anne?
+[Bill]
+
+# Who are Bill's idols
+>>> b.idols.all()
+[Anne]
+
+# Who is stalking Bill?
+>>> b.stalkers.all()
+[Anne]
+
+# Remove Anne from Bill's list of stalkers
+>>> b.stalkers.remove(a)
+
+# Who are Anne's idols?
+>>> a.idols.all() 
+[Chuck, David]
+
+# Who is stalking Anne?
+>>> a.stalkers.all()
+[Bill]
+
+# Who are Bill's idols?
+>>> b.idols.all()
+[Anne]
+
+# Who is stalking Bill?
+>>> b.stalkers.all()
+[]
+
+# Clear Anne's group of idols
+>>> a.idols.clear()
+
+# Who are Anne's idols
+>>> a.idols.all() 
+[]
+
+# Reverse relationships should also be gone
+# Who is stalking Chuck?
+>>> c.stalkers.all()
+[]
+
+# Who is friends with David?
+>>> d.stalkers.all() 
+[Chuck]
+
-"""