[Squirrel-sql-commits] sql12/plugins/derby/src/net/sourceforge/squirrel_sql/plugins/derby/tab TriggerSourceTab.java, 1.3, 1.4

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

Update of /cvsroot/squirrel-sql/sql12/plugins/derby/src/net/sourceforge/squirrel_sql/plugins/derby/tab
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10430/plugins/derby/src/net/sourceforge/squirrel_sql/plugins/derby/tab

Modified Files:
	TriggerSourceTab.java 
Log Message:
Added tests for plugin source tabs to ensure that ResultSets and Statements are being closed properly.  Fixed a couple of cases where they were not.

Index: TriggerSourceTab.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/plugins/derby/src/net/sourceforge/squirrel_sql/plugins/derby/tab/TriggerSourceTab.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TriggerSourceTab.java	22 Apr 2007 11:14:30 -0000	1.3
--- TriggerSourceTab.java	28 Nov 2008 23:00:44 -0000	1.4
***************
*** 1,3 ****
--- 1,4 ----
  package net.sourceforge.squirrel_sql.plugins.derby.tab;
+ 
  /*
   * Copyright (C) 2006 Rob Manning
***************
*** 27,33 ****
  import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
  import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
  /**
   * This class will display the source for a Derby trigger.
!  *
   * @author manningr
   */
--- 28,35 ----
  import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
  import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
+ 
  /**
   * This class will display the source for a Derby trigger.
!  * 
   * @author manningr
   */
***************
*** 35,87 ****
  {
  	/** SQL that retrieves the source of a stored procedure. */
! 	private static String SQL =
!         "select 'CREATE TRIGGER ' || t.TRIGGERNAME||' \n' " +
!         "    ||(select " +
!         "         CASE " +
!         "         WHEN t3.FIRINGTIME='B' THEN 'BEFORE' " +
!         "         WHEN t3.FIRINGTIME='A' THEN 'AFTER' " +
!         "         END " +
!         "       from SYS.SYSTRIGGERS t3 " +
!         "       where t.TRIGGERID = t3.TRIGGERID) " +
!         "    || ' ' " +
!         "    ||(select CASE " +
!         "         WHEN t2.EVENT='U' THEN 'UPDATE' " +
!         "         WHEN t2.EVENT='D' THEN 'DELETE' " +
!         "         WHEN t2.EVENT='I' THEN 'INSERT' " +
!         "         END " +
!         "       from SYS.SYSTRIGGERS t2 " +
!         "       where t.TRIGGERID = t2.TRIGGERID) " +
!         "     ||' ON ' " +
!         "     || ta.TABLENAME || ' \n'" +
!         "     ||(select " +
!         "        CASE " +
!         "          WHEN t4.REFERENCINGOLD = 0 THEN '' " +
!         "          WHEN t4.REFERENCINGOLD = 1 " +
!         "            THEN ' REFERENCING OLD AS ' || t4.OLDREFERENCINGNAME || ' \n'" +
!         "        END " +
!         "        from SYS.SYSTRIGGERS t4 " +
!         "        where t.TRIGGERID = t4.TRIGGERID) " +
!         "     ||(select " +
!         "        CASE " +
!         "          WHEN t5.REFERENCINGNEW = 0 THEN '' " +
!         "          WHEN t5.REFERENCINGNEW = 1 " +
!         "            THEN ' REFERENCING NEW AS ' || t5.NEWREFERENCINGNAME || ' \n'" +
!         "        END " +
!         "        from SYS.SYSTRIGGERS t5 " +
!         "        where t.TRIGGERID = t5.TRIGGERID) " +
!         "     ||' FOR EACH ROW MODE DB2SQL \n' " +
!         "     || t.triggerdefinition " +
!         "from SYS.SYSTRIGGERS t, SYS.SYSTABLES ta, SYS.SYSSCHEMAS s " +
!         "where t.TABLEID = ta.TABLEID " +
!         "and s.SCHEMAID = t.SCHEMAID " +
!         "and t.TRIGGERNAME = ? " +
!         "and s.SCHEMANAME = ? ";
!     
  	/** Logger for this class. */
! 	private final static ILogger s_log =
! 		LoggerController.createLogger(TriggerSourceTab.class);
  
! 	public TriggerSourceTab(String hint)
! 	{
  		super(hint);
  	}
--- 37,63 ----
  {
  	/** SQL that retrieves the source of a stored procedure. */
! 	private static String SQL = "select 'CREATE TRIGGER ' || t.TRIGGERNAME||' \n' " + "    ||(select "
! 	      + "         CASE " + "         WHEN t3.FIRINGTIME='B' THEN 'BEFORE' "
! 	      + "         WHEN t3.FIRINGTIME='A' THEN 'AFTER' " + "         END "
! 	      + "       from SYS.SYSTRIGGERS t3 " + "       where t.TRIGGERID = t3.TRIGGERID) " + "    || ' ' "
! 	      + "    ||(select CASE " + "         WHEN t2.EVENT='U' THEN 'UPDATE' "
! 	      + "         WHEN t2.EVENT='D' THEN 'DELETE' " + "         WHEN t2.EVENT='I' THEN 'INSERT' "
! 	      + "         END " + "       from SYS.SYSTRIGGERS t2 " + "       where t.TRIGGERID = t2.TRIGGERID) "
! 	      + "     ||' ON ' " + "     || ta.TABLENAME || ' \n'" + "     ||(select " + "        CASE "
! 	      + "          WHEN t4.REFERENCINGOLD = 0 THEN '' " + "          WHEN t4.REFERENCINGOLD = 1 "
! 	      + "            THEN ' REFERENCING OLD AS ' || t4.OLDREFERENCINGNAME || ' \n'" + "        END "
! 	      + "        from SYS.SYSTRIGGERS t4 " + "        where t.TRIGGERID = t4.TRIGGERID) "
! 	      + "     ||(select " + "        CASE " + "          WHEN t5.REFERENCINGNEW = 0 THEN '' "
! 	      + "          WHEN t5.REFERENCINGNEW = 1 "
! 	      + "            THEN ' REFERENCING NEW AS ' || t5.NEWREFERENCINGNAME || ' \n'" + "        END "
! 	      + "        from SYS.SYSTRIGGERS t5 " + "        where t.TRIGGERID = t5.TRIGGERID) "
! 	      + "     ||' FOR EACH ROW MODE DB2SQL \n' " + "     || t.triggerdefinition "
! 	      + "from SYS.SYSTRIGGERS t, SYS.SYSTABLES ta, SYS.SYSSCHEMAS s " + "where t.TABLEID = ta.TABLEID "
! 	      + "and s.SCHEMAID = t.SCHEMAID " + "and t.TRIGGERNAME = ? " + "and s.SCHEMANAME = ? ";
! 
  	/** Logger for this class. */
! 	private final static ILogger s_log = LoggerController.createLogger(TriggerSourceTab.class);
  
! 	public TriggerSourceTab(String hint) {
  		super(hint);
  	}
***************
*** 92,104 ****
  		final IDatabaseObjectInfo doi = getDatabaseObjectInfo();
  
!         if (s_log.isDebugEnabled()) {
!             s_log.debug("Running SQL: "+SQL);
!             s_log.debug("Trigger Name="+doi.getSimpleName());
!             s_log.debug("Schema Name="+doi.getSchemaName());
!         }
  		ISQLConnection conn = session.getSQLConnection();
  		PreparedStatement pstmt = conn.prepareStatement(SQL);
  		pstmt.setString(1, doi.getSimpleName());
!         pstmt.setString(2, doi.getSchemaName());
  		return pstmt;
  	}
--- 68,81 ----
  		final IDatabaseObjectInfo doi = getDatabaseObjectInfo();
  
! 		if (s_log.isDebugEnabled())
! 		{
! 			s_log.debug("Running SQL: " + SQL);
! 			s_log.debug("Trigger Name=" + doi.getSimpleName());
! 			s_log.debug("Schema Name=" + doi.getSchemaName());
! 		}
  		ISQLConnection conn = session.getSQLConnection();
  		PreparedStatement pstmt = conn.prepareStatement(SQL);
  		pstmt.setString(1, doi.getSimpleName());
! 		pstmt.setString(2, doi.getSchemaName());
  		return pstmt;
  	}