# HG changeset patch
# User catherine@dellzilla
# Date 1229094849 18000
# Node ID 1c3df79fd088f898f01bcb4ddfb71066c2bc1dc1
# Parent  2ab0704d1e7de228e29e6cc8712590502602526c
\n\n finally works

diff -r 2ab0704d1e7d -r 1c3df79fd088 sqlpython/sqlpyPlus.py
--- a/sqlpython/sqlpyPlus.py	Wed Dec 10 16:33:35 2008 -0500
+++ b/sqlpython/sqlpyPlus.py	Fri Dec 12 10:14:09 2008 -0500
@@ -495,7 +495,7 @@
         return completions
     
     rowlimitPattern = pyparsing.Word(pyparsing.nums)('rowlimit')
-    terminators = '; \\C \\t \\i \\p \\l \\L \\b ' + ' '.join(output_templates.keys())
+    terminators = '; \\C \\t \\i \\p \\l \\L \\b '.split() + output_templates.keys()
 
     def do_select(self, arg, bindVarsIn=None, terminator=None):
         """Fetch rows from a table.
@@ -602,7 +602,7 @@
         descQ = descQueries.get(object_type)
         if descQ:
             for q in descQ:
-                self.do_select(self.parsed(q, terminator=arg.parsed.terminator, suffix=arg.parsed.suffix), 
+                self.do_select(self.parsed(q, terminator=arg.parsed.terminator or ';' , suffix=arg.parsed.suffix), 
                                bindVarsIn={'object_name':object_name, 'owner':owner})
         elif object_type == 'PACKAGE':
             packageContents = self.select_scalar_list(descQueries['PackageObjects'][0], {'package_name':object_name, 'owner':owner})