# HG changeset patch
# User catherine@Elli.myhome.westell.com
# Date 1215212066 14400
# Node ID dfb71885dd41409f223f4ff491adc6eb152f77e4
# Parent  6e346ae994b99923e5c47ca08d20b02f15065cf0
everything seems working

diff -r 6e346ae994b9 -r dfb71885dd41 sqlpyPlus.py
--- a/sqlpyPlus.py	Fri Jul 04 14:54:01 2008 -0400
+++ b/sqlpyPlus.py	Fri Jul 04 18:54:26 2008 -0400
@@ -508,8 +508,8 @@
     legalOracle = re.compile('[a-zA-Z_$#]')
 
     rowlimitPattern = pyparsing.Word(pyparsing.nums)('rowlimit')
-    terminators = pyparsing.oneOf('; \\s \\S \\c \\C \\t \\x \\h \n/\n')('terminator') + \
-                  pyparsing.Optional(rowlimitPattern)
+    terminatorPattern = pyparsing.oneOf('; \\s \\S \\c \\C \\t \\x \\h \n/\n')('terminator') + \
+                        pyparsing.Optional(rowlimitPattern)
     def do_select(self, arg, bindVarsIn=None, override_terminator=None):
         """Fetch rows from a table.
 
@@ -522,7 +522,7 @@
         """
         bindVarsIn = bindVarsIn or {}
         statement = self.parsed('select ' + arg)
-        self.query = statement.statement
+        self.query = statement.unterminated
         if override_terminator:
             statement['terminator'] = override_terminator
         statement['rowlimit'] = int(statement.rowlimit or 0)
@@ -533,7 +533,7 @@
             self.desc = self.curs.description
             self.rc = self.curs.rowcount
             if self.rc > 0:
-                self.stdout.write('\n%s\n' % (self.output(statement.terminator, rowlimit)))
+                self.stdout.write('\n%s\n' % (self.output(statement.terminator, statement.rowlimit)))
             if self.rc == 0:
                 print '\nNo rows Selected.\n'
             elif self.rc == 1: 
diff -r 6e346ae994b9 -r dfb71885dd41 sqlpython.py
--- a/sqlpython.py	Fri Jul 04 14:54:01 2008 -0400
+++ b/sqlpython.py	Fri Jul 04 18:54:26 2008 -0400
@@ -124,7 +124,8 @@
     do_sen = do_senora       
 
     def default(self, arg, do_everywhere = False):
-        self.query = self.finishStatement(arg).strip().rstrip(';')
+        statement = self.parsed(arg)
+        self.query = statement.unterminated
         try:
             self.varsUsed = sqlpyPlus.findBinds(self.query, self.binds, givenBindVars={})
             self.curs.execute(self.query, self.varsUsed)