Changeset 243

Timestamp:

10/25/07 10:07:01 (5 years ago)

Author:

ged

Message:

- added test for deferred fields courtesy of Isaac Csandl
- tweaked setup order (now properties init themselves before the mapper and

all properties are added at once) to work around a bug in SA 0.4 for
deferred and synonym fields (closes #17)

Location:

elixir/trunk

Files:

• elixir/entity.py (modified) (4 diffs)
• elixir/fields.py (modified) (1 diff)
• elixir/properties.py (modified) (2 diffs)
• elixir/relationships.py (modified) (1 diff)
• tests/test_properties.py (modified) (1 diff)

elixir/trunk/elixir/entity.py

@@ -102 +102 @@
         # columns waiting for a table to exist
         self._columns = list()
+        self.properties = dict()
+        self.constraints = list()
+
+        #
         self.relationships = list()
-        self.constraints = list()
 
         # set default value for options
@@ -409 +412 @@
             args = [self.entity.table]
 
-        self.entity.mapper = _do_mapping(self.session, self.entity, 
+        self.entity.mapper = _do_mapping(self.session, self.entity,
+                                         properties=self.properties,
                                          *args, **kwargs)
 
@@ -457 +461 @@
         if table:
             table.append_constraint(constraint)
+
+    def add_property(self, name, property, check_duplicate=True):
+        if check_duplicate and name in self.properties:
+            raise Exception("property '%s' already exist in '%s' ! " % 
+                            (name, self.entity.__name__))
+        self.properties[name] = property
+        mapper = self.entity.mapper
+        if mapper:
+            mapper.add_property(name, property)
         
     def add_mapper_extension(self, extension):
@@ -700 +713 @@
             'before_table', 'setup_table', 'setup_reltables', 'after_table',
             'setup_events',
+            'setup_properties',
             'before_mapper', 'setup_mapper', 'after_mapper',
-            'setup_properties',
             'finalize'):
         for entity in entities:

elixir/trunk/elixir/fields.py

@@ -197 +197 @@
 
         if self.property:
-            self.entity.mapper.add_property(self.name, self.property)
+            self.entity._descriptor.add_property(self.name, self.property)
 
         if self.synonym:
-            self.entity.mapper.add_property(self.synonym, synonym(self.name))
+            self.entity._descriptor.add_property(self.synonym, synonym(self.name))
 
 

elixir/trunk/elixir/properties.py

@@ -64 +64 @@
         pass
 
+    def create_properties(self):
+        pass    
+
     def before_mapper(self):
         pass    
 
     def after_mapper(self):
-        pass    
-
-    def create_properties(self):
         pass    
 
@@ -132 +132 @@
             prop_value = self.prop
         prop_value = self.evaluate_property(prop_value)
-        self.entity.mapper.add_property(self.name, prop_value)
+        self.entity._descriptor.add_property(self.name, prop_value)
 
     def evaluate_property(self, prop):

elixir/trunk/elixir/relationships.py

@@ -405 +405 @@
         self.property = relation(self.target, **kwargs)
         #TODO: check for duplicate properties
-        self.entity.mapper.add_property(self.name, self.property)
+        self.entity._descriptor.add_property(self.name, self.property)
     
     def target(self):

elixir/trunk/tests/test_properties.py

@@ -54 +54 @@
                 assert tag.query_score3 == tag.prop_score + 2
 
+    def test_deferred(self):
+        class A(Entity):
+            name = Field(Unicode(20))
+            stuff = Field(Unicode, deferred=True)
+
+        setup_all(True)
+
+        A(name='foo')
+        session.flush()
+
     def test_synonym(self):
         class Person(Entity):