Mercurial > sqlpython
changeset 210:78ddfa41e5c1
test almost fixed
author | catherine@Elli.myhome.westell.com |
---|---|
date | Wed, 24 Dec 2008 11:14:54 -0500 |
parents | df27f42fdff7 |
children | 7b2787c46516 |
files | sqlpython/exampleSession.txt sqlpython/sqlpyPlus.py |
diffstat | 2 files changed, 4 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/sqlpython/exampleSession.txt Mon Dec 22 09:43:28 2008 -0500 +++ b/sqlpython/exampleSession.txt Wed Dec 24 11:14:54 2008 -0500 @@ -308,3 +308,7 @@ testschema@orcl> drop table play; Executed + +testschema@orcl> foo + +bar \ No newline at end of file
--- a/sqlpython/sqlpyPlus.py Mon Dec 22 09:43:28 2008 -0500 +++ b/sqlpython/sqlpyPlus.py Wed Dec 24 11:14:54 2008 -0500 @@ -497,10 +497,6 @@ rowlimitPattern = pyparsing.Word(pyparsing.nums)('rowlimit') terminators = '; \\C \\t \\i \\p \\l \\L \\b '.split() + output_templates.keys() - def expandSelect(self, arg): - #w + Optional(CaselessKeyword('AS')) + Optional(w ^ dblQuotedString) + (CaselessKeyword('FROM') ^ ',') - return arg - def do_select(self, arg, bindVarsIn=None, terminator=None): """Fetch rows from a table. @@ -518,7 +514,6 @@ rowlimit = 0 print "Specify desired number of rows after terminator (not '%s')" % arg.parsed.suffix self.varsUsed = findBinds(arg, self.binds, bindVarsIn) - arg = self.expandSelect(arg) self.curs.execute('select ' + arg, self.varsUsed) self.rows = self.curs.fetchmany(min(self.maxfetch, (rowlimit or self.maxfetch))) self.rc = self.curs.rowcount