Changeset 463

Timestamp:

09/24/09 17:04:35 (3 years ago)

Author:

ged

Message:

made Elixir work with SA's current trunk (future 0.6).

Files:

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

elixir/trunk/elixir/entity.py

@@ -27 +27 @@
 
 DEBUG = False
+try:
+    from sqlalchemy.orm import EXT_PASS
+    SA05orlater = False
+except ImportError:
+    SA05orlater = True
 
 __doc_all__ = ['Entity', 'EntityMeta']
@@ -220 +225 @@
         defined up to this point.
         '''
-        if self.entity.table:
+        if self.entity.table is not None:
             return
 
@@ -256 +261 @@
 
                     #FIXME: use the public equivalent of _get_colspec when
-                    #available
+                    # available (e.target_fullname)
                     for con in self.parent._descriptor.constraints:
                         self.add_constraint(
                             ForeignKeyConstraint(
-                                [c.key for c in con.columns],
+                                [e.parent.key for e in con.elements],
                                 [e._get_colspec() for e in con.elements],
                                 name=con.name, #TODO: modify it
@@ -487 +492 @@
         # get one in any case.
         table = type.__getattribute__(self.entity, 'table')
-        if table:
+        if table is not None:
             if check_duplicate and col.key in table.columns.keys():
                 raise Exception("Column '%s' already exist in table '%s' ! " %
@@ -499 +504 @@
 
         table = self.entity.table
-        if table:
+        if table is not None:
             table.append_constraint(constraint)
 
@@ -591 +596 @@
 
     def columns(self):
-        if self.entity.table:
+        if self.entity.table is not None:
             return self.entity.table.columns
         else:
@@ -616 +621 @@
 
     def table(self):
-        if self.entity.table:
+        if self.entity.table is not None:
             return self.entity.table
         else:
@@ -827 +832 @@
     # - table_iterator method in MetaData class in sqlalchemy/schema.py
     # - visit_metadata method in sqlalchemy/ansisql.py
-    original_table_iterator = md.table_iterator
-    if not hasattr(original_table_iterator,
-                   '_non_elixir_patched_iterator'):
-        def table_iterator(*args, **kwargs):
-            elixir.setup_all()
-            return original_table_iterator(*args, **kwargs)
-        table_iterator.__doc__ = original_table_iterator.__doc__
-        table_iterator._non_elixir_patched_iterator = \
-            original_table_iterator
-        md.table_iterator = table_iterator
+    if SA05orlater:
+        warnings.warn(
+            "The automatic setup via metadata.create_all() through "
+            "the autosetup option doesn't work with SQLAlchemy 0.5 and later!")
+    else:
+        # SA 0.6 does not use table_iterator anymore (it was already deprecated
+        # since SA 0.5.0)
+        original_table_iterator = md.table_iterator
+        if not hasattr(original_table_iterator,
+                       '_non_elixir_patched_iterator'):
+            def table_iterator(*args, **kwargs):
+                elixir.setup_all()
+                return original_table_iterator(*args, **kwargs)
+            table_iterator.__doc__ = original_table_iterator.__doc__
+            table_iterator._non_elixir_patched_iterator = \
+                original_table_iterator
+            md.table_iterator = table_iterator
 
     #TODO: we might want to add all columns that will be available as
@@ -866 +878 @@
 
     # 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
+    if not SA05orlater:
+        if hasattr(md.table_iterator, '_non_elixir_patched_iterator'):
+            md.table_iterator = \
+                md.table_iterator._non_elixir_patched_iterator
 
     del cls._has_triggers