Mercurial > sqlpython
diff sqlpyPlus.py @ 21:8b55aaa52ce9
working on load, and preserving stdin/out
author | devlinjs@FA7CZA6N1254998.wrightpatterson.afmc.ds.af.mil |
---|---|
date | Wed, 19 Dec 2007 13:40:39 -0500 |
parents | d6d64c2e3b98 |
children | c99853267a44 |
line wrap: on
line diff
--- a/sqlpyPlus.py Wed Dec 19 11:49:23 2007 -0500 +++ b/sqlpyPlus.py Wed Dec 19 13:40:39 2007 -0500 @@ -342,6 +342,9 @@ return result class sqlpyPlus(sqlpython.sqlpython): + defaultExtension = 'sql' + multilineCommands = '''select insert update delete tselect + create drop alter'''.split() def __init__(self): sqlpython.sqlpython.__init__(self) self.binds = CaselessDict() @@ -351,9 +354,6 @@ self.spoolFile = None self.autobind = False self.failover = False - self.multiline = '''select insert update delete tselect - create drop alter'''.split() - def default(self, arg, do_everywhere=False): sqlpython.sqlpython.default(self, arg, do_everywhere) self.sqlBuffer.append(self.query) @@ -749,21 +749,6 @@ self.onecmd_plus_hooks(runme) do_r = do_run - def load(self, fname): - """Pulls command(s) into sql buffer. Returns number of commands loaded.""" - try: - f = open(fname, 'r') - except IOError, e: - try: - f = open('%s.sql' % fname, 'r') - except: - print 'Problem opening file %s: \n%s' % (fname, e) - return 0 - txt = f.read() - f.close() - result = commandSeparator.separate(txt) - self.history.extend(result) - return len(result) def do_ed(self, arg): 'ed [N]: brings up SQL from N commands ago in text editor, and puts result in SQL buffer.' fname = 'sqlpython_temp.sql'