sqlpython: sqlpyPlus.py comparison

comparison sqlpyPlus.py @ 121:3dd852ab45c0

fixing terminator stripping

author	catherine@Elli.myhome.westell.com
date	Wed, 23 Jul 2008 14:29:15 -0400
parents	e11bbeb3f34c
children	61e2a824b66b

comparison

equal deleted inserted replaced

-:e11bbeb3f34c
+:3dd852ab45c0
 WHERE object_name = :object_name
 AND      owner = :owner
 AND      package_name IS NULL
 AND      argument_name IS NOT NULL
 ORDER BY sequence;""",
-descQueries['PROCEDURE'])
+descQueries['PROCEDURE'][0])
 queries = {
 'resolve': """
 SELECT object_type, object_name, owner FROM (
 SELECT object_type, object_name, user owner, 1 priority
 @options([make_option('-f', '--full', action='store_true', help='get dependent objects as well')])
 def do_pull(self, arg, opts):
 """Displays source code."""
-object_type, owner, object_name = self.resolve(arg.strip(self.terminator).upper())
+arg = self.parsed(arg).unterminated
+object_type, owner, object_name = self.resolve(arg.upper())
 if not object_type:
 return
 self.stdout.write("%s %s.%s\n" % (object_type, owner, object_name))
 self.stdout.write(str(self.curs.callfunc('DBMS_METADATA.GET_DDL', cx_Oracle.CLOB,
 [object_type, object_name, owner])))
 self.stdout.write(str(self.curs.callfunc('DBMS_METADATA.GET_DEPENDENT_DDL', cx_Oracle.CLOB,
 [dependent_type, object_name, owner])))
 except cx_Oracle.DatabaseError:
 pass
-@options([make_option('-i', '--insensitive', action='store_true', help='case-insensitive search')])
+@options([make_option('-i', '--insensitive', action='store_true', help='case-insensitive search'),
+make_option('-c', '--col', action='store_true', help='find column')])
 def do_find(self, arg, opts):
-"""Finds argument in source code."""
+"""Finds argument in source code or (with -c) in column definitions."""
-if opts.insensitive:
+arg = self.parsed(arg).unterminated.upper()
-searchfor = "LOWER(text)"
+if opts.col:
-arg = arg.lower()
+self.do_select("table_name, column_name from all_tab_columns where column_name like '%%%s%%'" % (arg))
 else:
-searchfor = "text"
+if opts.insensitive:
-self.do_select("* from all_source where %s like '%%%s%%'" % (searchfor, arg))
+searchfor = "LOWER(text)"
+arg = arg.lower()
+else:
+searchfor = "text"
+self.do_select("* from all_source where %s like '%%%s%%'" % (searchfor, arg))
 @options([make_option('-a','--all',action='store_true',
 help='Describe all objects (not just my own)')])
 def do_describe(self, arg, opts):
 "emulates SQL*Plus's DESCRIBE"
+arg = self.parsed(arg).unterminated.upper()
 if opts.all:
 which_view = (', owner', 'all')
 else:
 which_view = ('', 'user')
 if not arg:
 self.do_select("""object_name, object_type%s FROM %s_objects WHERE object_type IN ('TABLE','VIEW','INDEX') ORDER BY object_name""" % which_view)
 return
-object_type, owner, object_name = self.resolve(arg.strip(self.terminator).upper())
+object_type, owner, object_name = self.resolve(arg)
 if not object_type:
 self.do_select("""object_name, object_type%s FROM %s_objects
 WHERE object_type IN ('TABLE','VIEW','INDEX')
 AND   object_name LIKE '%%%s%%'
 ORDER BY object_name""" %
 self.stdout.write(packageObj_name + '\n')
 self.do_select(descQueries['PackageObjArgs'][0],bindVarsIn={'package_name':object_name, 'owner':owner, 'object_name':packageObj_name})
 do_desc = do_describe
 def do_deps(self, arg):
-object_type, owner, object_name = self.resolve(arg.strip(self.terminator).upper())
+arg = self.parsed(arg).unterminated.upper()
+object_type, owner, object_name = self.resolve(arg)
 if object_type == 'PACKAGE BODY':
 q = "and (type != 'PACKAGE BODY' or name != :object_name)'"
 object_type = 'PACKAGE'
 else:
 q = ""
 %s""" % (q)
 self.do_select(q, {'object_name':object_name, 'object_type':object_type, 'owner':owner})
 def do_comments(self, arg):
 'Prints comments on a table and its columns.'
-object_type, owner, object_name = self.resolve(arg.strip(self.terminator).upper())
+arg = self.parsed(arg).unterminated.upper()
+object_type, owner, object_name = self.resolve(arg)
 if object_type:
 self.curs.execute(queries['tabComments'],{'table_name':object_name, 'owner':owner})
 self.stdout.write("%s %s.%s: %s\n" % (object_type, owner, object_name, self.curs.fetchone()[0]))
 self.do_select(queries['colComments'],bindVarsIn={'owner':owner, 'object_name': object_name})
 print self.do_compare.__doc__
 return
 for n in range(len(args2)):
 query = args2[n]
 fnames.append('compare%s.txt' % n)
+#TODO: update this terminator-stripping
 if query.rstrip()[-1] != self.terminator:
 query = '%s%s' % (query, self.terminator)
 self.onecmd_plus_hooks('%s > %s' % (query, fnames[n]))
 diffMergeSearcher.invoke(fnames[0], fnames[1])
 else:
 for (var, val) in self.binds.items():
 print ':%s = %s' % (var, val)
 def do_setbind(self, arg):
-arg = self.parsed(arg).statement  # removes terminators?
+arg = self.parsed(arg).unterminated
 args = arg.split(None, 2)
 if len(args) < 2:
 self.do_print(arg)
 return
 elif len(args) > 2 and args[1] in ('=',':='):
 try:
 self.binds[var] = float(val)
 return
 except ValueError:
 try:
-self.binds[var] = self.curs.callfunc(val, [])
+varsUsed = findBinds(arg, self.binds, {})
+self.binds[var] = self.curs.callfunc(val, varsUsed) #TODO: wrong args
+# NotSupportedError: Variable_TypeByPythonType(): unhandled data type
+# need to warn that it's a date?
 return
 except:
 pass
-# TODO: when setting
 print 'Could not parse ', args
 def do_exec(self, arg):
 if arg[0] == ':':
 print e
 import traceback
 traceback.print_exc(file=sys.stdout)
 def do_refs(self, arg):
-object_type, owner, object_name = self.resolve(arg.strip(self.terminator).upper())
+arg = self.parsed(arg).unterminated.upper()
+object_type, owner, object_name = self.resolve(arg)
 if object_type == 'TABLE':
 self.do_select(queries['refs'],bindVarsIn={'object_name':object_name, 'owner':owner})
 def _test():
 import doctest

Mercurial > sqlpython

comparison sqlpyPlus.py @ 121:3dd852ab45c0