changeset 204:1c3df79fd088

\n\n finally works
author catherine@dellzilla
date Fri, 12 Dec 2008 10:14:09 -0500
parents 2ab0704d1e7d
children c3dc0c6b6d8c ed46f2dba929
files sqlpython/sqlpyPlus.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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})