Changeset 318 for elixir/trunk/elixir/entity.py

Timestamp:

04/02/08 15:29:51 (5 years ago)

Author:

ged

Message:

Fixed multi-table inheritance when using a non default schema (closes #38)

Files:

• elixir/trunk/elixir/entity.py (modified) (2 diffs)

elixir/trunk/elixir/entity.py

@@ -197 +197 @@
                     # key columns 
                     parent_desc = self.parent._descriptor
+                    schema = parent_desc.table_options.get('schema', None)
+                    tablename = parent_desc.tablename 
+                    if schema is not None:
+                        tablename = "%s.%s" % (schema, tablename)
                     for pk_col in parent_desc.primary_keys:
                         colname = options.MULTIINHERITANCECOL_NAMEFORMAT % \
@@ -205 +209 @@
                         # a real column object when said column is not yet 
                         # attached to a table
-                        pk_col_name = "%s.%s" % (parent_desc.tablename, 
-                                                 pk_col.key)
+                        pk_col_name = "%s.%s" % (tablename, pk_col.key)
                         fk = ForeignKey(pk_col_name, ondelete='cascade')
                         col = Column(colname, pk_col.type, fk,