- added _with_options() to Connection. not publicizing this yet.

- updated oursql driver with latest fixes using options. [ticket:1613]
- all the MySQL drivers get a shoutout in the docs
- marked tests that OurSQL has problems with (only three), passes 100% now

1 files changed, 15 insertions, 46 deletions

diff --git a/lib/sqlalchemy/dialects/mysql/oursql.py b/lib/sqlalchemy/dialects/mysql/oursql.py
index 79a36f535..70bec53a3 100644
--- a/lib/sqlalchemy/dialects/mysql/oursql.py
+++ b/lib/sqlalchemy/dialects/mysql/oursql.py
@@ -31,10 +31,6 @@ from sqlalchemy.sql import operators as sql_operators
 from sqlalchemy import exc, log, schema, sql, types as sqltypes, util
 
 
-class _PlainQuery(unicode): 
-    pass
-
-
 class _oursqlNumeric(NUMERIC):
     def result_processor(self, dialect, coltype):
         if self.asdecimal:
@@ -53,12 +49,21 @@ class _oursqlBIT(BIT):
 
         return None
 
+
+class MySQL_oursqlExecutionContext(MySQLExecutionContext):
+    
+    @property
+    def plain_query(self):
+        return self._connection.options.get('plain_query', False)
+
+
 class MySQL_oursql(MySQLDialect):
     driver = 'oursql'
     supports_unicode_statements = True
     supports_unicode_binds = True
     supports_sane_rowcount = True
     supports_sane_multi_rowcount = True
+    execution_ctx_cls = MySQL_oursqlExecutionContext
     
     colspecs = util.update_copy(
         MySQLDialect.colspecs,
@@ -76,7 +81,7 @@ class MySQL_oursql(MySQLDialect):
     def do_execute(self, cursor, statement, parameters, context=None):
         """Provide an implementation of *cursor.execute(statement, parameters)*."""
         
-        if context and not context.compiled and isinstance(context.statement, _PlainQuery):
+        if context and context.plain_query:
             cursor.execute(statement, plain_query=True)
         else:
             cursor.execute(statement, parameters)
@@ -85,7 +90,7 @@ class MySQL_oursql(MySQLDialect):
         connection.cursor().execute('BEGIN', plain_query=True)
 
     def _xa_query(self, connection, query, xid):
-        connection.execute(_PlainQuery(query % connection.connection._escape_string(xid)))
+        connection._with_options(plain_query=True).execute(query % connection.connection._escape_string(xid))
 
     # Because mysql is bad, these methods have to be reimplemented to use _PlainQuery. Basically, some queries
     # refuse to return any data if they're run through the parameterized query API, or refuse to be parameterized
@@ -110,49 +115,13 @@ class MySQL_oursql(MySQLDialect):
         self._xa_query(connection, 'XA COMMIT "%s"', xid)
 
     def has_table(self, connection, table_name, schema=None):
-        full_name = '.'.join(self.identifier_preparer._quote_free_identifiers(
-            schema, table_name))
-
-        st = "DESCRIBE %s" % full_name
-        rs = None
-        try:
-            try:
-                rs = connection.execute(_PlainQuery(st))
-                have = rs.rowcount > 0
-                rs.close()
-                return have
-            except exc.SQLError, e:
-                if self._extract_error_code(e) == 1146:
-                    return False
-                raise
-        finally:
-            if rs:
-                rs.close()
+        return MySQLDialect.has_table(self, connection._with_options(plain_query=True), table_name, schema)
 
     def _show_create_table(self, connection, table, charset=None,
                            full_name=None):
-        """Run SHOW CREATE TABLE for a ``Table``."""
-
-        if full_name is None:
-            full_name = self.identifier_preparer.format_table(table)
-        st = "SHOW CREATE TABLE %s" % full_name
-
-        rp = None
-        try:
-            try:
-                rp = connection.execute(_PlainQuery(st))
-            except exc.SQLError, e:
-                if self._extract_error_code(e) == 1146:
-                    raise exc.NoSuchTableError(full_name)
-                else:
-                    raise
-            row = rp.fetchone()
-            if not row:
-                raise exc.NoSuchTableError(full_name)
-            return row[1].strip()
-        finally:
-            if rp:
-                rp.close()
+        return MySQLDialect._show_create_table(self, 
+            connection.contextual_connect(close_with_result=True)._with_options(plain_query=True), 
+            table, charset, full_name)
 
     def is_disconnect(self, e):
         if isinstance(e, self.dbapi.ProgrammingError):  # if underlying connection is closed, this is the error you get