- MySQLdb driver

- compatibility with yoyo in google cloud environments

5 files changed, 35 insertions, 3 deletions

diff --git a/README.rst b/README.rst
index 82912a0..b2743a5 100755
--- a/README.rst
+++ b/README.rst
@@ -283,6 +283,14 @@ MySQL
   database = mysql://scott:tiger@/mydatabase?unix_socket=/tmp/mysql.sock
 
 
+MySQL with MySQLdb
+~~~~~
+
+::
+
+  # Use the MySQLdb driver instead of pymysql
+  database = mysql+mysqldb://scott:tiger@localhost/mydatabase
+
 PostgreSQL
 ~~~~~~~~~~
 
diff --git a/yoyo/backends.py b/yoyo/backends.py
index bce98f6..0fd621a 100644
--- a/yoyo/backends.py
+++ b/yoyo/backends.py
@@ -370,6 +370,24 @@ class MySQLBackend(DatabaseBackend):
         return self.driver.connect(**kwargs)
 
 
+class MySQLdbBackend(DatabaseBackend):
+
+    driver_module = 'MySQLdb'
+    def connect(self, dburi):
+        kwargs = dburi.args
+        if dburi.username is not None:
+            kwargs['user'] = dburi.username
+        if dburi.password is not None:
+            kwargs['passwd'] = dburi.password
+        if dburi.hostname is not None:
+            kwargs['host'] = dburi.hostname
+        if dburi.port is not None:
+            kwargs['port'] = dburi.port
+        kwargs['db'] = dburi.database
+
+        return self.driver.connect(**kwargs)
+
+
 class SQLiteBackend(DatabaseBackend):
 
     driver_module = 'sqlite3'
diff --git a/yoyo/compat.py b/yoyo/compat.py
index ff151b3..4b4750e 100755
--- a/yoyo/compat.py
+++ b/yoyo/compat.py
@@ -50,7 +50,7 @@ else:
         exec(code, globals_)
 
 
-if PY2:
+if PY2 and hasattr(sys.stdout, 'isatty'):
     # In python2 sys.stdout is a byte stream.
     # Convert it to a unicode stream using the environment's preferred encoding
     if sys.stdout.isatty():
diff --git a/yoyo/connections.py b/yoyo/connections.py
index 81ac22d..27b0abb 100755
--- a/yoyo/connections.py
+++ b/yoyo/connections.py
@@ -20,7 +20,8 @@ from .migrations import default_migration_table
 from .backends import (PostgresqlBackend,
                        SQLiteBackend,
                        ODBCBackend,
-                       MySQLBackend)
+                       MySQLBackend,
+                       MySQLdbBackend)
 from .compat import urlsplit, urlunsplit, parse_qsl, urlencode, quote, unquote
 
 BACKENDS = {
@@ -29,6 +30,7 @@ BACKENDS = {
     'postgres': PostgresqlBackend,
     'psql': PostgresqlBackend,
     'mysql': MySQLBackend,
+    'mysql+mysqldb': MySQLdbBackend,
     'sqlite': SQLiteBackend,
 }
 
diff --git a/yoyo/utils.py b/yoyo/utils.py
index 4e18328..66f9725 100755
--- a/yoyo/utils.py
+++ b/yoyo/utils.py
@@ -45,7 +45,11 @@ try:
         return a
 
 except ImportError:
-    from msvcrt import getch
+    # some non windows environments don't hav termios (google cloud)
+    # running yoyo through the python sdk should not require `getch`
+    try:
+        from msvcrt import getch
+    except: pass
 
 
 def prompt(prompt, options):