[Squirrel-sql-commits] sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle OraclePlugin.java, 1.33, 1.34

[Rob M. <man...@us...>]

Update of /cvsroot/squirrel-sql/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv30669/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle

Modified Files:
	OraclePlugin.java 
Log Message:
Added support for allowing a plugin to give a new session a custom IQueryTokenizer to allow for handling SQL that works in vender tools to be used in SQuirreL. Specifically, this allows the Oracle plugin to allow functions and procedures to be properly executed without requiring the user to use the statement separator creatively.  Also, support for file includes in Oracle sessions using "@" was added.

Index: OraclePlugin.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/OraclePlugin.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** OraclePlugin.java	16 Jan 2007 22:20:57 -0000	1.33
--- OraclePlugin.java	3 Feb 2007 14:46:34 -0000	1.34
***************
*** 19,22 ****
--- 19,35 ----
   */
  
+ import java.io.File;
+ import java.io.IOException;
+ import java.sql.Driver;
+ import java.sql.PreparedStatement;
+ import java.sql.ResultSet;
+ import java.sql.SQLException;
+ import java.sql.Statement;
+ import java.util.ArrayList;
+ import java.util.Hashtable;
+ import java.util.Iterator;
+ 
+ import javax.swing.SwingUtilities;
+ 
  import net.sourceforge.squirrel_sql.client.IApplication;
  import net.sourceforge.squirrel_sql.client.action.ActionCollection;
***************
*** 34,39 ****
  import net.sourceforge.squirrel_sql.client.session.ISQLPanelAPI;
  import net.sourceforge.squirrel_sql.client.session.ISession;
- import net.sourceforge.squirrel_sql.client.session.event.SessionAdapter;
- import net.sourceforge.squirrel_sql.client.session.event.SessionEvent;
  import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.INodeExpander;
  import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.DatabaseObjectInfoTab;
--- 47,50 ----
***************
*** 53,69 ****
  import net.sourceforge.squirrel_sql.plugins.oracle.SGAtrace.NewSGATraceWorksheetAction;
  import net.sourceforge.squirrel_sql.plugins.oracle.dboutput.NewDBOutputWorksheetAction;
! import net.sourceforge.squirrel_sql.plugins.oracle.expander.*;
  import net.sourceforge.squirrel_sql.plugins.oracle.explainplan.ExplainPlanExecuter;
  import net.sourceforge.squirrel_sql.plugins.oracle.invalidobjects.NewInvalidObjectsWorksheetAction;
  import net.sourceforge.squirrel_sql.plugins.oracle.sessioninfo.NewSessionInfoWorksheetAction;
! import net.sourceforge.squirrel_sql.plugins.oracle.tab.*;
! 
! import javax.swing.*;
! import java.io.File;
! import java.io.IOException;
! import java.sql.*;
! import java.util.ArrayList;
! import java.util.Hashtable;
! import java.util.Iterator;
  
  /**
--- 64,93 ----
  import net.sourceforge.squirrel_sql.plugins.oracle.SGAtrace.NewSGATraceWorksheetAction;
  import net.sourceforge.squirrel_sql.plugins.oracle.dboutput.NewDBOutputWorksheetAction;
! import net.sourceforge.squirrel_sql.plugins.oracle.expander.DefaultDatabaseExpander;
! import net.sourceforge.squirrel_sql.plugins.oracle.expander.InstanceParentExpander;
! import net.sourceforge.squirrel_sql.plugins.oracle.expander.PackageExpander;
! import net.sourceforge.squirrel_sql.plugins.oracle.expander.ProcedureExpander;
! import net.sourceforge.squirrel_sql.plugins.oracle.expander.SchemaExpander;
! import net.sourceforge.squirrel_sql.plugins.oracle.expander.SessionParentExpander;
! import net.sourceforge.squirrel_sql.plugins.oracle.expander.TableExpander;
! import net.sourceforge.squirrel_sql.plugins.oracle.expander.TriggerParentExpander;
! import net.sourceforge.squirrel_sql.plugins.oracle.expander.UserParentExpander;
  import net.sourceforge.squirrel_sql.plugins.oracle.explainplan.ExplainPlanExecuter;
  import net.sourceforge.squirrel_sql.plugins.oracle.invalidobjects.NewInvalidObjectsWorksheetAction;
  import net.sourceforge.squirrel_sql.plugins.oracle.sessioninfo.NewSessionInfoWorksheetAction;
! import net.sourceforge.squirrel_sql.plugins.oracle.tab.IndexColumnInfoTab;
! import net.sourceforge.squirrel_sql.plugins.oracle.tab.IndexDetailsTab;
! import net.sourceforge.squirrel_sql.plugins.oracle.tab.InstanceDetailsTab;
! import net.sourceforge.squirrel_sql.plugins.oracle.tab.ObjectSourceTab;
! import net.sourceforge.squirrel_sql.plugins.oracle.tab.OptionsTab;
! import net.sourceforge.squirrel_sql.plugins.oracle.tab.SequenceDetailsTab;
! import net.sourceforge.squirrel_sql.plugins.oracle.tab.SessionDetailsTab;
! import net.sourceforge.squirrel_sql.plugins.oracle.tab.SessionStatisticsTab;
! import net.sourceforge.squirrel_sql.plugins.oracle.tab.TriggerColumnInfoTab;
! import net.sourceforge.squirrel_sql.plugins.oracle.tab.TriggerDetailsTab;
! import net.sourceforge.squirrel_sql.plugins.oracle.tab.TriggerSourceTab;
! import net.sourceforge.squirrel_sql.plugins.oracle.tab.UserDetailsTab;
! import net.sourceforge.squirrel_sql.plugins.oracle.tab.ViewSourceTab;
! import net.sourceforge.squirrel_sql.plugins.oracle.tokenizer.OracleQueryTokenizer;
  
  /**
***************
*** 323,327 ****
           return null;
        }
! 
        GUIUtils.processOnSwingEventThread(new Runnable()
        {
--- 347,351 ----
           return null;
        }
!       session.setQueryTokenizer(new OracleQueryTokenizer());
        GUIUtils.processOnSwingEventThread(new Runnable()
        {