Changeset 54

Timestamp:

02/12/07 18:30:18 (6 years ago)

Author:

ged

Message:

fixed selfref for autoloaded tables (complete autoload test to check that)

Location:

elixir/trunk

Files:

• elixir/relationships.py (modified) (1 diff)
• tests/test_autoload.py (modified) (6 diffs)

elixir/trunk/elixir/relationships.py

@@ -384 +384 @@
         
         if self.entity is self.target:
-#            print self.target._descriptor.primary_keys
-            #FIXME: this doesn't work for autoload, because primary_keys is
-            #empty
-            cols = [k.column for k in self.target._descriptor.primary_keys]
+            if self.entity._descriptor.autoload:
+                cols = [col for col in self.target.table.primary_key.columns]
+            else:
+                cols = [k.column for k in self.target._descriptor.primary_keys]
             kwargs['remote_side'] = cols
-#            print "cols", self.name, cols
 
         kwargs['primaryjoin'] = and_(*self.primaryjoin_clauses)

elixir/trunk/tests/test_autoload.py

@@ -11 +11 @@
 import datetime
 
-#FIXME/TODO: I should also test many2many!!!
-
 # First create two tables (it would be better to user an external db)
 engine = sqlalchemy.create_engine('sqlite:///')
@@ -19 +17 @@
 person_table = Table('person', meta,
     Column('id', Integer, primary_key=True),
+    Column('father_id', Integer, ForeignKey('person.id')),
     Column('name', Unicode(32)))
 person_table.create()
@@ -32 +31 @@
 elixir.delay_setup = True
 
-class Animal(Entity):
-#    has_field('name', String(15))
-#    has_field('color', String(15))
-    
-    belongs_to('owner', of_kind='Person', colname='owner_id')
-    belongs_to('feeder', of_kind='Person', colname='feeder_id')
-
-    using_options(autoload=True, shortnames=True)
-
 class Person(Entity):
 #    has_field('name', Unicode(32))
     
+    belongs_to('father', of_kind='Person', colname='father_id')
+    has_many('children', of_kind='Person')
     has_many('pets', of_kind='Animal', inverse='owner')
     has_many('animals', of_kind='Animal', inverse='feeder')
@@ -55 +47 @@
         return s
 
+class Animal(Entity):
+#    has_field('name', String(15))
+#    has_field('color', String(15))
+    
+    belongs_to('owner', of_kind='Person', colname='owner_id')
+    belongs_to('feeder', of_kind='Person', colname='feeder_id')
+
+    using_options(autoload=True, shortnames=True)
 
 elixir.delay_setup = False
@@ -66 +66 @@
     
     def teardown(self):
-        cleanup_all()
+        drop_all()
     
     def test_autoload(self):
@@ -86 +86 @@
         assert homer == slh.owner
 
+    def test_autoload_selfref(self):
+        grampa = Person(name="Abe")
+        homer = Person(name="Homer")
+        bart = Person(name="Bart")
+        lisa = Person(name="Lisa")
+        
+        grampa.children.append(homer)        
+        homer.children.append(bart)
+        lisa.father = homer
+        
+        objectstore.flush()
+        objectstore.clear()
+        
+        p = Person.get_by(name="Homer")
+        
+        print "%s is %s's child." % (p.name, p.father.name)
+        print "His children are: %s." % (
+                " and ".join(c.name for c in p.children))
+        
+        assert p in p.father.children
+        assert p.father is Person.get_by(name="Abe")
+        assert p is Person.get_by(name="Lisa").father
+
 if __name__ == '__main__':
     test = TestAutoload()