Mercurial > sqlpython
diff sqlpyPlus.py @ 65:047f82acdc8f
merging in bugfixes & pgsql additions
author | catherine@cordelia |
---|---|
date | Mon, 07 Apr 2008 09:51:18 -0400 |
parents | 16618ff91c63 4f80329a1905 |
children | ffd095bf466c 13edc2731d6b |
line wrap: on
line diff
--- a/sqlpyPlus.py Mon Apr 07 09:37:55 2008 -0400 +++ b/sqlpyPlus.py Mon Apr 07 09:51:18 2008 -0400 @@ -187,7 +187,7 @@ } import sys, os, re, sqlpython, cx_Oracle, pyparsing -from cmd2 import flagReader +from cmd2 import flagReader, Cmd if float(sys.version[:3]) < 2.3: def enumerate(lst): @@ -665,17 +665,9 @@ bufferPosPattern = re.compile('\d+') rangeIndicators = ('-',':') - def do_get(self, fname): - 'Brings SQL commands from a file to the in-memory SQL buffer.' - numCommandsLoaded = self.load(fname) - if numCommandsLoaded: - self.do_list('%d -' % (len(self.history) - numCommandsLoaded)) def do_getrun(self, fname): 'Brings SQL commands from a file to the in-memory SQL buffer, and executes them.' - numCommandsLoaded = self.do_load(fname) * -1 - if numCommandsLoaded: - for command in self.history[numCommandsLoaded:]: - self.onecmd_plus_hooks(command) + Cmd.do_load(self, fname) def do_psql(self, arg): '''Shortcut commands emulating psql's backslash commands. @@ -742,7 +734,7 @@ def do_print(self, arg): 'print VARNAME: Show current value of bind variable VARNAME.' - if arg: + if arg: if arg[0] == ':': arg = arg[1:] try: