sqlpython: sqlpyPlus.py comparison

comparison sqlpyPlus.py @ 3:cd23cd62de3c

history working pretty well

author	devlinjs@FA7CZA6N1254998.wrightpatterson.afmc.ds.af.mil
date	Mon, 03 Dec 2007 16:43:43 -0500
parents	59903dcaf327
children	23c3a58d7804

comparison

equal deleted inserted replaced

-:59903dcaf327
+:cd23cd62de3c
 except KeyError:
 if not givenBindVars.has_key(varname):
 print 'Bind variable %s not defined.' % (varname)
 return result
+class HistoryItem(str):
+def __init__(self, instr):
+str.__init__(self, instr)
+self.lowercase = self.lower()
+self.idx = None
+def pr(self):
+print '-------------------------[%d]' % (self.idx)
+print self
+class History(list):
+def append(self, new):
+new = HistoryItem(new)
+list.append(self, new)
+new.idx = len(self)
+def extend(self, new):
+for n in new:
+self.append(n)
+def get(self, getme):
+try:
+idx = int(getme)
+try:
+return [self[idx-1]]
+except IndexError:
+return []
+except ValueError:  # search for a string
+try:
+getme = getme.strip()
+except:
+print "Don't know how to handle %s." % (str(getme))
+return
+if getme.startswith(r'/') and getme.endswith(r'/'):
+finder = re.compile(getme[1:-1], re.DOTALL | re.MULTILINE | re.IGNORECASE)
+def isin(hi):
+return finder.search(hi)
+else:
+def isin(hi):
+return (getme.lower() in hi.lowercase)
+return [itm for itm in self[:-1] if isin(itm)]
 class sqlpyPlus(sqlpython.sqlpython):
 def __init__(self):
 sqlpython.sqlpython.__init__(self)
 self.binds = CaselessDict()
 self.sqlBuffer = []
-self.history = []
+self.history = History()
 self.settable = ['maxtselctrows', 'maxfetch', 'autobind', 'failover', 'timeout'] # settables must be lowercase
 self.stdoutBeforeSpool = sys.stdout
 self.spoolFile = None
 self.autobind = False
 self.failover = False
 args = line.split(None,1)
 args[0] = args[0].lower()
 statement = ' '.join(args)
 if args[0] in self.singleline:
 statement = sqlpython.finishStatement(statement)
+self.history.append(statement)
 return statement
 except Exception:
 return line
 def do_shortcuts(self,arg):
 self.write(query, fnames[n])
 diffMergeSearcher.invoke(fnames[0], fnames[1])
 bufferPosPattern = re.compile('\d+')
 rangeIndicators = ('-',':')
-def bufferPositions(self, arg):
-if not self.sqlBuffer:
+def last_matching_command(self, arg):
-return []
-arg = arg.strip(self.terminator)
-arg = arg.strip()
 if not arg:
-return [0]
+return self.history[-2]
-arg = arg.strip().lower()
+else:
-if arg in ('*', 'all', '-', ':'):
+history = self.history.get(arg)
-return range(len(self.sqlBuffer))
+if history:
+return history[-1]
-edges = [e for e in self.bufferPosPattern.findall(arg)]
+return None
-edges = [int(e) for e in edges]
-if len(edges) > 1:
-edges = edges[:2]
-else:
-if arg[0] in self.rangeIndicators or arg[-1] in self.rangeIndicators:
-edges.append(0)
-edges.sort()
-start = max(edges[0], 0)
-end = min(edges[-1], len(self.sqlBuffer)-1)
-return range(start, end+1)
 def do_run(self, arg):
-'run [N]: runs the SQL that was run N commands ago'
+"""run [arg]: re-runs an earlier command
-for pos in self.bufferPositions(arg):
-self.onecmd(self.sqlBuffer[-1-pos])
+no arg -> run most recent command
+arg is integer -> run one history item, by index
+arg is string -> run most recent command by string search
+arg is /enclosed in forward-slashes/ -> run most recent by regex
+"""
+'run [N]: runs the SQL that was run N commands ago'
+runme = self.last_matching_command(arg)
+print runme
+self.onecmd(runme)
+do_r = do_run
 def do_history(self, arg):
-for (i, itm) in enumerate(self.history):
+"""history [arg]: lists past commands issued
-print '-------------------------[%d]' % (i+1)
-print itm
+no arg -> list all
+arg is integer -> list one history item, by index
+arg is string -> string search
+arg is /enclosed in forward-slashes/ -> regular expression search
+"""
+if arg:
+history = self.history.get(arg)
+else:
+history = self.history
+for hi in history:
+hi.pr()
 def do_list(self, arg):
-'list [N]: lists the SQL that was run N commands ago'
+"""list: lists single most recent command issued"""
-for pos in self.bufferPositions(arg):
+self.last_matching_command(None).pr()
-print '*** %i statements ago ***' % pos
+do_hi = do_history
-print self.sqlBuffer[-1-pos]
+do_l = do_list
 def load(self, fname):
 """Pulls command(s) into sql buffer.  Returns number of commands loaded."""
-initialLength = len(self.sqlBuffer)
 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()
-self.sqlBuffer.extend(commandSeparator.separate(txt))
+result = commandSeparator.separate(txt)
-return len(self.sqlBuffer) - initialLength
+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 = 'mysqlpy_temp.sql'
+fname = 'sqlpython_temp.sql'
-try:
+buffer = self.last_matching_command(arg)
-buffer = self.sqlBuffer[-1 - (int(arg or 0))]
-except IndexError:
-buffer = ''
 f = open(fname, 'w')
 f.write(buffer)
 f.close()
 editSearcher.invoke(fname)
 self.load(fname)
 commandsLoaded = self.load(fname)
 if commandsLoaded:
 self.do_list('1-%d' % (commandsLoaded-1))
 def do_getrun(self, fname):
 'Brings SQL commands from a file to the in-memory SQL buffer, and executes them.'
-commandNums = range(self.load(fname))
+newCommands = self.load(fname) * -1
-commandNums.reverse()
+if newCommands:
-for commandNum in commandNums:
+for command in self.history[newCommands:]:
-self.do_run(str(commandNum))
+self.onecmd(command)
-self.sqlBuffer.pop()
 def do_psql(self, arg):
 '''Shortcut commands emulating psql's backslash commands.
 \c connect
 \d desc
 self.onecmd('q')
 except KeyError:
 print 'psql command \%s not yet supported.' % abbrev
 def do_save(self, fname):
 'save FILENAME: Saves most recent SQL command to disk.'
-f = open(fname, 'w')
+try:
-f.write(self.sqlBuffer[-1])
+f = open(fname, 'w')
-f.close()
+f.write(self.sqlBuffer[-1])
+f.close()
+except Exception, e:
+print 'Error saving %s: %s' % (fname, str(e))
 def do_print(self, arg):
 'print VARNAME: Show current value of bind variable VARNAME.'
 if arg:
 if arg[0] == ':':

Mercurial > sqlpython

comparison sqlpyPlus.py @ 3:cd23cd62de3c