Changeset 477

Timestamp:

09/29/09 18:12:03 (4 years ago)

Author:

ged

Message:

- Added a "table_kwargs" argument on ManyToMany relationships to pass any

extra keyword arguments to the underlying Table object (handles half of
ticket #94).

Location:

elixir/trunk

Files:

• CHANGES (modified) (1 diff)
• elixir/relationships.py (modified) (5 diffs)
• tests/test_m2m.py (modified) (1 diff)

elixir/trunk/CHANGES

@@ -18 +18 @@
 - Added (or rather fixed and documented) a "table" argument on ManyToMany
   relationships to allow using a manually-defined Table (closes #44).
-- Added a "schema" argument on ManyToMany relationship to be able to create the
-  ManyToMany table in a custom schema and not necessarily the same schema as
-  the table of the "source" entity (patch from Diez B. Roggisch).
+- Added a "schema" argument on ManyToMany relationships to be able to create 
+  the ManyToMany table in a custom schema and not necessarily the same schema 
+  as the table of the "source" entity (patch from Diez B. Roggisch).
+- Added a "table_kwargs" argument on ManyToMany relationships to pass any
+  extra keyword arguments to the underlying Table object (ticket #94).
 - Added a new "target_column" argument on ManyToOne relationships so that you
   can target unique but non-primary key columns. At the moment, this only works

elixir/trunk/elixir/relationships.py

@@ -301 +301 @@
 |                    | ``set null``, or ``set default``.                      |
 +--------------------+--------------------------------------------------------+
-| ``column_format``  | DEPRECATED. Specify an alternate format string for     |
+| ``table_kwargs``   | A dictionary holding any other keyword argument you    |
+|                    | might want to pass to the underlying Table object.     |
++--------------------+--------------------------------------------------------+| ``column_format``  | DEPRECATED. Specify an alternate format string for     |
 |                    | naming the                                             |
 |                    | columns in the mapping table.  The default value is    |
@@ -839 +841 @@
                  column_format=None,
                  filter=None,
+                 table_kwargs=None,
                  *args, **kwargs):
         self.user_tablename = tablename
@@ -880 +883 @@
             if 'viewonly' not in kwargs:
                 kwargs['viewonly'] = True
+
+        self.table_kwargs = table_kwargs or {}
 
         self.primaryjoin_clauses = []
@@ -976 +981 @@
                        self.target.__name__))
 
-            self.table = Table(tablename, e1_desc.metadata, autoload=True)
+            self.table = Table(tablename, e1_desc.metadata, autoload=True,
+                               **self.table_kwargs)
             if 'primaryjoin' not in self.kwargs or \
                'secondaryjoin' not in self.kwargs:
@@ -1080 +1086 @@
 
             self.table = Table(tablename, e1_desc.metadata,
-                               schema=schema, *args)
+                               schema=schema, *args, **self.table_kwargs)
             if DEBUG:
                 print self.table.repr2()

elixir/trunk/tests/test_m2m.py

@@ -55 +55 @@
         assert a in b.as_
         assert b in a.bs_
+
+    def test_table_kwargs(self):
+        class A(Entity):
+            using_options(shortnames=True)
+            name = Field(String(60))
+            bs_ = ManyToMany('B', table_kwargs={'info': {'test': True}})
+
+        class B(Entity):
+            using_options(shortnames=True)
+            name = Field(String(60))
+            as_ = ManyToMany('A')
+
+        setup_all(True)
+        A.mapper.compile()
+
+        assert A.bs_.property.secondary.info['test'] is True
 
     def test_custom_global_column_nameformat(self):