Thread: [Squirrel-sql-commits] sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/expander
A Java SQL client for any JDBC compliant database
Brought to you by:
colbell,
gerdwagner
From: Gerd W. <ger...@us...> - 2006-04-19 07:55:43
|
Update of /cvsroot/squirrel-sql/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/expander In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31211/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/expander Modified Files: PackageExpander.java ProcedureExpander.java Log Message: First step of making SchemaInfo the central cache. Index: ProcedureExpander.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/expander/ProcedureExpander.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ProcedureExpander.java 25 Sep 2005 02:56:14 -0000 1.2 --- ProcedureExpander.java 19 Apr 2006 07:55:33 -0000 1.3 *************** *** 68,80 **** IProcedureInfo[] procs = null; String objFilter = session.getProperties().getObjectFilter(); ! try ! { ! procs = md.getProcedures(catalogName, schemaName, objFilter != null && objFilter.length() > 0 ? objFilter :"%"); ! } ! catch (SQLException ignore) ! { ! // Assume DBMS doesn't support procedures. ! procs = new IProcedureInfo[0]; ! } for (int i = 0; i < procs.length; ++i) { --- 68,74 ---- IProcedureInfo[] procs = null; String objFilter = session.getProperties().getObjectFilter(); ! //procs = md.getProcedures(catalogName, schemaName, objFilter != null && objFilter.length() > 0 ? objFilter :"%"); ! String procedureNamePattern = objFilter != null && objFilter.length() > 0 ? objFilter : "%"; ! procs = session.getSchemaInfo().getStoredProceduresInfos(catalogName, schemaName, procedureNamePattern); for (int i = 0; i < procs.length; ++i) { Index: PackageExpander.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/expander/PackageExpander.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** PackageExpander.java 25 Sep 2005 02:56:14 -0000 1.5 --- PackageExpander.java 19 Apr 2006 07:55:33 -0000 1.6 *************** *** 67,79 **** IProcedureInfo[] procs = null; final String objFilter = session.getProperties().getObjectFilter(); ! try ! { ! procs = md.getProcedures(catalogName, schemaName, objFilter != null && objFilter.length() > 0 ? objFilter :"%"); ! } ! catch (SQLException ignore) ! { ! // Assume DBMS doesn't support procedures. ! procs = new IProcedureInfo[0]; ! } for (int i = 0; i < procs.length; ++i) { --- 67,73 ---- IProcedureInfo[] procs = null; final String objFilter = session.getProperties().getObjectFilter(); ! //procs = md.getProcedures(catalogName, schemaName, objFilter != null && objFilter.length() > 0 ? objFilter :"%"); ! String procNamePattern = objFilter != null && objFilter.length() > 0 ? objFilter : "%"; ! procs = session.getSchemaInfo().getStoredProceduresInfos(catalogName, schemaName, procNamePattern); for (int i = 0; i < procs.length; ++i) { |