Changeset 426

Timestamp:

12/05/08 15:02:36 (5 years ago)

Author:

ged

Message:

- Fixed filter argument on OneToMany relationship leaking the filter to the

unfiltered relationship. Doh!!!

- added preliminary code for filter on ManyToMany (but see ticket #68 comment)
- renamed M2M.secondary_table to M2M.table

Location:

elixir/trunk

Files:

• CHANGES (modified) (1 diff)
• elixir/relationships.py (modified) (11 diffs)

elixir/trunk/CHANGES

@@ -75 +75 @@
 - Added workaround for an odd mod_python behavior (class.__module__ returns a
   weird name which is not in sys.modules).
+- Fixed filter argument on OneToMany relationship leaking the filter to the
+  unfiltered relationship.
 
 0.6.1 - 2008-08-18

elixir/trunk/elixir/relationships.py

@@ -455 +455 @@
 
         # transform callable arguments
-        for arg in ('primaryjoin', 'secondaryjoin', 'remote_side', 'filter',
+        for arg in ('primaryjoin', 'secondaryjoin', 'remote_side',
                     'foreign_keys'):
             kwarg = kwargs.get(arg, None)
@@ -749 +749 @@
         self.filter = filter
         if filter is not None:
-            # We set viewonly to True by default for filtered relationship,
+            # We set viewonly to True by default for filtered relationships,
             # unless manually overridden.
             # This is not strictly necessary, as SQLAlchemy allows non viewonly
@@ -793 +793 @@
             kwargs['remote_side'] = self.inverse.foreign_key
 
+        # Contrary to ManyToMany relationships, we need to specify the join
+        # clauses even if this relationship is not self-referencial because
+        # there could be several ManyToOne from the target class to us.
         joinclauses = self.inverse.primaryjoin_clauses
         if self.filter:
-            joinclauses.append(self.filter(self.target.table.c))
+            # We need to make a copy of the joinclauses, to not add the filter
+            # on the backref
+            joinclauses = joinclauses[:] + [self.filter(self.target.table.c)]
         if joinclauses:
             kwargs['primaryjoin'] = and_(*joinclauses)
@@ -816 +821 @@
                  table=None, schema=None,
                  column_format=None,
+                 filter=None,
                  *args, **kwargs):
         self.user_tablename = tablename
@@ -829 +835 @@
         self.onupdate = onupdate
 
-        self.secondary_table = table
+        self.table = table
         self.schema = schema
 
@@ -841 +847 @@
         self.column_format = column_format or options.M2MCOL_NAMEFORMAT
 
+        self.filter = filter
+        if filter is not None:
+            # We set viewonly to True by default for filtered relationships,
+            # unless manually overridden.
+            if 'viewonly' not in kwargs:
+                kwargs['viewonly'] = True
+
         self.primaryjoin_clauses = []
         self.secondaryjoin_clauses = []
@@ -846 +859 @@
         super(ManyToMany, self).__init__(of_kind, *args, **kwargs)
 
+    def get_table(self):
+        warnings.warn("The secondary_table attribute on ManyToMany objects is"
+                      "deprecated", DeprecationWarning, stacklevel=2)
+        return self.table
+    secondary_table = property(get_table)
+
     def match_type_of(self, other):
         return isinstance(other, ManyToMany)
 
     def create_tables(self):
-        if self.secondary_table:
+        if self.table:
             if 'primaryjoin' not in self.kwargs or \
                'secondaryjoin' not in self.kwargs:
@@ -857 +876 @@
 
         if self.inverse:
-            if self.inverse.secondary_table:
-                self.secondary_table = self.inverse.secondary_table
+            if self.inverse.table:
+                self.table = self.inverse.table
                 self.primaryjoin_clauses = self.inverse.secondaryjoin_clauses
                 self.secondaryjoin_clauses = self.inverse.primaryjoin_clauses
@@ -927 +946 @@
                        self.target.__name__))
 
-            self.secondary_table = Table(tablename, e1_desc.metadata,
-                                         autoload=True)
+            self.table = Table(tablename, e1_desc.metadata, autoload=True)
             if 'primaryjoin' not in self.kwargs or \
                'secondaryjoin' not in self.kwargs:
@@ -998 +1016 @@
             args = columns + constraints
 
-            self.secondary_table = Table(tablename, e1_desc.metadata,
-                                         schema=schema, *args)
+            self.table = Table(tablename, e1_desc.metadata,
+                               schema=schema, *args)
             if DEBUG:
-                print self.secondary_table.repr2()
+                print self.table.repr2()
 
     def _build_join_clauses(self):
@@ -1021 +1039 @@
 
             self.primaryjoin_clauses, self.secondaryjoin_clauses = \
-                _get_join_clauses(self.secondary_table,
+                _get_join_clauses(self.table,
                                   self.local_colname, self.remote_colname,
                                   self.entity.table)
 
     def get_prop_kwargs(self):
-        kwargs = {'secondary': self.secondary_table,
+        kwargs = {'secondary': self.table,
                   'uselist': self.uselist}
 
-        if self.target is self.entity:
+        if self.filter:
+            # we need to make a copy of the joinclauses
+            secondaryjoin_clauses = self.secondaryjoin_clauses[:] + \
+                                    [self.filter(self.target.table.c)]
+        else:
+            secondaryjoin_clauses = self.secondaryjoin_clauses
+
+        if self.target is self.entity or self.filter:
             kwargs['primaryjoin'] = and_(*self.primaryjoin_clauses)
-            kwargs['secondaryjoin'] = and_(*self.secondaryjoin_clauses)
+            kwargs['secondaryjoin'] = and_(*secondaryjoin_clauses)
 
         kwargs.update(self.kwargs)