Changeset 51

Timestamp:

02/12/07 17:09:58 (6 years ago)

Author:

ged

Message:

reorder setup operations. should fix autoload bug.

Location:

elixir/trunk/elixir

Files:

• __init__.py (modified) (1 diff)
• entity.py (modified) (2 diffs)
• relationships.py (modified) (8 diffs)

elixir/trunk/elixir/__init__.py

@@ -78 +78 @@
     delay_setup = False
     for entity in delayed_entities:
-        entity.setup()
+        entity.setup_table()
+        entity.setup_mapper()
     delayed_entities.clear()
     create_all()

elixir/trunk/elixir/entity.py

@@ -85 +85 @@
         self.setup_table()
         self.setup_mapper()
-       
+    
+    def setup_mapper(self):
+        '''
+        Initializes and assign an (empty!) mapper to the given entity, which 
+        needs a table defined, so it calls setup_table.
+        '''
+        if self.entity.mapper:
+            return
+        
+        session = getattr(self.module, 'session', elixir.objectstore)
+        
+        kwargs = self.mapper_options
+        if self.order_by:
+            kwargs['order_by'] = self.translate_order_by(self.order_by)
+        
+        assign_mapper(session.context, self.entity, self.entity.table, 
+                      **kwargs)
+        elixir.metadatas.add(self.metadata)
+
         # This marks all relations of the entity (or, at least those which 
         # have been added so far by statements) as being uninitialized
@@ -93 +111 @@
         # try to setup all uninitialized relationships
         EntityDescriptor.setup_relationships()
-    
-    def setup_mapper(self):
-        '''
-        Initializes and assign an (empty!) mapper to the given entity, which 
-        needs a table defined, so it calls setup_table.
-        '''
-        if self.entity.mapper:
-            return
-        
-        session = getattr(self.module, 'session', elixir.objectstore)
-        
-        kwargs = self.mapper_options
-        if self.order_by:
-            kwargs['order_by'] = self.translate_order_by(self.order_by)
-        
-        assign_mapper(session.context, self.entity, self.entity.table, 
-                      **kwargs)
-        elixir.metadatas.add(self.metadata)
     
     def translate_order_by(self, order_by):

elixir/trunk/elixir/relationships.py

@@ -164 +164 @@
             self.foreign_key = [self.foreign_key]
         
-        #CHECKME: is it of any use to store it somewhere?
         self.property = None # sqlalchemy property
         
@@ -172 +171 @@
         
         self.entity._descriptor.relationships[self.name] = self
-        self.setup_done = False
     
     def create_keys(self):
@@ -200 +198 @@
             return False
         
-        if self.setup_done:
+        if self.property:
             return True
 
-#        FIXME: this should only happen if the relation was not setup already
         self.create_keys()
         self.create_tables()
         self.create_properties()
-        self.setup_done = True
         
         return True
@@ -301 +297 @@
         target_desc = self.target._descriptor
         
-        #FIXME: this is buggy, because it seems 
-        # like the field is used for two different purpose. 
-        # FK is what?
-
-        # convert strings to Field instances
+        # convert strings to column instances
         if self.foreign_key:
-            self.foreign_key = [source_desc.fields[k]
+            #FIXME: this will fail. Because if we specify a foreign_key
+            # as argument, it will not create the necessary column
+            self.foreign_key = [source_desc.fields[k].column
                                    for k in self.foreign_key 
                                        if isinstance(k, basestring)]
@@ -366 +360 @@
                 source_desc.add_field(field)
 
-                self.foreign_key.append(field)
+                self.foreign_key.append(field.column)
 
                 # build the list of local columns which will be part of
@@ -390 +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]
             kwargs['remote_side'] = cols
+#            print "cols", self.name, cols
 
         kwargs['primaryjoin'] = and_(*self.primaryjoin_clauses)
@@ -411 +409 @@
         kwargs = self.kwargs
         
-        #TODO: for now, we don't break any test if we remove those 3 lines.
+        #TODO: for now, we don't break any test if we remove those 2 lines.
         # So, we should either complete the selfref test to prove that they
         # are indeed useful, or remove them. It might be they are indeed
@@ -417 +415 @@
         # already setup in the other way (belongs_to).
         if self.entity is self.target:
-            #FIXME: this won't work for autoloaded relations
-            # so I need to change the type of foreign_key 
-            kwargs['remote_side'] = [field.column
-                                        for field in self.inverse.foreign_key]
+            kwargs['remote_side'] = self.inverse.foreign_key
+            print "kwargs", self.name, kwargs
         
         kwargs['primaryjoin'] = and_(*self.inverse.primaryjoin_clauses)