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

Timestamp:

07/16/07 18:33:36 (6 years ago)

Author:

ged

Message:

- Reworked how entities look for primary keys on related entities. This

enables one "normal" entity (fully defined in Elixir) to refer to an entity
which is autoloaded.

- Added translation (from column name to column object) of the primary_key

mapper option so that it can actually be used. This allows to have entities
without any primary key defined at the table level.

Files:

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

elixir/trunk/elixir/entity.py

@@ -40 +40 @@
         self.module = sys.modules[entity.__module__]
 
-        self.primary_keys = list()
+        self.has_pk = False
 
         self.parent = None
@@ -75 +75 @@
         for option_dict in ('mapper_options', 'table_options'):
             setattr(self, option_dict, options_defaults[option_dict].copy())
-    
+   
     def setup_options(self):
         '''
@@ -169 +169 @@
         self.delayed_properties.clear()
 
+        if 'primary_key' in kwargs:
+            cols = self.entity.table.c
+            kwargs['primary_key'] = [getattr(cols, colname) for
+                colname in kwargs['primary_key']]
+
         assign_mapper(session.context, self.entity, self.entity.table,
                       properties=properties, **kwargs)
@@ -200 +205 @@
                     
                 self.entity.table = self.parent.table 
-                self.primary_keys = self.parent._descriptor.primary_keys
 
                 # re-add the entity fields to the parent entity so that they
                 # are added to the parent's table (whether the parent's table
-                # is setup already or not).
+                # is already setup or not).
                 for field in self.fields.itervalues():
                     self.parent._descriptor.add_field(field)
@@ -222 +226 @@
 
         if not self.autoload:
-            if not self.primary_keys and self.auto_primarykey:
+            if not self.has_pk and self.auto_primarykey:
                 self.create_auto_primary_key()
 
@@ -238 +242 @@
                                   *args, **kwargs)
     
+    def primary_keys(self):
+        return [col for col in self.entity.table.primary_key.columns]
+    primary_keys = property(primary_keys)
+
     def create_auto_primary_key(self):
         '''
@@ -243 +251 @@
         '''
         
-        assert not self.primary_keys and self.auto_primarykey
+        assert not self.has_pk and self.auto_primarykey
         
         if isinstance(self.auto_primarykey, basestring):
@@ -257 +265 @@
         
         if field.primary_key:
-            self.primary_keys.append(field)
+            self.has_pk = True
         
         table = self.entity.table