Changeset 295

Timestamp:

01/31/08 12:12:59 (5 years ago)

Author:

ged

Message:

- applied part of a patch from Ben Bangert so that passing polymorphic_identity in the using_mapper_options is *not* overriden by the one generated by Elixir.
- bump version number.

Location:

elixir/trunk

Files:

• elixir/entity.py (modified) (1 diff)
• setup.py (modified) (1 diff)

elixir/trunk/elixir/entity.py

@@ -397 +397 @@
                     #TODO: make this customizable (both callable and string)
                     #TODO: include module name
-                    kwargs['polymorphic_identity'] = \
-                        self.entity.__name__.lower()
+                    if 'polymorphic_identity' not in kwargs:
+                        kwargs['polymorphic_identity'] = \
+                            self.entity.__name__.lower()
 
                 if self.inheritance == 'concrete':

elixir/trunk/setup.py

@@ -2 +2 @@
 
 setup(name="Elixir",
-      version="0.5.0",
+      version="0.5.1",
       description="Declarative Mapper for SQLAlchemy",
       long_description="""