Changeset 478 for elixir/trunk/elixir/relationships.py

Timestamp:

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

Author:

ged

Message:

- Default table_options (defined in options_defaultstable_options?) are now

also used for ManyToMany tables.

Files:

• elixir/trunk/elixir/relationships.py (modified) (3 diffs)

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()