From: Bryce Lohr <bryce.lohr@gmail.com>
Date: Tue, 8 May 2012 02:22:02 +0000 (-0400)
Subject: Merged revision 6ed983fc075450d874557e81feb0237d7a28a222 from upstream default tip
X-Git-Tag: rel_0_4_0~8^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bc8bae8e4e5aba607478d1d1b083e83122ba8816;p=thirdparty%2Fsqlalchemy%2Falembic.git

Merged revision 6ed983fc075450d874557e81feb0237d7a28a222 from upstream default tip
---

bc8bae8e4e5aba607478d1d1b083e83122ba8816
diff --cc alembic/migration.py
index 1a65cd22,243bdbd2..76699062
--- a/alembic/migration.py
+++ b/alembic/migration.py
@@@ -218,9 -218,9 +218,9 @@@ class MigrationContext(object)
                  self._update_current_rev(current_rev, rev)
  
              if self.as_sql and not rev:
 -                _version.drop(self.connection)
 +                self._version.drop(self.connection)
  
-     def execute(self, sql):
+     def execute(self, sql, execution_options=None):
          """Execute a SQL construct or string statement.
          
          The underlying execution mechanics are used, that is