# HG changeset patch
# User catherine@Elli.myhome.westell.com
# Date 1230135294 18000
# Node ID 78ddfa41e5c166a9d3a340be9faaab9d0a2fab2f
# Parent  df27f42fdff7f55b7375af9d8fac418374a13693
test almost fixed

diff -r df27f42fdff7 -r 78ddfa41e5c1 sqlpython/exampleSession.txt
--- 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
diff -r df27f42fdff7 -r 78ddfa41e5c1 sqlpython/sqlpyPlus.py
--- 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