# HG changeset patch
# User catherine@dellzilla
# Date 1233695304 18000
# Node ID d8674ac6197707f760d200033eaecafdd89a7211
# Parent  3a59ca05f9801f996f58b02ef397f3fded32501d
synch

diff -r 3a59ca05f980 -r d8674ac61977 sqlpython/sqlpyPlus.py
--- a/sqlpython/sqlpyPlus.py	Fri Jan 30 21:27:14 2009 -0500
+++ b/sqlpython/sqlpyPlus.py	Tue Feb 03 16:08:24 2009 -0500
@@ -659,8 +659,8 @@
         subprocess.call(['svn', 'commit', '-m', '"%s"' % opts.message or 'committed from sqlpython'])        
         
     all_users_option = make_option('-a', action='store_const', dest="scope",
-                                         default={'col':'', 'view':'user', 'schemas':'user'}, 
-                                         const={'col':', owner', 'view':'all', 'schemas':'all'},
+                                         default={'col':'', 'view':'user', 'schemas':'user', 'firstcol': ''}, 
+                                         const={'col':', owner', 'view':'all', 'schemas':'all', 'firstcol': 'owner, '},
                                          help='Describe all objects (not just my own)')                
     @options([all_users_option,
               make_option('-c', '--col', action='store_true', help='find column'),
@@ -671,11 +671,11 @@
         capArg = arg.upper()
         
         if opts.col:
-            sql = "SELECT table_name, column_name %s FROM %s_tab_columns where column_name like '%%%s%%';" \
-                % (opts.scope['col'], opts.scope['view'], capArg)
+            sql = "SELECT table_name, column_name %s FROM %s_tab_columns where column_name like '%%%s%%' ORDER BY %s table_name, column_name;" \
+                % (opts.scope['col'], opts.scope['view'], capArg, opts.scope['firstcol'])
         elif opts.table:
-            sql = "SELECT table_name %s from %s_tables where table_name like '%%%s%%';" \
-                % (opts.scope['col'], opts.scope['view'], capArg)
+            sql = "SELECT table_name %s from %s_tables where table_name like '%%%s%%' ORDER BY %s table_name;" \
+                % (opts.scope['col'], opts.scope['view'], capArg, opts.scope['firstcol'])
         else:
             sql = "SELECT * from %s_source where UPPER(text) like '%%%s%%';" % (opts.scope['view'], capArg)
         self.do_select(self.parsed(sql, terminator=arg.parsed.terminator or ';', suffix=arg.parsed.suffix))