diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2011-07-24 12:50:14 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2011-07-24 12:50:14 -0400 |
| commit | e1f9f9635ed60a738905364a585762efc1a01c56 (patch) | |
| tree | 276273d561fdef50f6299ce4948c18b9658d3a26 /lib/sqlalchemy/dialects/mysql/oursql.py | |
| parent | 0cc357c6caf8f5d4e33e3dedd799beeca0304518 (diff) | |
| download | sqlalchemy-e1f9f9635ed60a738905364a585762efc1a01c56.tar.gz | |
- Fixed OurSQL dialect to use ansi-neutral
quote symbol "'" for XA commands instead
of '"'. [ticket:2186]. Also in 0.6.9.
Diffstat (limited to 'lib/sqlalchemy/dialects/mysql/oursql.py')
| -rw-r--r-- | lib/sqlalchemy/dialects/mysql/oursql.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/lib/sqlalchemy/dialects/mysql/oursql.py b/lib/sqlalchemy/dialects/mysql/oursql.py index 4ea4f56be..2678d9dc9 100644 --- a/lib/sqlalchemy/dialects/mysql/oursql.py +++ b/lib/sqlalchemy/dialects/mysql/oursql.py @@ -105,6 +105,7 @@ class MySQLDialect_oursql(MySQLDialect): # Py3K # charset = self._connection_charset # arg = connection.connection._escape_string(xid.encode(charset)).decode(charset) + arg = "'%s'" % arg connection.execution_options(_oursql_plain_query=True).execute(query % arg) # Because mysql is bad, these methods have to be @@ -113,23 +114,23 @@ class MySQLDialect_oursql(MySQLDialect): # the parameterized query API, or refuse to be parameterized # in the first place. def do_begin_twophase(self, connection, xid): - self._xa_query(connection, 'XA BEGIN "%s"', xid) + self._xa_query(connection, 'XA BEGIN %s', xid) def do_prepare_twophase(self, connection, xid): - self._xa_query(connection, 'XA END "%s"', xid) - self._xa_query(connection, 'XA PREPARE "%s"', xid) + self._xa_query(connection, 'XA END %s', xid) + self._xa_query(connection, 'XA PREPARE %s', xid) def do_rollback_twophase(self, connection, xid, is_prepared=True, recover=False): if not is_prepared: - self._xa_query(connection, 'XA END "%s"', xid) - self._xa_query(connection, 'XA ROLLBACK "%s"', xid) + self._xa_query(connection, 'XA END %s', xid) + self._xa_query(connection, 'XA ROLLBACK %s', xid) def do_commit_twophase(self, connection, xid, is_prepared=True, recover=False): if not is_prepared: self.do_prepare_twophase(connection, xid) - self._xa_query(connection, 'XA COMMIT "%s"', xid) + self._xa_query(connection, 'XA COMMIT %s', xid) # Q: why didn't we need all these "plain_query" overrides earlier ? # am i on a newer/older version of OurSQL ? |