# HG changeset patch
# User catherine@dellzilla
# Date 1265037328 18000
# Node ID 0a2474b76db6acd88c88a29a540ababe8ad9d3b4
# Parent  39a664a87c510cd6eec3f8b5b942c7dc14fac063
trying to make mysql connections work

diff -r 39a664a87c51 -r 0a2474b76db6 sqlpython/connections.py
--- a/sqlpython/connections.py	Sun Jan 31 08:17:58 2010 -0500
+++ b/sqlpython/connections.py	Mon Feb 01 10:15:28 2010 -0500
@@ -35,12 +35,15 @@
     
 class DatabaseInstance(object):
     import_failure = None
+    username = None
     password = None
+    port = None
     uri = None
     pickledir = os.path.join(os.getenv('HOME'), '.sqlpython')
     connection_uri_parser = re.compile('(postgres|oracle|mysql|sqlite|mssql):/(.*$)', re.IGNORECASE)
     
     def __init__(self, arg, opts, default_rdbms = 'oracle'):
+        opts.username = opts.username or opts.user
         self.default_rdbms = default_rdbms
         if not self.parse_connect_uri(arg):
             self.parse_connect_arg(arg, opts)
diff -r 39a664a87c51 -r 0a2474b76db6 sqlpython/sqlpython.py
--- a/sqlpython/sqlpython.py	Sun Jan 31 08:17:58 2010 -0500
+++ b/sqlpython/sqlpython.py	Mon Feb 01 10:15:28 2010 -0500
@@ -139,6 +139,8 @@
                    cmd2.make_option('-d', '--database', type='string', 
                                     help='Database name to connect to'),
                    cmd2.make_option('-U', '--username', type='string', 
+                                    help='Database user name to connect as'),
+                   cmd2.make_option('-u', '--user', type='string', 
                                     help='Database user name to connect as')
                    ])
     def do_connect(self, arg, opts):