From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sun, 22 Apr 2007 17:49:59 +0000 (+0000)
Subject: - support for SSL arguments given as inline within URL query string,
X-Git-Tag: rel_0_3_7~41
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8bc6149ee80f4f40bcb1b4873dd436166d6037a2;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- support for SSL arguments given as inline within URL query string,
prefixed with "ssl_", courtesy terjeros@gmail.com.
---

diff --git a/CHANGES b/CHANGES
index c05f969ceb..76a7edda06 100644
--- a/CHANGES
+++ b/CHANGES
@@ -97,7 +97,10 @@
       which features LIMIT/OFFSET.  oracle dialect needs to modify
       the object to have ROW_NUMBER OVER and wasn't performing 
       the full series of steps on successive compiles.
-
+- mysql
+    - support for SSL arguments given as inline within URL query string,
+      prefixed with "ssl_", courtesy terjeros@gmail.com.
+      
 0.3.6
 - sql:
     - bindparam() names are now repeatable!  specify two
diff --git a/lib/sqlalchemy/databases/mysql.py b/lib/sqlalchemy/databases/mysql.py
index 52aa03003d..cc503215ae 100644
--- a/lib/sqlalchemy/databases/mysql.py
+++ b/lib/sqlalchemy/databases/mysql.py
@@ -293,8 +293,18 @@ class MySQLDialect(ansisql.ANSIDialect):
         # note: these two could break SA Unicode type
         util.coerce_kw_type(opts, 'use_unicode', bool)   
         util.coerce_kw_type(opts, 'charset', str)
-        # TODO: what about options like "ssl", "cursorclass" and "conv" ?
-
+        
+        # ssl
+        ssl = {}
+        for key in ['ssl_ca', 'ssl_key', 'ssl_cert', 'ssl_capath', 'ssl_cipher']:
+            if key in opts:
+                ssl[key[4:]] = opts[key]
+                util.coerce_kw_type(ssl, key[4:], str)
+                del opts[key]
+        if len(ssl):
+            opts['ssl'] = ssl
+
+        # TODO: what about options like "cursorclass" and "conv" ?
         client_flag = opts.get('client_flag', 0)
         if self.dbapi is not None:
             try:
@@ -302,7 +312,7 @@ class MySQLDialect(ansisql.ANSIDialect):
                 client_flag |= CLIENT_FLAGS.FOUND_ROWS
             except:
                 pass
-        opts['client_flag'] = client_flag
+            opts['client_flag'] = client_flag
         return [[], opts]
 
     def create_execution_context(self, *args, **kwargs):