Mercurial > sqlpython

changeset 430:aa1a603740fe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
making progress, but there is something awful about threaded calls to sysdate
author catherine@dellzilla
date Mon, 25 Jan 2010 17:12:32 -0500
parents 76bf7f767c10
children cac7333f9ff5
files sqlpython/connections.py sqlpython/sqlpython.py
diffstat 2 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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)
     
--- 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: