Changeset 505 for elixir/trunk/elixir

Timestamp:

10/15/09 14:41:44 (3 years ago)

Author:

ged

Message:

- using_options_defaults and using_table_options statements can be used several

times within the same class (closes #70).

Location:

elixir/trunk/elixir

Files:

• entity.py (modified) (1 diff)
• options.py (modified) (2 diffs)

elixir/trunk/elixir/entity.py

@@ -145 +145 @@
                 self.identity = self.mapper_options['polymorphic_identity']
             else:
-                #TODO: include module name
+                #TODO: include module name (We could have b.Account inherit
+                # from a.Account)
                 self.identity = entity.__name__.lower()
         elif 'polymorphic_identity' in self.mapper_options:

elixir/trunk/elixir/options.py

@@ -231 +231 @@
             raise Exception("'%s' is not a valid option for Elixir entities."
                             % kwarg)
-
-    entity.options_defaults = kwargs
+    if not hasattr(entity, 'options_defaults'):
+        entity.options_defaults = {}
+    entity.options_defaults.update(kwargs)
 
 
@@ -245 +246 @@
 
 def using_table_options_handler(entity, *args, **kwargs):
-    entity._descriptor.table_args = list(args)
+    entity._descriptor.table_args.extend(list(args))
     entity._descriptor.table_options.update(kwargs)