Changeset 478 for elixir/trunk

Timestamp:

09/29/09 18:53:07 (3 years ago)

Author:

ged

Message:

- Default table_options (defined in options_defaultstable_options?) are now

also used for ManyToMany tables.

Location:

elixir/trunk

Files:

• CHANGES (modified) (2 diffs)
• elixir/relationships.py (modified) (3 diffs)
• tests/test_m2m.py (modified) (2 diffs)

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 relationships to be able to create 
-  the ManyToMany table in a custom schema and not necessarily the same schema 
+- 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
@@ -55 +55 @@
 - Made manually defined mapper options take precedence over Elixir-generated
   ones. Not very useful yet since most are expecting Column objects.
+- Default table_options (defined in options_defaults['table_options']) are now
+  also used for ManyToMany tables.
 
 Bug fixes:

elixir/trunk/elixir/relationships.py

@@ -915 +915 @@
                 return
 
+        # compute table_kwargs
+        complete_kwargs = options.options_defaults['table_options'].copy()
+        complete_kwargs.update(self.table_kwargs)
+
         #needs: table_options['schema'], autoload, tablename, primary_keys,
         #entity.__name__, table_fullname
@@ -982 +986 @@
 
             self.table = Table(tablename, e1_desc.metadata, autoload=True,
-                               **self.table_kwargs)
+                               **complete_kwargs)
             if 'primaryjoin' not in self.kwargs or \
                'secondaryjoin' not in self.kwargs:
@@ -1086 +1090 @@
 
             self.table = Table(tablename, e1_desc.metadata,
-                               schema=schema, *args, **self.table_kwargs)
+                               schema=schema, *args, **complete_kwargs)
             if DEBUG:
                 print self.table.repr2()

elixir/trunk/tests/test_m2m.py

@@ -58 +58 @@
     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')
 
@@ -71 +67 @@
 
         assert A.bs_.property.secondary.info['test'] is True
+
+    def test_table_default_kwargs(self):
+        options_defaults['table_options'] = {'info': {'test': True}}
+
+        class A(Entity):
+            bs_ = ManyToMany('B')
+
+        class B(Entity):
+            as_ = ManyToMany('A')
+
+        setup_all(True)
+        A.mapper.compile()
+
+        options_defaults['table_options'] = {}
+
+        assert A.bs_.property.secondary.info['test'] is True
+        assert A.table.info['test'] is True
+        assert B.table.info['test'] is True
 
     def test_custom_global_column_nameformat(self):