[Erp5-report] r42366 nicolas.dumazet - /erp5/trunk/products/ERP5Type/tests/utils.py

[nobody at svn.erp5.org]

Author: nicolas.dumazet
Date: Mon Jan 17 07:16:09 2011
New Revision: 42366

URL: http://svn.erp5.org?rev=42366&view=rev
Log:
support sockets in SQL connection strings

Modified:
    erp5/trunk/products/ERP5Type/tests/utils.py

Modified: erp5/trunk/products/ERP5Type/tests/utils.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/tests/utils.py?rev=42366&r1=42365&r2=42366&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/tests/utils.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/tests/utils.py [utf8] Mon Jan 17 07:16:09 2011
@@ -244,8 +244,14 @@ def getMySQLArguments():
   host = ''
   db, user = connection_string.split(' ', 1)
 
+  sock = ''
   if ' ' in user: # look for user password
-    user, password = user.split()
+    sp = user.split()
+    if len(sp) == 2:
+      user, password = sp
+    elif len(sp) == 3:
+      user, password, sock = sp
+      sock = '--socket=%s' % sock
     password = '-p%s' % password
 
   if "@" in db: # look for hostname
@@ -256,7 +262,7 @@ def getMySQLArguments():
     else:
       host = '-h %s' % host
 
-  return '-u %s %s %s %s' % (user, password, host, db)
+  return '-u %s %s %s %s %s' % (user, password, host, db, sock)
 
 def getExtraSqlConnectionStringList():
   """Return list of extra available SQL connection string