Changeset 318

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)

Location:

elixir/trunk

Files:

• CHANGES (modified) (1 diff)
• elixir/entity.py (modified) (2 diffs)
• tests/test_inherit.py (modified) (2 diffs)

elixir/trunk/CHANGES

@@ +1 @@
+0.5.3
+
+Bug fixes:
+- Fixed multi-table inheritance when using a non default schema (closes #38)
+
 0.5.2 - 2008-03-28
 

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,

elixir/trunk/tests/test_inherit.py

@@ -9 +9 @@
 def setup():
     metadata.bind = 'sqlite:///'
-#    metadata.bind = 'postgres://localhost/test'
+#    metadata.bind = 'postgres://@/test'
 #    metadata.bind.echo = True
     elixir.options_defaults['shortnames'] = True
@@ -104 +104 @@
         # enforcing the foreign key constraint cascade rule).
 #        assert not B.table.select().execute().fetchall()
+    
+    def test_inheritance_wh_schema(self):
+        # I can only test schema stuff on postgres
+        if metadata.bind.name != 'postgres':
+            print "schema test skipped"
+            return
+        
+        class A(Entity):
+            using_options(inheritance="multi")
+            using_table_options(schema="test")
+
+            row_id = Field(Integer, primary_key=True)
+            thing1 = Field(String(20))
+
+        class B(A):
+            using_options(inheritance="multi")
+            using_table_options(schema="test")
+
+            thing2 = Field(String(20))
+
+        setup_all(True)
 
     def test_inverse_matching_on_parent(self):