[Squirrel-sql-commits] sql12/plugins/derby/src/net/sourceforge/squirrel_sql/plugins/derby/tab ProcedureSourceTab.java, 1.1, 1.2

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

Update of /cvsroot/squirrel-sql/sql12/plugins/derby/src/net/sourceforge/squirrel_sql/plugins/derby/tab
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv8133/plugins/derby/src/net/sourceforge/squirrel_sql/plugins/derby/tab

Modified Files:
	ProcedureSourceTab.java 
Log Message:
Pass setting for statement separator to procedure source tab.  Changed the tab to extend FormattedSourceTab which reduces code duplication and formats the procedure source code.

Index: ProcedureSourceTab.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/plugins/derby/src/net/sourceforge/squirrel_sql/plugins/derby/tab/ProcedureSourceTab.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ProcedureSourceTab.java	6 Dec 2009 00:11:13 -0000	1.1
--- ProcedureSourceTab.java	16 Dec 2009 14:53:04 -0000	1.2
***************
*** 2,7 ****
  
  /*
!  * Copyright (C) 2009 Rob Manning
!  * man...@us...
   *
   * This library is free software; you can redistribute it and/or
--- 2,7 ----
  
  /*
!  * Copyright (C) 2009 Glenn Hobbs
!  * bas...@us...
   *
   * This library is free software; you can redistribute it and/or
***************
*** 20,68 ****
   */
  
! import java.sql.PreparedStatement;
! import java.sql.SQLException;
! 
! import net.sourceforge.squirrel_sql.client.session.ISession;
! import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.BaseSourceTab;
! import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo;
! import net.sourceforge.squirrel_sql.fw.sql.ISQLConnection;
! import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
! import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
  
! public class ProcedureSourceTab  extends BaseSourceTab {
  
  	private static String SQL = 
! 		"SELECT "+ 
! 		  " 'CREATE PROCEDURE '||SCHEMAA.SCHEMANAME||'.'||ALIAS.ALIAS||'\n '||"+
! 		  " SUBSTR(CAST(ALIASINFO AS VARCHAR(4000)),LOCATE('(',CAST(ALIASINFO AS VARCHAR(4000))))||'\n '||"+
! 		  " 'EXTERNAL NAME '''||ALIAS.JAVACLASSNAME||'.'||SUBSTR(CAST(ALIASINFO AS VARCHAR(4000)),1,LOCATE('(',CAST(ALIASINFO AS VARCHAR(4000)))-1)||''''"+
! 		" FROM"+ 
! 		"  SYS.SYSALIASES ALIAS,"+
! 		"  SYS.SYSSCHEMAS SCHEMAA"+
! 		" WHERE"+ 
! 		"  ALIAS.SCHEMAID = SCHEMAA.SCHEMAID AND" +
! 		"  ALIAS = ? and SCHEMAA.SCHEMANAME = ?";		
! 	public ProcedureSourceTab(String hint) {
  		super(hint);
  	}
  
! 	private final static ILogger s_log = LoggerController.createLogger(ProcedureSourceTab.class);
! 
! 	protected PreparedStatement createStatement() throws SQLException
  	{
! 		final ISession session = getSession();
! 		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;
  	}
  
--- 20,54 ----
   */
  
! import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.FormattedSourceTab;
  
! public class ProcedureSourceTab  extends FormattedSourceTab {
  
  	private static String SQL = 
! 		"SELECT " +
! 		"'CREATE PROCEDURE '||SCHEMAA.SCHEMANAME||'.'||ALIAS.ALIAS||'\n '|| SUBSTR " +
! 		"( " +
! 		"   CAST(ALIASINFO AS VARCHAR(4000)),LOCATE('(',CAST(ALIASINFO AS VARCHAR(4000))) " +
! 		") " +
! 		"||'\n '|| 'EXTERNAL NAME '''||ALIAS.JAVACLASSNAME||'.'||SUBSTR " +
! 		"( " +
! 		"   CAST(ALIASINFO AS VARCHAR(4000)), " +
! 		"   1, " +
! 		"   LOCATE('(',CAST(ALIASINFO AS VARCHAR(4000)))-1 " +
! 		") " +
! 		"||'''' " +
! 		"FROM SYS.SYSALIASES ALIAS, SYS.SYSSCHEMAS SCHEMAA " +
! 		"WHERE ALIAS.SCHEMAID = SCHEMAA.SCHEMAID " +
! 		"and SCHEMAA.SCHEMANAME = ? " +
! 		"AND ALIAS = ? ";	
! 	
! 	public ProcedureSourceTab(String hint, String stmtSep) {
  		super(hint);
+ 		super.setupFormatter(stmtSep, null);
  	}
  
! 	@Override
! 	protected String getSqlStatement()
  	{
! 		return SQL;
  	}