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

Timestamp:

02/12/07 15:27:25 (6 years ago)

Author:

ged

Message:

- Changed tests so that when one test fails, other unrelated ones don't.

- now options are initialized to their "global defaults" values instead
of hard coded values, so we can set a bunch of options on all entities.

- added a way to set custom column names for belongs_to relations.

- implemented a way to delay setup (to have a behaviour somewhat similar
to something non dynamic). This is to be used in conjunction with the
new "setup_all" function.

- made autoload work for belongs_to/has_one/has_many relations. The user
must provide column names in that case. It would be possible (and quite
easy, I think) to guess things based on foreign keys when there is only
one relation of the same type between two entities, but I haven't done
it yet, and don't plan to do it before the release. It doesn't work yet
for HasAndBelongsToMany relationships.

Files:

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

elixir/trunk/elixir/entity.py

@@ -7 +7 @@
 from elixir.statements              import Statement
 from elixir.fields                  import Field
+from elixir.options                 import options_defaults
 
 import sys
@@ -18 +19 @@
 DEFAULT_AUTO_PRIMARYKEY_NAME = "id"
 DEFAULT_AUTO_PRIMARYKEY_TYPE = Integer
-
-class Entity(object):
-    '''
-    The base class for all entities
-    
-    All Elixir model objects should inherit from this class. Statements can
-    appear within the body of the definition of an entity to define its
-    fields, relationships, and other options.
-    
-    Here is an example:
-
-    ::
-    
-        class Person(Entity):
-            has_field('name', Unicode(128))
-            has_field('birthdate', DateTime, default=datetime.now)
-    
-    Please note, that if you don't specify any primary keys, Elixir will
-    automatically create one called ``id``.
-    
-    For further information, please refer to the provided examples or
-    tutorial.
-    '''
-    
-    class __metaclass__(type):
-        def __init__(cls, name, bases, dict_):
-            # only process subclasses of Entity, not Entity itself
-            if bases[0] is object:
-                return
-            
-            # create the entity descriptor
-            desc = cls._descriptor = EntityDescriptor(cls)
-            EntityDescriptor.current = desc
-            
-            # process statements
-            Statement.process(cls)
-            
-            # setup misc options here (like tablename etc.)
-            desc.setup_options()
-            
-            # create table & assign (empty) mapper
-            desc.setup()
-            
-            # try to setup all uninitialized relationships
-            EntityDescriptor.setup_relationships()
 
 
@@ -90 +46 @@
 
         # set default value for options
+        self.order_by = None
+        self.tablename = None
         self.metadata = getattr(self.module, 'metadata', elixir.metadata)
-        self.autoload = None
-        self.tablename = None
-        self.shortnames = False
-        self.auto_primarykey = True
-        self.order_by = None
-        self.mapper_options = dict()
-        self.table_options = dict()
+
+        for option in ('autoload', 'shortnames', 'auto_primarykey'):
+            setattr(self, option, options_defaults[option])
+
+        for option_dict in ('mapper_options', 'table_options'):
+            setattr(self, option_dict, options_defaults[option_dict].copy())
     
     def setup_options(self):
@@ -122 +79 @@
         '''
         
+        if elixir.delay_setup:
+            elixir.delayed_entities.add(self)
+            return
+
+        self.setup_table()
         self.setup_mapper()
        
@@ -128 +90 @@
         EntityDescriptor.uninitialized_rels.update(
             self.relationships.values())
+
+        # try to setup all uninitialized relationships
+        EntityDescriptor.setup_relationships()
     
     def setup_mapper(self):
@@ -138 +103 @@
         
         session = getattr(self.module, 'session', elixir.objectstore)
-        table = self.setup_table()
         
         kwargs = self.mapper_options
@@ -144 +108 @@
             kwargs['order_by'] = self.translate_order_by(self.order_by)
         
-        assign_mapper(session.context, self.entity, table, **kwargs)
+        assign_mapper(session.context, self.entity, self.entity.table, 
+                      **kwargs)
         elixir.metadatas.add(self.metadata)
     
@@ -157 +122 @@
                 col = desc(col)
             order.append(col)
-            
         return order
 
@@ -183 +147 @@
             kwargs['autoload'] = True
         
-        table = Table(self.tablename, self.metadata, *args, **kwargs)
-        self.entity.table = table
-        return table
+        self.entity.table = Table(self.tablename, self.metadata, 
+                                  *args, **kwargs)
     
     def create_auto_primary_key(self):
@@ -232 +195 @@
                     raise Exception(
                             "Several relations match as inverse of the '%s' "
-                            "relation in class '%s'. You should specify "
+                            "relation in entity '%s'. You should specify "
                             "inverse relations manually by using the inverse "
                             "keyword."
@@ -246 +209 @@
         return matching_rel
 
-
     @classmethod
     def setup_relationships(cls):
@@ -253 +215 @@
                 EntityDescriptor.uninitialized_rels.remove(relationship)
 
+
+class Entity(object):
+    '''
+    The base class for all entities
+    
+    All Elixir model objects should inherit from this class. Statements can
+    appear within the body of the definition of an entity to define its
+    fields, relationships, and other options.
+    
+    Here is an example:
+
+    ::
+    
+        class Person(Entity):
+            has_field('name', Unicode(128))
+            has_field('birthdate', DateTime, default=datetime.now)
+    
+    Please note, that if you don't specify any primary keys, Elixir will
+    automatically create one called ``id``.
+    
+    For further information, please refer to the provided examples or
+    tutorial.
+    '''
+    
+    class __metaclass__(type):
+        def __init__(cls, name, bases, dict_):
+            # only process subclasses of Entity, not Entity itself
+            if bases[0] is object:
+                return
+            
+            # create the entity descriptor
+            desc = cls._descriptor = EntityDescriptor(cls)
+            EntityDescriptor.current = desc
+            
+            # process statements
+            Statement.process(cls)
+            
+            # setup misc options here (like tablename etc.)
+            desc.setup_options()
+            
+            # create table & assign (empty) mapper
+            desc.setup()
+