From 603ed1d1b55f4bd43c1c4e2b3a02dcb62fb49553 Mon Sep 17 00:00:00 2001
From: Pádraig Brady <P@draigBrady.com>
Date: Mar 11 2013 11:49:25 +0000
Subject: add compatability for sqlalchemy >= 0.8


---

diff --git a/python-migrate-sqlalchemy-0.8.patch b/python-migrate-sqlalchemy-0.8.patch
new file mode 100644
index 0000000..5280afa
--- /dev/null
+++ b/python-migrate-sqlalchemy-0.8.patch
@@ -0,0 +1,33 @@
+diff -Naur sqlalchemy-migrate-0.7.2.orig/migrate/tests/changeset/test_changeset.py sqlalchemy-migrate-0.7.2/migrate/tests/changeset/test_changeset.py
+--- sqlalchemy-migrate-0.7.2.orig/migrate/tests/changeset/test_changeset.py	2011-10-28 15:11:43.000000000 +0000
++++ sqlalchemy-migrate-0.7.2/migrate/tests/changeset/test_changeset.py	2013-03-11 11:45:29.066638792 +0000
+@@ -560,7 +560,7 @@
+             self.table.drop()
+         try:
+             self.table.create()
+-        except sqlalchemy.exceptions.SQLError, e:
++        except sqlalchemy.exc.SQLError, e:
+             # SQLite: database schema has changed
+             if not self.url.startswith('sqlite://'):
+                 raise
+@@ -569,7 +569,7 @@
+         if self.table.exists():
+             try:
+                 self.table.drop(self.engine)
+-            except sqlalchemy.exceptions.SQLError,e:
++            except sqlalchemy.exc.SQLError,e:
+                 # SQLite: database schema has changed
+                 if not self.url.startswith('sqlite://'):
+                     raise
+diff -Naur sqlalchemy-migrate-0.7.2.orig/migrate/versioning/schema.py sqlalchemy-migrate-0.7.2/migrate/versioning/schema.py
+--- sqlalchemy-migrate-0.7.2.orig/migrate/versioning/schema.py	2011-10-28 15:11:43.000000000 +0000
++++ sqlalchemy-migrate-0.7.2/migrate/versioning/schema.py	2013-03-11 11:44:45.769557705 +0000
+@@ -7,7 +7,7 @@
+ from sqlalchemy import (Table, Column, MetaData, String, Text, Integer,
+     create_engine)
+ from sqlalchemy.sql import and_
+-from sqlalchemy import exceptions as sa_exceptions
++from sqlalchemy import exc as sa_exceptions
+ from sqlalchemy.sql import bindparam
+ 
+ from migrate import exceptions
diff --git a/python-migrate.spec b/python-migrate.spec
index 18dc31d..321ed70 100644
--- a/python-migrate.spec
+++ b/python-migrate.spec
@@ -6,7 +6,7 @@
 
 Name: python-migrate
 Version: 0.7.2
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: Schema migration tools for SQLAlchemy
 
 Group: Development/Languages
@@ -19,6 +19,8 @@ Patch0: migrate-scripttest-update.patch
 Patch1: migrate-py27.patch
 # Patch to fix a unittest failure on newer python
 Patch2: migrate-test-int-overflow.patch
+# Patch to make compat with sqlalchemy >= 0.8
+Patch3: python-migrate-sqlalchemy-0.8.patch
 # Local patch to rename /usr/bin/migrate to sqlalchemy-migrate
 Patch100: python-migrate-sqlalchemy-migrate.patch
 
@@ -61,6 +63,7 @@ database change sets and database repository versioning.
 %patch0 -p1 -b .test
 %patch1 -p1 -b .py27
 %patch2 -p1 -b .pynew
+%patch3 -p1 -b .sql0.8
 %patch100 -p1 -b .rename
 
 # use real unittest in python 2.7 and up
@@ -99,6 +102,9 @@ nosetests
 %{python_sitelib}/*
 
 %changelog
+* Mon Mar 11 2013 Pádraig Brady <P@draigBrady.com> - 0.7.2-7
+- Add compatability for sqlalchemy >= 0.8
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.7.2-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild