Changeset 196 for elixir/trunk/elixir/__init__.py

Timestamp:

08/31/07 13:19:19 (6 years ago)

Author:

ged

Message:

• updated TODO file
  
• (partially) changelogged what was done recently. Did I forget anything?
  
• fixed single-table and multi-table inheritance which have relationships
  Concrete is still broken in this regard. I had to remove the "select_table"
  optimization of the multi-table polymorphic for that to work.
  
• made each initialization step as a method on EntityDescriptor
  
• reordered EntityDescriptor methods so that they are in the order they are
  called
  
• added setup_entities method to be able to setup only some entities and not
  all of them together. This is not usable yet, as all entities are still
  appended to the _delayed_entities list whether you want it or not.
  
• some misc cleanup
  

Files:

• elixir/trunk/elixir/__init__.py (modified) (3 diffs)

elixir/trunk/elixir/__init__.py

@@ -43 +43 @@
            'using_options', 'using_table_options', 'using_mapper_options',
            'options_defaults', 'metadata', 'objectstore',
-           'create_all', 'drop_all', 'setup_all', 'cleanup_all'] + \
-          sqlalchemy.types.__all__
+           'create_all', 'drop_all',
+           'setup_all', 'cleanup_all'] + sqlalchemy.types.__all__
 
-__pudge_all__ = ['create_all', 'drop_all', 'setup_all', 'cleanup_all',
+__pudge_all__ = ['create_all', 'drop_all',
+                 'setup_all', 'cleanup_all',
                  'metadata', 'objectstore']
 
@@ -72 +73 @@
         md.drop_all(bind=engine)
 
-_delayed_descriptors = list()
+_delayed_entities = list()
+
+def setup_entities(entities):
+    '''Setup all entities passed in entities'''
+
+    for entity in entities:
+        desc = entity._descriptor
+        entity._ready = False
+        del sqlalchemy.orm.mapper_registry[entity._class_key]
+
+        md = desc.metadata
+
+        # the fake table could have already been removed (namely in a 
+        # single table inheritance scenario)
+        md.tables.pop(entity._table_key, None)
+
+        # restore original table iterator if not done already
+        if hasattr(md.table_iterator, '_non_elixir_patched_iterator'):
+            md.table_iterator = \
+                md.table_iterator._non_elixir_patched_iterator
+
+    for method_name in (
+            'setup_autoload_table', 'create_pk_cols', 'setup_relkeys',
+            'before_table', 'setup_table', 'setup_reltables', 'after_table',
+            'setup_events',
+            'before_mapper', 'setup_mapper', 'after_mapper',
+            'setup_properties',
+            'finalize'):
+        for entity in entities:
+            method = getattr(entity._descriptor, method_name)
+            method()
 
 def setup_all(create_tables=False):
     '''Setup the table and mapper for all entities which have been delayed.
 
-    This is called automatically when your entity is first accessed, or ...
-    [TODO: complete this]
+    This is called automatically when any of your entities is first accessed,
+    instanciated (called) or the create_all method of a metadata containing
+    entities is called.
     '''
-
-    if not _delayed_descriptors:
+    if not _delayed_entities:
         return
 
-#TODO: define all those operations as methods on the descriptor
-#    for method_name in ('setup_table', 'setup_mapper', 'setup_relkeys', ...):
-#        for desc in _delayed_descriptors:
-#            method = getattr(desc, method_name)
-#            method()
     try:
-        for desc in _delayed_descriptors:
-            entity = desc.entity
-            entity._ready = False
-            del sqlalchemy.orm.mapper_registry[entity._class_key]
-
-            md = desc.metadata
-            # the table could have already been removed (namely in a single 
-            # table inheritance scenario)
-            md.tables.pop(entity._table_key, None)
-
-            # restore original table iterator if not done already
-            if hasattr(md.table_iterator, '_non_elixir_patched_iterator'):
-                md.table_iterator = \
-                    md.table_iterator._non_elixir_patched_iterator
-
-        # Make sure autoloaded tables are available so that we can setup 
-        # foreign keys to their columns
-        for desc in _delayed_descriptors:
-            if desc.autoload:
-                desc.setup_table()
-
-        for desc in _delayed_descriptors:
-            desc.create_pk_cols()
-
-        # Create other columns from belongs_to relationships.
-        for desc in _delayed_descriptors:
-            for rel in desc.relationships.itervalues():
-                rel.create_keys(False)
-
-        for desc in _delayed_descriptors:
-            if not desc.autoload:
-                desc.setup_table()
-
-        for desc in _delayed_descriptors:
-            Statement.process(desc.entity, 'before_table')
-
-        for desc in _delayed_descriptors:
-            for rel in desc.relationships.itervalues():
-                rel.create_tables()
-
-        for desc in _delayed_descriptors:
-            Statement.process(desc.entity, 'after_table')
-
-        for desc in _delayed_descriptors:
-            desc.setup_events()
-        
-        for desc in _delayed_descriptors:
-            Statement.process(desc.entity, 'before_mapper')
-
-        for desc in _delayed_descriptors:
-            desc.setup_mapper()
-
-        for desc in _delayed_descriptors:
-            Statement.process(desc.entity, 'after_mapper')
-
-        for desc in _delayed_descriptors:
-            for rel in desc.relationships.itervalues():
-                rel.create_properties()
-
-        for desc in _delayed_descriptors:
-            Statement.process(desc.entity, 'finalize')
-
+        setup_entities(_delayed_entities)
     finally:
         # make sure that even if we fail to initialize, we don't leave junk for
         # others
-        del _delayed_descriptors[:]
+        del _delayed_entities[:]
 
     # issue the "CREATE" SQL statements
@@ -163 +128 @@
 
 def cleanup_all(drop_tables=False):
-    '''Drop table and clear mapper for all entities, and clear all metadatas.
+    '''Clear all mappers, clear the session, and clear all metadatas. 
+    Optionally drops the tables.
     '''
     if drop_tables: