Mercurial > sqlpython

changeset 150:b00a020b81c6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ready ? with 1.4.9
author catherine@dellzilla
date Fri, 26 Sep 2008 13:03:10 -0400
parents 3b1e25cc0e38
children 802d8df993da
files setup.py sqlpyPlus.py sqlpython.py
diffstat 3 files changed, 9 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/setup.py	Fri Sep 26 10:33:37 2008 -0400
+++ b/setup.py	Fri Sep 26 13:03:10 2008 -0400
@@ -18,7 +18,7 @@
       packages=find_packages(),
       py_modules = ['mysqlpy','completion','sqlpyPlus','sqlpython','pexpecter','output_templates'],    
       include_package_data=True,    
-      install_requires=['pyparsing','cmd2>=0.3.6','cx_Oracle','genshi'],
+      install_requires=['pyparsing','cmd2>=0.3.7','cx_Oracle','genshi'],
       keywords = 'client oracle database',
       license = 'MIT',
       platforms = ['any'],
--- a/sqlpyPlus.py	Fri Sep 26 10:33:37 2008 -0400
+++ b/sqlpyPlus.py	Fri Sep 26 13:03:10 2008 -0400
@@ -838,7 +838,7 @@
             try:
                 self.binds[var] = float(val)
                 return
-            except ValueError:
+            except ValueError: 
                 statekeeper = Statekeeper(self, ('autobind',))  
                 self.autobind = True
                 self.do_select('%s AS %s FROM dual;' % (val, var))
@@ -914,9 +914,13 @@
 
     def do_cat(self, arg):
         '''cat TABLENAME --> SELECT * FROM equivalent'''
-        targets = arg.strip().split()
+        if not arg:
+            print self.do_cat.__doc__
+            return
+        arg = self.parsed(arg)
+        targets = arg.unterminated.split()
         for target in targets:
-            self.do_select('* from %s' % target)
+            self.do_select('* from %s%s%s' % (target, arg.terminator, arg.rowlimit)) # permissive of space before terminator
 
     @options([make_option('-i', '--ignore-case', dest='ignorecase', action='store_true', help='Case-insensitive search')])        
     def do_grep(self, arg, opts):
--- a/sqlpython.py	Fri Sep 26 10:33:37 2008 -0400
+++ b/sqlpython.py	Fri Sep 26 13:03:10 2008 -0400
@@ -10,7 +10,7 @@
 
 import cmd2,getpass,binascii,cx_Oracle,re,os
 import pexpecter, sqlpyPlus
-    
+__version__ = '1.4.9'    
     # complication! separate sessions ->
     # separate transactions !!!!!
     # also: timeouts, other session failures