Changeset 465 for elixir/trunk/elixir

Timestamp:

09/24/09 17:16:27 (3 years ago)

Author:

ged

Message:

- Fixed Elixir to work with the future SQLAlchemy 0.6 (trunk as of 6377).
- Fixed MIGRATION aid
- added some more FIXME

Location:

elixir/trunk/elixir

Files:

• fields.py (modified) (1 diff)
• relationships.py (modified) (7 diffs)

elixir/trunk/elixir/fields.py

@@ -172 +172 @@
             self.property = self.column
 
-        if self.property:
+        if self.property is not None:
             self.add_mapper_property(self.name, self.property)
 

elixir/trunk/elixir/relationships.py

@@ -870 +870 @@
         if options.MIGRATION_TO_07_AID:
             self.column_format = \
-                migration_aid_column_formatter(self.column_format)
+                migration_aid_m2m_column_formatter(self.column_format)
 
         self.filter = filter
@@ -895 +895 @@
 
     def create_tables(self):
-        if self.table:
+        if self.table is not None:
             if 'primaryjoin' not in self.kwargs or \
                'secondaryjoin' not in self.kwargs:
@@ -902 +902 @@
 
         if self.inverse:
-            if self.inverse.table:
+            if self.inverse.table is not None:
                 self.table = self.inverse.table
                 self.primaryjoin_clauses = self.inverse.secondaryjoin_clauses
@@ -1005 +1005 @@
                     assert len(colnames) == len(desc.primary_keys)
                 else:
+                    #FIXME: desc is not the target desc. Do I need to fix to
+                    # code or the doc? in fact the relname corresponds to the
+                    # relationship going from the entity to the M2M, so the new
+                    # naming scheme might not really make sense
                     data = {# relationship info
                             'relname': rel and rel.name or 'inverse',
@@ -1011 +1015 @@
                             'numifself': e1_desc is e2_desc and str(num + 1)
                                                             or '',
-                            # target info
-                            'target': desc.entity,
+                            # source (not target!) info
+                            'source': desc.entity,
                             'entity': desc.entity.__name__.lower(),
                             'tablename': desc.tablename
@@ -1113 +1117 @@
         if new_name != old_name:
             complete_data = data.copy()
-            #TODO: use explicit num and selfref variables
             complete_data.update(old_name=old_name,
                                  new_name=new_name,
@@ -1120 +1123 @@
             # generation is triggered by setup_all(), not by the declaration
             # of the offending relationship.
+            #FIXME: entity is probably wrong here since it refers to the target
+            #entity.
             warnings.warn("The generated column name for the '%(relname)s' "
                           "relationship on the '%(entity)s' entity changed "