Patch for elixir r534 tests to work with SQLAlchemy 0.7

sa-0.7.diff

Index: tests/test_options.py
===================================================================
--- tests/test_options.py	(revision 534)
+++ tests/test_options.py	(working copy)
@@ -2,9 +2,15 @@
 test options
 """
 
+from nose import SkipTest
+import sqlalchemy
 from sqlalchemy import UniqueConstraint, create_engine, Column
 from sqlalchemy.orm import scoped_session, sessionmaker
-from sqlalchemy.exceptions import SQLError, ConcurrentModificationError
+try:
+    from sqlalchemy.exceptions import SQLError, ConcurrentModificationError
+except ImportError:
+    from sqlalchemy.exc import DBAPIError as SQLError
+    from sqlalchemy.orm.exc import ConcurrentModificationError
 from elixir import *
 
 class TestOptions(object):
@@ -66,6 +72,9 @@
             pass
 
     def test_allowcoloverride_true(self):
+        if sqlalchemy.__version__[:3] >= '0.7':
+            raise SkipTest('Test not supported by version '
+                           '%s of SQLAlchemy' % sqlalchemy.__version__)
         class MyEntity(Entity):
             name = Field(String(30))
             using_options(allowcoloverride=True)
Index: tests/test_autoload.py
===================================================================
--- tests/test_autoload.py	(revision 534)
+++ tests/test_autoload.py	(working copy)
@@ -401,6 +401,6 @@
 
         setup_all(True)
 
-        colname = Item.table.c['owner_user_id'].foreign_keys[0].column.name
+        colname = list(Item.table.c['owner_user_id'].foreign_keys)[0].column.name
         assert colname == 'user_id'
 
Index: elixir/ext/perform_ddl.py
===================================================================
--- elixir/ext/perform_ddl.py	(revision 534)
+++ elixir/ext/perform_ddl.py	(working copy)
@@ -89,7 +89,7 @@
 
     def after_table(self):
         all_columns = [col.name for col in self.entity.table.columns]
-        def onload(event, schema_item, connection):
+        def onload(event, schema_item, connection, **kwargs):
             columns = self.columns
             if columns is None:
                 columns = all_columns

test_results.txt

running test
running egg_info
writing requirements to Elixir.egg-info/requires.txt
writing Elixir.egg-info/PKG-INFO
writing top-level names to Elixir.egg-info/top_level.txt
writing dependency_links to Elixir.egg-info/dependency_links.txt
reading manifest template 'MANIFEST.in'
writing manifest file 'Elixir.egg-info/SOURCES.txt'
running build_ext
tests.test_abstract.TestAbstractInheritance.test_abstract_alone ... ok
tests.test_abstract.TestAbstractInheritance.test_inheritance ... ok
tests.test_abstract.TestAbstractInheritance.test_mixed_inheritance ... ok
tests.test_abstract.TestAbstractInheritance.test_multiple_inheritance ... ok
tests.test_abstract.TestAbstractInheritance.test_simple_relation ... ok
tests.test_abstract.TestAbstractInheritance.test_simple_relation_abstract_wh_multiple_children ... ok
tests.test_associable.TestOrders.test_basic ... ok
tests.test_associable.TestOrders.test_empty ... ok
tests.test_associable.TestOrders.test_with_forward_ref ... ok
tests.test_autoload.TestAutoload.test_autoload_mixed ... ok
tests.test_autoload.TestAutoload.test_fk_auto_join_colname ... ok
tests.test_autoload.TestAutoload.test_fk_auto_join_sa ... ok
tests.test_autoload.TestAutoload.test_inheritance ... ok
tests.test_autoload.TestAutoload.test_m2m ... ok
tests.test_autoload.TestAutoload.test_m2m_selfref ... ok
tests.test_autoload.TestAutoload.test_nopk ... ok
tests.test_autoload.TestAutoload.test_override_non_pk ... ok
tests.test_autoload.TestAutoload.test_override_non_pk_fails ... ok
tests.test_autoload.TestAutoload.test_override_pk ... ok
tests.test_autoload.TestAutoload.test_override_pk_fails ... ok
tests.test_autoload.TestAutoload.test_selfref ... ok
tests.test_autoload.TestAutoload.test_simple ... ok
tests.test_class_methods.TestOldMethods.test_get ... ok
tests.test_collections.TestCollections.test_getattr ... ok
tests.test_collections.TestCollections.test_no_collection ... ok
tests.test_collections.TestCollections.test_setup_after_cleanup ... ok
tests.test_collections.TestCollections.test_several_collections ... ok
tests.test_custombase.TestCustomBase.test_bad_property ... ok
tests.test_custombase.TestCustomBase.test_base_custom_collection ... ok
tests.test_custombase.TestCustomBase.test_base_custom_session ... ok
tests.test_custombase.TestCustomBase.test_base_with_fields ... ok
tests.test_custombase.TestCustomBase.test_base_with_fields_in_parent ... ok
tests.test_custombase.TestCustomBase.test_base_with_options ... ok
tests.test_custombase.TestCustomBase.test_base_with_relation ... ok
tests.test_custombase.TestCustomBase.test_inherit ... ok
tests.test_custombase.TestCustomBase.test_non_object_base ... ok
tests.test_custombase.TestCustomBase.test_simple ... ok
tests.test_dict.TestDeepSet.test_extend_list ... ok
tests.test_dict.TestDeepSet.test_invalid_update ... ok
tests.test_dict.TestDeepSet.test_nonset_attr ... ok
tests.test_dict.TestDeepSet.test_remove_rel ... ok
tests.test_dict.TestDeepSet.test_set_attr ... ok
tests.test_dict.TestDeepSet.test_set_rel ... ok
tests.test_dict.TestDeepSet.test_to ... ok
tests.test_dict.TestDeepSet.test_to_deep_m2o ... ok
tests.test_dict.TestDeepSet.test_to_deep_m2o_none ... ok
tests.test_dict.TestDeepSet.test_to_deep_nested ... ok
tests.test_dict.TestDeepSet.test_to_deep_o2m ... ok
tests.test_dict.TestDeepSet.test_to_deep_o2m_empty ... ok
tests.test_dict.TestDeepSet.test_to_deep_o2o ... ok
tests.test_dict.TestDeepSet.test_truncate_list ... ok
tests.test_dict.TestDeepSet.test_update_list_item ... ok
tests.test_dict.TestDeepSet.test_update_rel ... ok
tests.test_dict.TestSetOnAliasedColumn.test_set_on_aliased_column ... ok
tests.test_encryption.TestEncryption.test_encryption ... ok
tests.test_encryption.TestEncryption.test_two_consecutive_updates ... ok
tests.test_events.TestEvents.test_entity_wh_bad_descriptors ... ok
tests.test_events.TestEvents.test_events ... ok
tests.test_events.TestEvents.test_multiple_inheritance ... ok
tests.test_fields.TestFields.test_attr_syntax ... ok
tests.test_fields.TestFields.test_has_field ... ok
tests.test_inherit.TestInheritance.test_concrete_inheritance ... ok
tests.test_inherit.TestInheritance.test_delete_parent ... ok
tests.test_inherit.TestInheritance.test_inheritance_wh_schema ... ok
tests.test_inherit.TestInheritance.test_inverse_matching_on_parent ... ok
tests.test_inherit.TestInheritance.test_missing_value ... ok
tests.test_inherit.TestInheritance.test_multi_pk ... ok
tests.test_inherit.TestInheritance.test_multitable_inheritance ... ok
tests.test_inherit.TestInheritance.test_multitable_polymorphic_load ... ok
tests.test_inherit.TestInheritance.test_polymorphic_multitable_inheritance ... ok
tests.test_inherit.TestInheritance.test_polymorphic_singletable_inheritance ... ok
tests.test_inherit.TestInheritance.test_singletable_inheritance ... ok
tests.test_m2m.TestManyToMany.test_alternate_column_formatter ... ok
tests.test_m2m.TestManyToMany.test_bidirectional_selfref ... ok
tests.test_m2m.TestManyToMany.test_custom_global_column_nameformat ... ok
tests.test_m2m.TestManyToMany.test_has_and_belongs_to_many ... ok
tests.test_m2m.TestManyToMany.test_local_and_remote_colnames ... ok
tests.test_m2m.TestManyToMany.test_manual_table_auto_joins ... ok
tests.test_m2m.TestManyToMany.test_manual_table_manual_joins ... ok
tests.test_m2m.TestManyToMany.test_multi ... ok
tests.test_m2m.TestManyToMany.test_multi_pk_in_target ... ok
tests.test_m2m.TestManyToMany.test_selfref ... ok
tests.test_m2m.TestManyToMany.test_simple ... ok
tests.test_m2m.TestManyToMany.test_table_default_kwargs ... ok
tests.test_m2m.TestManyToMany.test_table_kwargs ... ok
tests.test_m2m.TestManyToMany.test_upgrade_local_colname ... ok
tests.test_m2m.TestManyToMany.test_upgrade_rename_col ... ok
tests.test_m2o.TestManyToOne.test_belongs_to_syntax ... ok
tests.test_m2o.TestManyToOne.test_cycle_but_use_alter ... ok
tests.test_m2o.TestManyToOne.test_forward ... ok
tests.test_m2o.TestManyToOne.test_m2o_is_only_pk ... ok
tests.test_m2o.TestManyToOne.test_multi ... ok
tests.test_m2o.TestManyToOne.test_multi_pk_in_target ... ok
tests.test_m2o.TestManyToOne.test_non_pk_target ... ok
tests.test_m2o.TestManyToOne.test_one_pk ... ok
tests.test_m2o.TestManyToOne.test_simple ... ok
tests.test_m2o.TestManyToOne.test_specified_field ... ok
tests.test_m2o.TestManyToOne.test_wh_key_in_m2o_col_kwargs ... ok
tests.test_m2o.TestManyToOne.test_with_key_pk ... ok
tests.test_nestedclass.TestNestedClass.test_nestedclass ... ok
tests.test_o2m.TestOneToMany.test_filter_func ... ok
tests.test_o2m.TestOneToMany.test_has_many_syntax ... ok
tests.test_o2m.TestOneToMany.test_inverse_has_non_pk_target ... ok
tests.test_o2m.TestOneToMany.test_multiple_selfref ... ok
tests.test_o2m.TestOneToMany.test_ordering_list ... ok
tests.test_o2m.TestOneToMany.test_selfref ... ok
tests.test_o2m.TestOneToMany.test_simple ... ok
tests.test_o2m.TestOneToMany.test_viewonly ... ok
tests.test_o2o.TestOneToOne.test_simple ... ok
tests.test_options.TestOptions.test_allowcoloverride_false ... ok
tests.test_options.TestOptions.test_allowcoloverride_true ... SKIP: Test not supported by version 0.7.1 of SQLAlchemy
tests.test_options.TestOptions.test_tablename_func ... ok
tests.test_options.TestOptions.test_version_id_col ... ok
tests.test_options.TestSessionOptions.test_global_scoped_session ... ok
tests.test_options.TestSessionOptions.test_manual_session ... ok
tests.test_options.TestSessionOptions.test_scoped_session ... ok
tests.test_options.TestSessionOptions.test_scoped_session_no_save_on_init ... ok
tests.test_options.TestTableOptions.test_several_statements ... ok
tests.test_options.TestTableOptions.test_unique_constraint ... ok
tests.test_options.TestTableOptions.test_unique_constraint_many_to_one ... ok
tests.test_order_by.TestOrderBy.test_m2m_order_by ... ok
tests.test_order_by.TestOrderBy.test_mapper_order_by ... ok
tests.test_order_by.TestOrderBy.test_o2m_order_by ... ok
tests.test_packages.TestPackages.test_full_entity_path ... ok
tests.test_packages.TestPackages.test_ref_to_imported_entity_using_class ... ok
tests.test_packages.TestPackages.test_ref_to_imported_entity_using_name ... ok
tests.test_packages.TestPackages.test_relative_collection ... ok
tests.test_packages.TestPackages.test_resolve_root ... ok
tests.test_perform_ddl.TestPerformDDL.test_one ... ok
tests.test_perform_ddl.TestPerformDDL.test_several ... ok
tests.test_perform_ddl.TestPreloadData.test_several ... ok
tests.test_properties.TestSpecialProperties.test_column_property ... ok
tests.test_properties.TestSpecialProperties.test_column_property_eagerload_and_reuse ... ok
tests.test_properties.TestSpecialProperties.test_deferred ... ok
tests.test_properties.TestSpecialProperties.test_generic_property ... ok
tests.test_properties.TestSpecialProperties.test_has_property ... ok
tests.test_properties.TestSpecialProperties.test_lifecycle ... ok
tests.test_properties.TestSpecialProperties.test_setattr ... ok
tests.test_properties.TestSpecialProperties.test_synonym ... ok
tests.test_properties.TestSpecialProperties.test_synonym_class ... ok
tests.test_sa_integration.TestElixirToSQLAlchemy.test_m2o ... ok
tests.test_sa_integration.TestElixirToSQLAlchemy.test_m2o_non_pk_target ... ok
tests.test_sa_integration.TestSQLAlchemyToElixir.test_simple ... ok
tests.test_through.TestThrough.test_field_through ... ok
tests.test_through.TestThrough.test_rel_through ... ok
tests.test_through.TestThrough.test_rel_through_to_value_list ... ok
tests.test_versioning.TestVersioning.test_versioning ... ok

----------------------------------------------------------------------
Ran 147 tests in 8.535s

OK (skipped=1)