# HG changeset patch
# User catherine@dellzilla
# Date 1264457552 18000
# Node ID aa1a603740fe181716b03e3c176484b04279201f
# Parent  76bf7f767c1090b3cebab5691843773f795bbfaf
making progress, but there is something awful about threaded calls to sysdate

diff -r 76bf7f767c10 -r aa1a603740fe sqlpython/connections.py
--- a/sqlpython/connections.py	Mon Jan 25 15:59:00 2010 -0500
+++ b/sqlpython/connections.py	Mon Jan 25 17:12:32 2010 -0500
@@ -29,7 +29,6 @@
             return False
             
     def parse_connect_arg(self, arg, opts):
-        self.password = opts.password or getpass.getpass('Password: ')
         self.host = opts.hostname
         self.oracle_connect_mode = 0
         if opts.postgres:
@@ -43,6 +42,7 @@
         self.assign_args(arg, opts)
         self.db_name = opts.database or self.db_name
         self.port = self.port or self.default_port        
+        self.password = self.password or opts.password or getpass.getpass('Password: ')        
         self.uri = self.uri or '%s://%s:%s@%s:%s/%s' % (self.rdbms, self.username, self.password,
                                                          self.host, self.port, self.db_name)
     
diff -r 76bf7f767c10 -r aa1a603740fe sqlpython/sqlpython.py
--- a/sqlpython/sqlpython.py	Mon Jan 25 15:59:00 2010 -0500
+++ b/sqlpython/sqlpython.py	Mon Jan 25 17:12:32 2010 -0500
@@ -346,7 +346,6 @@
             rrows2 = range(len(toprint))
             for j in rrows2:
                 val = toprint[j][i]
-                #import pdb; pdb.set_trace()
                 if str(self.coltypes[i]) == "<type 'cx_Oracle.NUMBER'>":  # right align numbers - but must generalize!
                     toprint[j][i] = (" " * (maxcol-len(val))) + val
                 else: