You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
(121) |
May
(188) |
Jun
(134) |
Jul
(115) |
Aug
(201) |
Sep
(22) |
Oct
(22) |
Nov
(15) |
Dec
(32) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(20) |
Feb
(4) |
Mar
(1) |
Apr
(84) |
May
(107) |
Jun
(101) |
Jul
(131) |
Aug
(66) |
Sep
(55) |
Oct
(189) |
Nov
(164) |
Dec
(60) |
| 2006 |
Jan
(75) |
Feb
(107) |
Mar
(117) |
Apr
(115) |
May
(91) |
Jun
(91) |
Jul
(225) |
Aug
(151) |
Sep
(117) |
Oct
(165) |
Nov
(263) |
Dec
(233) |
| 2007 |
Jan
(244) |
Feb
(116) |
Mar
(185) |
Apr
(263) |
May
(149) |
Jun
(292) |
Jul
(260) |
Aug
(306) |
Sep
(130) |
Oct
(61) |
Nov
(103) |
Dec
(144) |
| 2008 |
Jan
(112) |
Feb
(55) |
Mar
(116) |
Apr
(76) |
May
(69) |
Jun
(130) |
Jul
(75) |
Aug
(56) |
Sep
(76) |
Oct
(87) |
Nov
(403) |
Dec
(410) |
| 2009 |
Jan
(132) |
Feb
(168) |
Mar
(197) |
Apr
(67) |
May
(8) |
Jun
(44) |
Jul
(144) |
Aug
(126) |
Sep
(88) |
Oct
(3) |
Nov
(81) |
Dec
(97) |
| 2010 |
Jan
(238) |
Feb
(41) |
Mar
(61) |
Apr
(37) |
May
(31) |
Jun
(22) |
Jul
(92) |
Aug
(105) |
Sep
(46) |
Oct
(45) |
Nov
(55) |
Dec
(92) |
| 2011 |
Jan
(51) |
Feb
(21) |
Mar
(57) |
Apr
(20) |
May
(32) |
Jun
(29) |
Jul
(26) |
Aug
(50) |
Sep
(59) |
Oct
(25) |
Nov
(79) |
Dec
(2) |
| 2012 |
Jan
(14) |
Feb
(31) |
Mar
(11) |
Apr
(9) |
May
(13) |
Jun
(9) |
Jul
(6) |
Aug
(12) |
Sep
(16) |
Oct
(37) |
Nov
(12) |
Dec
(7) |
| 2013 |
Jan
(9) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Rob M. <man...@us...> - 2009-12-16 14:53:14
|
Update of /cvsroot/squirrel-sql/sql12/plugins/derby/src/net/sourceforge/squirrel_sql/plugins/derby In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv8133/plugins/derby/src/net/sourceforge/squirrel_sql/plugins/derby Modified Files: DerbyPlugin.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: DerbyPlugin.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/plugins/derby/src/net/sourceforge/squirrel_sql/plugins/derby/DerbyPlugin.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** DerbyPlugin.java 6 Dec 2009 00:11:13 -0000 1.14 --- DerbyPlugin.java 16 Dec 2009 14:53:03 -0000 1.15 *************** *** 260,268 **** */ private void updateTreeApi(ISession session) { ! _treeAPI = session.getSessionInternalFrame().getObjectTreeAPI(); _treeAPI.addDetailTab(DatabaseObjectType.PROCEDURE, ! new ProcedureSourceTab(i18n.SHOW_PROCEDURE_SOURCE)); _treeAPI.addDetailTab(DatabaseObjectType.VIEW, --- 260,269 ---- */ private void updateTreeApi(ISession session) { ! DerbyPreferenceBean prefBean = (DerbyPreferenceBean) _prefsManager.getPreferences(); ! _treeAPI = session.getSessionInternalFrame().getObjectTreeAPI(); _treeAPI.addDetailTab(DatabaseObjectType.PROCEDURE, ! new ProcedureSourceTab(i18n.SHOW_PROCEDURE_SOURCE, prefBean.getStatementSeparator())); _treeAPI.addDetailTab(DatabaseObjectType.VIEW, |
|
From: Rob M. <man...@us...> - 2009-12-16 14:53:13
|
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; } |
|
From: Rob M. <man...@us...> - 2009-12-16 02:07:41
|
Update of /cvsroot/squirrel-sql/sql12/test/src/net/sourceforge/squirrel_sql/client In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv6064/test/src/net/sourceforge/squirrel_sql/client Modified Files: AppTestUtil.java Log Message: Return mock alias color properties bean from SQLAlias. Index: AppTestUtil.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/test/src/net/sourceforge/squirrel_sql/client/AppTestUtil.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** AppTestUtil.java 25 Jul 2009 00:52:32 -0000 1.3 --- AppTestUtil.java 16 Dec 2009 02:07:33 -0000 1.4 *************** *** 38,41 **** --- 38,42 ---- import net.sourceforge.squirrel_sql.client.gui.db.ISQLAliasExt; import net.sourceforge.squirrel_sql.client.gui.db.SQLAlias; + import net.sourceforge.squirrel_sql.client.gui.db.SQLAliasColorProperties; import net.sourceforge.squirrel_sql.client.gui.session.SessionInternalFrame; import net.sourceforge.squirrel_sql.client.gui.session.SessionPanel; *************** *** 136,140 **** expect(session.getSQLPanelAPIOfActiveSessionWindow()).andReturn(api).anyTimes(); // expect(session.getMessageHandler()).andReturn(messageHandler).anyTimes(); ! expect(session.getAlias()).andReturn(AppTestUtil.getEasyMockSqlAliasExt()); expect(session.getIdentifier()).andReturn(FwTestUtil.getEasyMockIdentifier()).anyTimes(); expect(session.getSQLConnection()).andReturn(con).anyTimes(); --- 137,141 ---- expect(session.getSQLPanelAPIOfActiveSessionWindow()).andReturn(api).anyTimes(); // expect(session.getMessageHandler()).andReturn(messageHandler).anyTimes(); ! expect(session.getAlias()).andStubReturn(AppTestUtil.getEasyMockSqlAliasExt()); expect(session.getIdentifier()).andReturn(FwTestUtil.getEasyMockIdentifier()).anyTimes(); expect(session.getSQLConnection()).andReturn(con).anyTimes(); *************** *** 279,285 **** --- 280,288 ---- public static ISQLAliasExt getEasyMockSqlAliasExt() { ISQLAliasExt result = createMock(ISQLAliasExt.class); + SQLAliasColorProperties props = createMock(SQLAliasColorProperties.class); expect(result.getName()).andReturn("TestAlias").anyTimes(); IIdentifier id = FwTestUtil.getEasyMockIdentifier(); expect(result.getDriverIdentifier()).andReturn(id).anyTimes(); + expect(result.getColorProperties()).andStubReturn(props); replay(result); return result; |
|
From: Rob M. <man...@us...> - 2009-12-16 01:41:24
|
Update of /cvsroot/squirrel-sql/sql12/test/external/net/sourceforge/squirrel_sql/fw/dialects In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv28181/test/external/net/sourceforge/squirrel_sql/fw/dialects Modified Files: dialectExternalTest.properties Log Message: Switched firebird host to be the CentOS VM Index: dialectExternalTest.properties =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/test/external/net/sourceforge/squirrel_sql/fw/dialects/dialectExternalTest.properties,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** dialectExternalTest.properties 20 Jun 2009 15:58:37 -0000 1.27 --- dialectExternalTest.properties 16 Dec 2009 01:41:15 -0000 1.28 *************** *** 82,86 **** # Firebird ! firebird_jdbcUrl=jdbc:firebirdsql://dbserver:3050//opt/data/firebird/dbcopydest/dbcopydest.fdb firebird_jdbcUser=SYSDBA firebird_jdbcPass=password --- 82,86 ---- # Firebird ! firebird_jdbcUrl=jdbc:firebirdsql://centos-dbserver:3050//opt/data/firebird/dbcopydest/dbcopydest.fdb firebird_jdbcUser=SYSDBA firebird_jdbcPass=password |
|
From: Rob M. <man...@us...> - 2009-12-15 23:13:16
|
Update of /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv12364/app/src/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs Modified Files: FormattedSourceTab.java Log Message: Fixed bind variable index which always starts with 1; not 0. Index: FormattedSourceTab.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/FormattedSourceTab.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** FormattedSourceTab.java 12 Dec 2009 18:06:05 -0000 1.7 --- FormattedSourceTab.java 15 Dec 2009 23:13:05 -0000 1.8 *************** *** 218,229 **** s_log.debug("Running SQL for index source tab: " + sqlStatement); s_log.debug("With the following bind variable values: "); ! int parameterIndex = 0; for (String bindValue : bindValues) { ! s_log.debug("["+parameterIndex+"] => '"+bindValue+"'"); } } PreparedStatement pstmt = conn.prepareStatement(sqlStatement); ! int parameterIndex = 0; for (String bindValue : bindValues) { pstmt.setString(parameterIndex++, bindValue); --- 218,229 ---- s_log.debug("Running SQL for index source tab: " + sqlStatement); s_log.debug("With the following bind variable values: "); ! int parameterIndex = 1; for (String bindValue : bindValues) { ! s_log.debug("["+(parameterIndex++)+"] => '"+bindValue+"'"); } } PreparedStatement pstmt = conn.prepareStatement(sqlStatement); ! int parameterIndex = 1; for (String bindValue : bindValues) { pstmt.setString(parameterIndex++, bindValue); |
|
From: Rob M. <man...@us...> - 2009-12-12 22:52:54
|
Update of /cvsroot/squirrel-sql/mavenize In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv19956 Modified Files: mavenize.pl Log Message: make topDir be specified as an argument for portability. Index: mavenize.pl =================================================================== RCS file: /cvsroot/squirrel-sql/mavenize/mavenize.pl,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** mavenize.pl 20 Nov 2009 01:29:23 -0000 1.12 --- mavenize.pl 12 Dec 2009 22:52:43 -0000 1.13 *************** *** 25,29 **** $mavenizeDir =~ s/\s//g; ! $topDir = "/home/manningr/projects/squirrel_maven2/sql12"; $fwDir = $topDir . "/fw"; $appDir = $topDir . "/app"; --- 25,32 ---- $mavenizeDir =~ s/\s//g; ! $topDir = shift; ! if (! defined $topDir) { ! exit("Must specify top-level dir (absolute path to sql12)"); ! } $fwDir = $topDir . "/fw"; $appDir = $topDir . "/app"; *************** *** 34,38 **** $websiteDir = $topDir . "/web-site"; ! $onlyCopyPoms = 1; $cache_deps = <<"EOF"; --- 37,41 ---- $websiteDir = $topDir . "/web-site"; ! $onlyCopyPoms = 0; $cache_deps = <<"EOF"; |
Update of /cvsroot/squirrel-sql/sql12/plugins/db2/src/net/sourceforge/squirrel_sql/plugins/db2/tab In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv28994/plugins/db2/src/net/sourceforge/squirrel_sql/plugins/db2/tab Modified Files: ProcedureSourceTab.java ViewSourceTab.java TriggerSourceTab.java UDFSourceTab.java TableSourceTab.java Log Message: refactoring to remove duplicate plugin code. Index: UDFSourceTab.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/plugins/db2/src/net/sourceforge/squirrel_sql/plugins/db2/tab/UDFSourceTab.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** UDFSourceTab.java 18 Aug 2007 13:49:17 -0000 1.2 --- UDFSourceTab.java 12 Dec 2009 18:06:05 -0000 1.3 *************** *** 18,35 **** * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - import java.sql.PreparedStatement; - import java.sql.SQLException; - - 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; - - import net.sourceforge.squirrel_sql.client.session.ISession; import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.FormattedSourceTab; /** ! * This class will display the source for an DB2 User-Defined function. ! * ! * @author manningr */ public class UDFSourceTab extends FormattedSourceTab --- 18,25 ---- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.FormattedSourceTab; /** ! * This class provides the necessary information to the parent tab to display the source for an DB2 ! * User-Defined function. */ public class UDFSourceTab extends FormattedSourceTab *************** *** 60,108 **** "and routine_name = ? "; ! /** Logger for this class. */ ! private final static ILogger s_log = ! LoggerController.createLogger(UDFSourceTab.class); ! /** whether or not we are connected to OS/400 */ ! private boolean isOS400 = false; ! ! /** ! * Constructor ! * ! * @param hint ! * @param stmtSep ! * @param isOS400 whether or not we are connected to OS/400 ! */ ! public UDFSourceTab(String hint, String stmtSep, boolean isOS400) ! { super(hint); ! super.setCompressWhitespace(true); ! super.setupFormatter(stmtSep, null); ! this.isOS400 = isOS400; } ! /** ! * @see net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.BaseSourceTab#createStatement() ! */ ! @Override ! protected PreparedStatement createStatement() throws SQLException ! { ! final ISession session = getSession(); ! final IDatabaseObjectInfo doi = getDatabaseObjectInfo(); ! ! String sql = SQL; ! if (isOS400) { ! sql = OS_400_SQL; ! } ! if (s_log.isDebugEnabled()) { ! s_log.debug("Running SQL: "+sql); ! s_log.debug("schema="+doi.getSchemaName()); ! s_log.debug("udf name="+doi.getSimpleName()); ! } ! ISQLConnection conn = session.getSQLConnection(); ! PreparedStatement pstmt = conn.prepareStatement(sql); ! pstmt.setString(1, doi.getSchemaName()); ! pstmt.setString(2, doi.getSimpleName()); ! return pstmt; ! } } --- 50,84 ---- "and routine_name = ? "; ! /** whether or not we are connected to OS/400 */ ! private boolean isOS400 = false; ! /** ! * Constructor ! * ! * @param hint ! * what the user sees on mouse-over tool-tip ! * @param stmtSep ! * the string to use to separate SQL statements ! * @param isOS400 ! * whether or not we are connected to OS/400 ! */ ! public UDFSourceTab(String hint, String stmtSep, boolean isOS400) { super(hint); ! super.setCompressWhitespace(true); ! super.setupFormatter(stmtSep, null); ! this.isOS400 = isOS400; } ! /** ! * @see net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.table.PSFormattedSourceTab#getSqlStatement() ! */ ! @Override ! protected String getSqlStatement() ! { ! String sql = SQL; ! if (isOS400) { ! sql = OS_400_SQL; ! } ! return sql; ! } } Index: TriggerSourceTab.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/plugins/db2/src/net/sourceforge/squirrel_sql/plugins/db2/tab/TriggerSourceTab.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** TriggerSourceTab.java 1 Sep 2007 16:04:33 -0000 1.6 --- TriggerSourceTab.java 12 Dec 2009 18:06:05 -0000 1.7 *************** *** 18,35 **** * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - import java.sql.PreparedStatement; - import java.sql.SQLException; - - 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; - - import net.sourceforge.squirrel_sql.client.session.ISession; import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.FormattedSourceTab; /** ! * This class will display the source for an DB2 trigger. ! * ! * @author manningr */ public class TriggerSourceTab extends FormattedSourceTab --- 18,24 ---- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.FormattedSourceTab; /** ! * This class provides the necessary information to the parent tab to display the source for an DB2 trigger. */ public class TriggerSourceTab extends FormattedSourceTab *************** *** 40,46 **** "where TABSCHEMA = ? " + "and TRIGNAME = ? "; ! /** SQL that retrieves the source of a trigger on DB2 on OS/400. */ ! private final static String OS2_400_SQL = "select action_statement " + "from qsys2.systriggers " + --- 29,35 ---- "where TABSCHEMA = ? " + "and TRIGNAME = ? "; ! /** SQL that retrieves the source of a trigger on DB2 on OS/400. */ ! private final static String OS2_400_SQL = "select action_statement " + "from qsys2.systriggers " + *************** *** 48,57 **** "and trigger_name = ? "; ! /** Logger for this class. */ ! private final static ILogger s_log = ! LoggerController.createLogger(TriggerSourceTab.class); ! private boolean isOS2400 = false; public TriggerSourceTab(String hint, boolean isOS2400, String stmtSep) { --- 37,53 ---- "and trigger_name = ? "; ! /** a boolean value indicating whether or not this DB2 is on OS/400 */ private boolean isOS2400 = false; + /** + * Constructor + * + * @param hint + * what the user sees on mouse-over tool-tip + * @param isOS2400 + * a boolean value indicating whether or not this DB2 is on OS/400. + * @param stmtSep + * the character that separates SQL statements + */ public TriggerSourceTab(String hint, boolean isOS2400, String stmtSep) { *************** *** 62,89 **** } ! /** ! * @see net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.BaseSourceTab#createStatement() ! */ ! @Override ! protected PreparedStatement createStatement() throws SQLException ! { ! final ISession session = getSession(); ! final IDatabaseObjectInfo doi = getDatabaseObjectInfo(); ! String sql = SQL; if (isOS2400) { sql = OS2_400_SQL; } ! ! if (s_log.isDebugEnabled()) { ! s_log.debug("Running SQL: "+sql); ! s_log.debug("schema="+doi.getSchemaName()); ! s_log.debug("trigname="+doi.getSimpleName()); ! } ! ISQLConnection conn = session.getSQLConnection(); ! PreparedStatement pstmt = conn.prepareStatement(sql); ! pstmt.setString(1, doi.getSchemaName()); ! pstmt.setString(2, doi.getSimpleName()); ! return pstmt; ! } } --- 58,72 ---- } ! /** ! * @see net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.table.PSFormattedSourceTab#getSqlStatement() ! */ ! @Override ! protected String getSqlStatement() ! { String sql = SQL; if (isOS2400) { sql = OS2_400_SQL; } ! return sql; ! } } Index: TableSourceTab.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/plugins/db2/src/net/sourceforge/squirrel_sql/plugins/db2/tab/TableSourceTab.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** TableSourceTab.java 28 Nov 2008 23:00:44 -0000 1.4 --- TableSourceTab.java 12 Dec 2009 18:06:05 -0000 1.5 *************** *** 46,55 **** { /** SQL that retrieves the source of a MQT. */ ! private static final String MQT_SQL = "SELECT text " + "FROM SYSCAT.VIEWS " + "WHERE viewschema = ? " ! + "and viewname = ? "; /** SQL that retrieves the source of a MQT on OS/400 */ ! private static final String OS400_MQT_SQL = "select mqt_definition " + "from qsys2.systables " ! + "where table_schema = ? " + "and table_name = ? "; /** Logger for this class. */ --- 46,61 ---- { /** SQL that retrieves the source of a MQT. */ ! private static final String MQT_SQL = ! "SELECT text " + ! "FROM SYSCAT.VIEWS " + ! "WHERE viewschema = ? " + ! "and viewname = ? "; /** SQL that retrieves the source of a MQT on OS/400 */ ! private static final String OS400_MQT_SQL = ! "select mqt_definition " + ! "from qsys2.systables " + ! "where table_schema = ? " + ! "and table_name = ? "; /** Logger for this class. */ *************** *** 62,65 **** --- 68,75 ---- * Constructor * + * @param hint + * what the user sees on mouse-over tool-tip + * @param stmtSep + * the string to use to separate SQL statements * @param isOS400 * whether or not we are connected to an OS/400 system *************** *** 187,189 **** --- 197,204 ---- return tmp.toString(); } + + protected String getSqlStatement() + { + return null; + } } Index: ProcedureSourceTab.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/plugins/db2/src/net/sourceforge/squirrel_sql/plugins/db2/tab/ProcedureSourceTab.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** ProcedureSourceTab.java 30 Aug 2007 21:59:31 -0000 1.8 --- ProcedureSourceTab.java 12 Dec 2009 18:06:05 -0000 1.9 *************** *** 1,3 **** --- 1,4 ---- package net.sourceforge.squirrel_sql.plugins.db2.tab; + /* * Copyright (C) 2006 Rob Manning *************** *** 18,111 **** * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - 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.FormattedSourceTab; - import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo; - import net.sourceforge.squirrel_sql.fw.sql.ISQLConnection; import net.sourceforge.squirrel_sql.fw.util.StringManager; import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory; ! 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 an DB2 stored procedure. ! * ! * @author manningr */ public class ProcedureSourceTab extends FormattedSourceTab { ! ! private static interface i18n { ! StringManager s_stringMgr = ! StringManagerFactory.getStringManager(ProcedureSourceTab.class); - //i18n[ProcedureSourceTab.cLanguageProcMsg=This is a C-language routine. The - //source code is unavailable.] - String C_LANGUAGE_PROC_MSG = - s_stringMgr.getString("ProcedureSourceTab.cLanguageProcMsg"); - } - /** SQL that retrieves the source of a stored procedure. */ private static String SQL = ! "select " + ! " case " + ! " when language = 'C' then '" +i18n.C_LANGUAGE_PROC_MSG+"' " + ! " else text " + ! " end as text " + ! "from SYSCAT.PROCEDURES " + ! "where PROCSCHEMA = ? " + ! "and PROCNAME = ? "; ! ! /** SQL that retrieves the source of a stored procedure on OS/400 */ ! private static String OS_400_SQL = ! "select routine_definition from qsys2.sysroutines " + ! "where routine_schema = ? " + ! "and routine_name = ? "; ! ! /** Logger for this class. */ ! private final static ILogger s_log = ! LoggerController.createLogger(ProcedureSourceTab.class); ! ! /** boolean to indicate whether or not this session is OS/400 */ ! private boolean isOS400 = false; ! /** ! * Constructor ! * ! * @param hint what the user sees on mouse-over tool-tip ! * @param isOS400 whether or not the session is OS/400 ! */ ! public ProcedureSourceTab(String hint, boolean isOS400, String stmtSep) ! { ! super(hint); ! super.setCompressWhitespace(false); ! super.setupFormatter(stmtSep, null); ! this.isOS400 = isOS400; ! } - /** ! * @see net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.BaseSourceTab#createStatement() */ @Override ! protected PreparedStatement createStatement() throws SQLException { ! final ISession session = getSession(); ! final IDatabaseObjectInfo doi = getDatabaseObjectInfo(); ! String sql = SQL; ! if (isOS400) { ! sql = OS_400_SQL; ! } ! if (s_log.isDebugEnabled()) { ! s_log.debug("Running SQL for procedure source: "+sql); ! s_log.debug("schema="+doi.getSchemaName()); ! s_log.debug("procedure name="+doi.getSimpleName()); ! } ! ISQLConnection conn = session.getSQLConnection(); ! PreparedStatement pstmt = conn.prepareStatement(sql); ! pstmt.setString(1, doi.getSchemaName()); ! pstmt.setString(2, doi.getSimpleName()); ! return pstmt; } } --- 19,85 ---- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.FormattedSourceTab; import net.sourceforge.squirrel_sql.fw.util.StringManager; import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory; ! /** ! * This class provides the necessary information to the parent tab to display the source for an DB2 stored ! * procedure. */ public class ProcedureSourceTab extends FormattedSourceTab { ! private static interface i18n ! { ! StringManager s_stringMgr = StringManagerFactory.getStringManager(ProcedureSourceTab.class); ! ! // i18n[ProcedureSourceTab.cLanguageProcMsg=This is a C-language routine. The ! // source code is unavailable.] ! String C_LANGUAGE_PROC_MSG = s_stringMgr.getString("ProcedureSourceTab.cLanguageProcMsg"); ! } /** SQL that retrieves the source of a stored procedure. */ private static String SQL = ! "select " + ! " case " + ! " when language = 'C' then '" +i18n.C_LANGUAGE_PROC_MSG+"' " + ! " else text " + ! " end as text " + ! "from SYSCAT.PROCEDURES " + ! "where PROCSCHEMA = ? " + ! "and PROCNAME = ? "; ! ! /** SQL that retrieves the source of a stored procedure on OS/400 */ ! private static String OS_400_SQL = ! "select routine_definition from qsys2.sysroutines " + ! "where routine_schema = ? " + ! "and routine_name = ? "; ! /** boolean to indicate whether or not this session is OS/400 */ ! private boolean isOS400 = false; /** ! * Constructor ! * ! * @param hint ! * what the user sees on mouse-over tool-tip ! * @param isOS400 ! * whether or not the session is OS/400 */ + public ProcedureSourceTab(String hint, boolean isOS400, String stmtSep) { + super(hint); + super.setCompressWhitespace(false); + super.setupFormatter(stmtSep, null); + this.isOS400 = isOS400; + } + @Override ! protected String getSqlStatement() { ! String sql = SQL; ! if (isOS400) ! { ! sql = OS_400_SQL; ! } ! return sql; } } Index: ViewSourceTab.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/plugins/db2/src/net/sourceforge/squirrel_sql/plugins/db2/tab/ViewSourceTab.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ViewSourceTab.java 18 Aug 2007 13:49:17 -0000 1.4 --- ViewSourceTab.java 12 Dec 2009 18:06:05 -0000 1.5 *************** *** 1,3 **** --- 1,6 ---- package net.sourceforge.squirrel_sql.plugins.db2.tab; + + import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.FormattedSourceTab; + /* * Copyright (C) 2007 Rob Manning *************** *** 18,94 **** * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - import java.sql.PreparedStatement; - import java.sql.SQLException; - 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; - - import net.sourceforge.squirrel_sql.client.session.ISession; - import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.FormattedSourceTab; /** ! * This class will display the source for an DB2 view. ! * ! * @author manningr */ public class ViewSourceTab extends FormattedSourceTab { /** SQL that retrieves the source of a stored procedure. */ ! private static final String SQL = ! "SELECT TEXT " + ! "FROM SYSCAT.VIEWS " + ! "WHERE VIEWSCHEMA = ? " + ! "AND VIEWNAME = ? "; ! /** SQL that retrieves the source of a stored procedure on OS/400 */ private static final String OS_400_SQL = ! "select view_definition " + ! "from qsys2.sysviews " + ! "where table_schema = ? " + ! "and table_name = ? "; ! ! /** Logger for this class. */ ! private final static ILogger s_log = ! LoggerController.createLogger(ViewSourceTab.class); ! /** boolean to indicate whether or not this session is OS/400 */ ! private boolean isOS400 = false; ! ! /** ! * Constructor ! * ! * @param isOS400 whether or not we are connected to an OS/400 system ! */ ! public ViewSourceTab(String hint, String stmtSep, boolean isOS400) ! { super(hint); ! super.setCompressWhitespace(true); ! super.setupFormatter(stmtSep, null); ! this.isOS400 = isOS400; } ! /** ! * @see net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.BaseSourceTab#createStatement() ! */ ! @Override ! protected PreparedStatement createStatement() throws SQLException { ! final ISession session = getSession(); ! final IDatabaseObjectInfo doi = getDatabaseObjectInfo(); ! ISQLConnection conn = session.getSQLConnection(); ! String sql = SQL; ! if (isOS400) { ! sql = OS_400_SQL; ! } ! if (s_log.isDebugEnabled()) { ! s_log.debug("Running SQL for View source tab: "+sql); ! s_log.debug("schema="+doi.getSchemaName()); ! s_log.debug("view name="+doi.getSimpleName()); ! } ! PreparedStatement pstmt = conn.prepareStatement(sql); ! pstmt.setString(1, doi.getSchemaName()); ! pstmt.setString(2, doi.getSimpleName()); ! return pstmt; } } --- 21,72 ---- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /** ! * This class will display the source for an DB2 view on either LUW or OS/400. */ public class ViewSourceTab extends FormattedSourceTab { /** SQL that retrieves the source of a stored procedure. */ ! private static final String SQL = ! "SELECT TEXT " + ! "FROM SYSCAT.VIEWS " + ! "WHERE VIEWSCHEMA = ? " + ! "AND VIEWNAME = ? "; ! /** SQL that retrieves the source of a stored procedure on OS/400 */ private static final String OS_400_SQL = ! "select view_definition " + ! "from qsys2.sysviews " + ! "where table_schema = ? " + ! "and table_name = ? "; ! /** boolean to indicate whether or not this session is OS/400 */ ! private boolean isOS400 = false; ! ! /** ! * Constructor ! * ! * @param isOS400 ! * whether or not we are connected to an OS/400 system ! */ ! public ViewSourceTab(String hint, String stmtSep, boolean isOS400) { super(hint); ! super.setCompressWhitespace(true); ! super.setupFormatter(stmtSep, null); ! this.isOS400 = isOS400; } ! /** ! * @see net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.table.PSFormattedSourceTab#getSqlStatement() ! */ ! @Override ! protected String getSqlStatement() { ! String sql = SQL; ! if (isOS400) ! { ! sql = OS_400_SQL; ! } ! return sql; } } |
|
From: Rob M. <man...@us...> - 2009-12-12 18:06:17
|
Update of /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv28994/app/src/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs Modified Files: ViewSourceTab.java FormattedSourceTab.java Log Message: refactoring to remove duplicate plugin code. Index: FormattedSourceTab.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/FormattedSourceTab.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** FormattedSourceTab.java 1 Sep 2007 18:21:04 -0000 1.6 --- FormattedSourceTab.java 12 Dec 2009 18:06:05 -0000 1.7 *************** *** 21,24 **** --- 21,25 ---- import java.sql.PreparedStatement; import java.sql.ResultSet; + import java.sql.SQLException; import javax.swing.JTextArea; *************** *** 27,30 **** --- 28,33 ---- import net.sourceforge.squirrel_sql.fw.codereformat.CodeReformator; import net.sourceforge.squirrel_sql.fw.codereformat.CommentSpec; + import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo; + import net.sourceforge.squirrel_sql.fw.sql.ISQLConnection; import net.sourceforge.squirrel_sql.fw.sql.SQLUtilities; import net.sourceforge.squirrel_sql.fw.util.StringManager; *************** *** 197,199 **** --- 200,259 ---- return result; } + + /** + * @see net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.BaseSourceTab#createStatement() + */ + @Override + protected PreparedStatement createStatement() throws SQLException + { + final ISession session = getSession(); + + ISQLConnection conn = session.getSQLConnection(); + + String sqlStatement = getSqlStatement(); + String[] bindValues = getBindValues(); + + if (s_log.isDebugEnabled()) + { + s_log.debug("Running SQL for index source tab: " + sqlStatement); + s_log.debug("With the following bind variable values: "); + int parameterIndex = 0; + for (String bindValue : bindValues) { + s_log.debug("["+parameterIndex+"] => '"+bindValue+"'"); + } + } + PreparedStatement pstmt = conn.prepareStatement(sqlStatement); + + int parameterIndex = 0; + for (String bindValue : bindValues) { + pstmt.setString(parameterIndex++, bindValue); + } + + return pstmt; + } + + /** + * Subclasses must override to provide the SQL necessary to select the source for the selected + * DatabaseObjectInfo. Note: the default implementation of getBindValues provides values for schema and + * object simple name. Therefore, it is advantageous if the where clause in the select statement + * returned from this method specify first the schema, and then the object name and no more bind variables. + * If this is possible, then it isn't necessary for subclasses to override getBindValues. + * + * @return an SQL select statement with embedded bind variables (?'s). + */ + protected abstract String getSqlStatement(); + + /** + * This method simply returns a String array containing the schema name and the selected object's simple + * name, in that order. If the SQL returned from getSqlStatement must specify a different order, or for + * example uses that catalog of the object, instead of or in addition to schema, then this method must be + * overridden to return the necessary bind variable values, in the order required by the SQL statement. + * + * @return a String array of bind variable values + */ + protected String[] getBindValues() + { + final IDatabaseObjectInfo doi = getDatabaseObjectInfo(); + return new String[] { doi.getSchemaName(), doi.getSimpleName() }; + } } Index: ViewSourceTab.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/ViewSourceTab.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ViewSourceTab.java 30 Mar 2009 01:23:42 -0000 1.1 --- ViewSourceTab.java 12 Dec 2009 18:06:05 -0000 1.2 *************** *** 19,50 **** * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - import java.sql.PreparedStatement; - import java.sql.SQLException; - - 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; - - import net.sourceforge.squirrel_sql.client.session.ISession; /** * This class will display the source for a view. This will work for databases that support the SQL standard * infomation_schema.views table. - * - * @author manningr */ public class ViewSourceTab extends FormattedSourceTab { ! /** SQL that retrieves the source of a stored procedure. */ ! private static String SQL = ! "select view_definition " + ! "from information_schema.views " + ! "where table_schema = ? " + ! "and table_name = ? "; ! ! /** Logger for this class. */ ! private final static ILogger s_log = LoggerController.createLogger(ViewSourceTab.class); ! public ViewSourceTab(String hint, String stmtSep) { --- 19,37 ---- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /** * This class will display the source for a view. This will work for databases that support the SQL standard * infomation_schema.views table. */ public class ViewSourceTab extends FormattedSourceTab { ! /** ! * Constructor ! * ! * @param hint ! * what the user sees on mouse-over tool-tip ! * @param stmtSep ! * the string to use to separate SQL statements ! */ public ViewSourceTab(String hint, String stmtSep) { *************** *** 54,72 **** } ! protected PreparedStatement createStatement() throws SQLException ! { ! final ISession session = getSession(); ! final IDatabaseObjectInfo doi = getDatabaseObjectInfo(); ! ! ISQLConnection conn = session.getSQLConnection(); ! if (s_log.isDebugEnabled()) ! { ! s_log.debug("Running SQL for View source tab: " + SQL); ! } ! PreparedStatement pstmt = conn.prepareStatement(SQL); ! ! pstmt.setString(1, doi.getSchemaName()); ! pstmt.setString(2, doi.getSimpleName()); ! return pstmt; ! } } --- 41,55 ---- } ! /** ! * @see net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.table.PSFormattedSourceTab#getSqlStatement() ! */ ! @Override ! protected String getSqlStatement() ! { ! return ! "select view_definition " + ! "from information_schema.views " + ! "where table_schema = ? " + ! "and table_name = ? "; ! } } |
|
From: Rob M. <man...@us...> - 2009-12-12 18:06:15
|
Update of /cvsroot/squirrel-sql/sql12/plugins/h2/src/net/sourceforge/squirrel_sql/plugins/h2/tab In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv28994/plugins/h2/src/net/sourceforge/squirrel_sql/plugins/h2/tab Modified Files: IndexSourceTab.java TriggerSourceTab.java Log Message: refactoring to remove duplicate plugin code. Index: TriggerSourceTab.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/plugins/h2/src/net/sourceforge/squirrel_sql/plugins/h2/tab/TriggerSourceTab.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TriggerSourceTab.java 27 Jul 2007 00:14:28 -0000 1.3 --- TriggerSourceTab.java 12 Dec 2009 18:06:05 -0000 1.4 *************** *** 1,3 **** --- 1,4 ---- package net.sourceforge.squirrel_sql.plugins.h2.tab; + /* * Copyright (C) 2007 Rob Manning *************** *** 18,67 **** * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - import java.sql.PreparedStatement; - import java.sql.SQLException; - - 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; - - import net.sourceforge.squirrel_sql.client.session.ISession; import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.FormattedSourceTab; /** ! * This class will display the source for an H2 trigger. ! * ! * @author manningr */ public class TriggerSourceTab extends FormattedSourceTab { ! /** SQL that retrieves the source of a trigger. */ ! private static String SQL = "No support for trigger source in H2"; ! ! /** Logger for this class. */ ! private final static ILogger s_log = ! LoggerController.createLogger(TriggerSourceTab.class); ! ! public TriggerSourceTab(String hint, String stmtSep) ! { super(hint); ! super.setCompressWhitespace(true); ! super.setupFormatter(stmtSep, null); } ! 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("schema="+doi.getSchemaName()); ! s_log.debug("trigname="+doi.getSimpleName()); ! } ! ISQLConnection conn = session.getSQLConnection(); ! PreparedStatement pstmt = conn.prepareStatement(SQL); ! pstmt.setString(1, doi.getSchemaName()); ! pstmt.setString(2, doi.getSimpleName()); ! return pstmt; } } --- 19,39 ---- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.FormattedSourceTab; + /** ! * This class provides the necessary information to the parent tab to display the source for an H2 trigger. */ public class TriggerSourceTab extends FormattedSourceTab { ! public TriggerSourceTab(String hint, String stmtSep) { super(hint); ! super.setCompressWhitespace(true); ! super.setupFormatter(stmtSep, null); } ! @Override ! protected String getSqlStatement() { ! return "No support for trigger source in H2"; } } Index: IndexSourceTab.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/plugins/h2/src/net/sourceforge/squirrel_sql/plugins/h2/tab/IndexSourceTab.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** IndexSourceTab.java 30 Mar 2009 01:23:42 -0000 1.4 --- IndexSourceTab.java 12 Dec 2009 18:06:05 -0000 1.5 *************** *** 18,50 **** * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - import java.sql.PreparedStatement; - import java.sql.SQLException; - - 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; - - import net.sourceforge.squirrel_sql.client.session.ISession; import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.FormattedSourceTab; /** ! * This class will display the source for an H2 index. ! * ! * @author manningr */ public class IndexSourceTab extends FormattedSourceTab { ! /** SQL that retrieves the source of an index. */ ! private static String SQL = ! "select " + ! "'create '||index_type_name||' '||index_name||' ON '||table_name||'('||column_name||')' " + ! "from INFORMATION_SCHEMA.INDEXES " + ! "where table_schema = ? " + ! "and index_name = ? "; ! ! /** Logger for this class. */ ! private final static ILogger s_log = ! LoggerController.createLogger(IndexSourceTab.class); ! public IndexSourceTab(String hint, String stmtSep) { --- 18,35 ---- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.FormattedSourceTab; /** ! * This class provides the necessary information to the parent tab to display the source for an H2 index. */ public class IndexSourceTab extends FormattedSourceTab { ! /** ! * Constructor ! * ! * @param hint ! * what the user sees on mouse-over tool-tip ! * @param stmtSep ! * the character that separates SQL statements ! */ public IndexSourceTab(String hint, String stmtSep) { *************** *** 54,73 **** } ! protected PreparedStatement createStatement() throws SQLException ! { ! final ISession session = getSession(); ! final IDatabaseObjectInfo doi = getDatabaseObjectInfo(); ! ! ISQLConnection conn = session.getSQLConnection(); ! if (s_log.isDebugEnabled()) { ! s_log.debug("Running SQL for index source tab: "+SQL); ! s_log.debug("schema name: "+doi.getSchemaName()); ! s_log.debug("index name: "+doi.getSimpleName()); ! } ! PreparedStatement pstmt = conn.prepareStatement(SQL); ! ! pstmt.setString(1, doi.getSchemaName()); ! pstmt.setString(2, doi.getSimpleName()); ! return pstmt; ! } } --- 39,54 ---- } ! /** ! * @see net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.table.PSFormattedSourceTab#getSqlStatement() ! */ ! @Override ! protected String getSqlStatement() ! { ! return ! "select " + ! "'create '||index_type_name||' '||index_name||' ON '||table_name||'('||column_name||')' " + ! "from INFORMATION_SCHEMA.INDEXES " + ! "where table_schema = ? " + ! "and index_name = ? "; ! } } |
Update of /cvsroot/squirrel-sql/sql12/plugins/mysql/src/net/sourceforge/squirrel_sql/plugins/mysql/tab In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv28994/plugins/mysql/src/net/sourceforge/squirrel_sql/plugins/mysql/tab Modified Files: MysqlProcedureSourceTab.java MysqlTriggerSourceTab.java MysqlViewSourceTab.java Log Message: refactoring to remove duplicate plugin code. Index: MysqlViewSourceTab.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/plugins/mysql/src/net/sourceforge/squirrel_sql/plugins/mysql/tab/MysqlViewSourceTab.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MysqlViewSourceTab.java 15 Jul 2007 11:27:40 -0000 1.2 --- MysqlViewSourceTab.java 12 Dec 2009 18:06:05 -0000 1.3 *************** *** 1,3 **** --- 1,4 ---- package net.sourceforge.squirrel_sql.plugins.mysql.tab; + /* * Copyright (C) 2007 Rob Manning *************** *** 18,75 **** * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ ! import java.sql.PreparedStatement; ! import java.sql.SQLException; ! 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; - import net.sourceforge.squirrel_sql.client.session.ISession; - import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.FormattedSourceTab; /** ! * This class will display the source for an MySQL view. ! * ! * @author manningr */ public class MysqlViewSourceTab extends FormattedSourceTab { ! /** SQL that retrieves the source of a view. */ ! private static String SQL = ! "SELECT VIEW_DEFINITION " + ! "FROM INFORMATION_SCHEMA.VIEWS " + ! "WHERE TABLE_SCHEMA = ? " + ! "AND TABLE_NAME = ? "; ! ! /** Logger for this class. */ ! private final static ILogger s_log = ! LoggerController.createLogger(MysqlViewSourceTab.class); ! ! public MysqlViewSourceTab(String hint, String stmtSep) ! { super(hint); ! super.setupFormatter(stmtSep, null); ! super.setCompressWhitespace(true); } ! protected PreparedStatement createStatement() throws SQLException { - final ISession session = getSession(); final IDatabaseObjectInfo doi = getDatabaseObjectInfo(); ! ! ISQLConnection conn = session.getSQLConnection(); ! if (s_log.isDebugEnabled()) { ! s_log.debug("Running SQL for View source tab: "+SQL); ! s_log.debug("Binding catalog name "+doi.getCatalogName()+ ! " as first bind value"); ! s_log.debug("Binding table name "+doi.getSimpleName()+ ! " as second bind value"); ! ! } ! PreparedStatement pstmt = conn.prepareStatement(SQL); ! ! pstmt.setString(1, doi.getCatalogName()); ! pstmt.setString(2, doi.getSimpleName()); ! return pstmt; } ! } --- 19,57 ---- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ ! import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.FormattedSourceTab; import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo; /** ! * This class provides the necessary information to the parent tab to display the source for an MySQL view. */ public class MysqlViewSourceTab extends FormattedSourceTab { ! public MysqlViewSourceTab(String hint, String stmtSep) { super(hint); ! super.setupFormatter(stmtSep, null); ! super.setCompressWhitespace(true); } ! /** ! * @see net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.table.PSFormattedSourceTab#getSqlStatement() ! */ ! @Override ! protected String getSqlStatement() ! { ! return ! "SELECT VIEW_DEFINITION " + ! "FROM INFORMATION_SCHEMA.VIEWS " + ! "WHERE TABLE_SCHEMA = ? " + ! "AND TABLE_NAME = ? "; ! } ! ! /** ! * @see net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.table.PSFormattedSourceTab#getBindValues() ! */ ! @Override ! protected String[] getBindValues() { final IDatabaseObjectInfo doi = getDatabaseObjectInfo(); ! return new String[] { doi.getCatalogName(), doi.getSimpleName() }; } ! } \ No newline at end of file Index: MysqlProcedureSourceTab.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/plugins/mysql/src/net/sourceforge/squirrel_sql/plugins/mysql/tab/MysqlProcedureSourceTab.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MysqlProcedureSourceTab.java 18 Jul 2007 01:25:29 -0000 1.2 --- MysqlProcedureSourceTab.java 12 Dec 2009 18:06:05 -0000 1.3 *************** *** 18,47 **** * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - 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.FormattedSourceTab; 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; /** ! * This class will display the source for an DB2 trigger. ! * ! * @author manningr */ public class MysqlProcedureSourceTab extends FormattedSourceTab { - /** SQL that retrieves the source of a stored procedure. */ - private static String SQL = - "select routine_definition " + - "from information_schema.ROUTINES " + - "where ROUTINE_SCHEMA = ? " + - "and ROUTINE_NAME = ? "; ! /** Logger for this class. */ ! private final static ILogger s_log = ! LoggerController.createLogger(MysqlProcedureSourceTab.class); ! public MysqlProcedureSourceTab(String hint) { --- 18,35 ---- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.FormattedSourceTab; import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo; /** ! * This class provides the necessary information to the parent tab to display the source for an MySQL ! * Stored Procedure. */ public class MysqlProcedureSourceTab extends FormattedSourceTab { ! /** ! * Constructor ! * ! * @param hint ! * what the user sees on mouse-over tool-tip ! */ public MysqlProcedureSourceTab(String hint) { *************** *** 50,69 **** } ! protected PreparedStatement createStatement() throws SQLException ! { ! final ISession session = getSession(); ! final IDatabaseObjectInfo doi = getDatabaseObjectInfo(); ! if (s_log.isDebugEnabled()) { ! s_log.debug("Running SQL for procedure source: "+SQL); ! s_log.debug("schema="+doi.getCatalogName()); ! s_log.debug("procedure name="+doi.getSimpleName()); ! } ! ! ISQLConnection conn = session.getSQLConnection(); ! PreparedStatement pstmt = conn.prepareStatement(SQL); ! pstmt.setString(1, doi.getCatalogName()); ! pstmt.setString(2, doi.getSimpleName()); ! return pstmt; ! } } --- 38,62 ---- } ! /** ! * @see net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.table.PSFormattedSourceTab#getSqlStatement() ! */ ! @Override ! protected String getSqlStatement() ! { ! return ! "select routine_definition " + ! "from information_schema.ROUTINES " + ! "where ROUTINE_SCHEMA = ? " + ! "and ROUTINE_NAME = ? "; ! } ! /** ! * @see net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.table.PSFormattedSourceTab#getBindValues() ! */ ! @Override ! protected String[] getBindValues() ! { ! final IDatabaseObjectInfo doi = getDatabaseObjectInfo(); ! return new String[] { doi.getCatalogName(), doi.getSimpleName() }; ! } } Index: MysqlTriggerSourceTab.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/plugins/mysql/src/net/sourceforge/squirrel_sql/plugins/mysql/tab/MysqlTriggerSourceTab.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MysqlTriggerSourceTab.java 15 Jul 2007 11:27:40 -0000 1.1 --- MysqlTriggerSourceTab.java 12 Dec 2009 18:06:05 -0000 1.2 *************** *** 1,3 **** --- 1,4 ---- package net.sourceforge.squirrel_sql.plugins.mysql.tab; + /* * Copyright (C) 2007 Rob Manning *************** *** 18,74 **** * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ ! import java.sql.PreparedStatement; ! import java.sql.SQLException; ! 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; - import net.sourceforge.squirrel_sql.client.session.ISession; - import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.FormattedSourceTab; /** ! * This class will display the source for an MySQL view. ! * ! * @author manningr */ public class MysqlTriggerSourceTab extends FormattedSourceTab { ! /** SQL that retrieves the source of a view. */ ! private static String SQL = ! "SELECT ACTION_STATEMENT " + ! "FROM INFORMATION_SCHEMA.TRIGGERS " + ! "WHERE TRIGGER_SCHEMA = ? " + ! "AND TRIGGER_NAME = ? "; ! ! /** Logger for this class. */ ! private final static ILogger s_log = ! LoggerController.createLogger(MysqlTriggerSourceTab.class); ! public MysqlTriggerSourceTab(String hint, String stmtSep) { ! super(hint); ! super.setupFormatter(stmtSep, null); ! super.setCompressWhitespace(true); } ! protected PreparedStatement createStatement() throws SQLException { - final ISession session = getSession(); final IDatabaseObjectInfo doi = getDatabaseObjectInfo(); ! ! ISQLConnection conn = session.getSQLConnection(); ! if (s_log.isDebugEnabled()) { ! s_log.debug("Running SQL for View source tab: "+SQL); ! s_log.debug("Binding catalog name "+doi.getCatalogName()+ ! " as first bind value"); ! s_log.debug("Binding table name "+doi.getSimpleName()+ ! " as second bind value"); ! } ! PreparedStatement pstmt = conn.prepareStatement(SQL); ! ! pstmt.setString(1, doi.getCatalogName()); ! pstmt.setString(2, doi.getSimpleName()); ! return pstmt; } } --- 19,59 ---- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ ! import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.FormattedSourceTab; import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo; /** ! * This class will display the source for an MySQL Trigger. */ public class MysqlTriggerSourceTab extends FormattedSourceTab { ! public MysqlTriggerSourceTab(String hint, String stmtSep) { ! super(hint); ! super.setupFormatter(stmtSep, null); ! super.setCompressWhitespace(true); ! } ! /** ! * @see net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.table.PSFormattedSourceTab#getSqlStatement() ! */ ! @Override ! protected String getSqlStatement() { ! return ! "SELECT ACTION_STATEMENT " + ! "FROM INFORMATION_SCHEMA.TRIGGERS " + ! "WHERE TRIGGER_SCHEMA = ? " + ! "AND TRIGGER_NAME = ? "; } ! /** ! * @see net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.table.PSFormattedSourceTab#getBindValues() ! */ ! @Override ! protected String[] getBindValues() { final IDatabaseObjectInfo doi = getDatabaseObjectInfo(); ! return new String[] ! { doi.getCatalogName(), doi.getSimpleName() }; } + } |
|
From: Rob M. <man...@us...> - 2009-12-12 18:06:15
|
Update of /cvsroot/squirrel-sql/sql12/plugins/sybase/src/net/sourceforge/squirrel_sql/plugins/SybaseASE/tab In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv28994/plugins/sybase/src/net/sourceforge/squirrel_sql/plugins/SybaseASE/tab Modified Files: TriggerSourceTab.java ViewSourceTab.java Log Message: refactoring to remove duplicate plugin code. Index: TriggerSourceTab.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/plugins/sybase/src/net/sourceforge/squirrel_sql/plugins/SybaseASE/tab/TriggerSourceTab.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TriggerSourceTab.java 3 Aug 2007 09:36:09 -0000 1.1 --- TriggerSourceTab.java 12 Dec 2009 18:06:05 -0000 1.2 *************** *** 18,77 **** * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - 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.FormattedSourceTab; 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; /** ! * This class will display the source for a Sybase trigger. ! * */ public class TriggerSourceTab extends FormattedSourceTab ! { ! ! /** Logger for this class. */ ! private final static ILogger s_log = ! LoggerController.createLogger(TriggerSourceTab.class); ! ! /** SQL that retrieves the source of a stored procedure. */ ! private static String SQL = ! "SELECT trigger_defs.text " + ! "FROM sysobjects tables , sysobjects triggers, syscomments trigger_defs " + ! "where triggers.type = 'TR' " + ! "and triggers.id = trigger_defs.id " + ! "and triggers.deltrig = tables.id " + ! "and tables.loginame = ? " + ! // TODO: figure out how to get then name of the table that the trigger ! // is on. ! //"and tables.name = ? " + ! "and triggers.name = ? "; ! ! public TriggerSourceTab(String hint, String stmtSep) ! { super(hint); ! super.setCompressWhitespace(true); ! super.setupFormatter(stmtSep, null); } ! protected PreparedStatement createStatement() throws SQLException ! { ! final ISession session = getSession(); ! final IDatabaseObjectInfo doi = getDatabaseObjectInfo(); ! ! if (s_log.isDebugEnabled()) { ! s_log.debug("Running SQL for View source tab: "+SQL); ! s_log.debug("Binding for param 1: "+doi.getCatalogName()); ! s_log.debug("Binding for param 2: "+doi.getSimpleName()); ! } ! ! ISQLConnection conn = session.getSQLConnection(); ! PreparedStatement pstmt = conn.prepareStatement(SQL); ! pstmt.setString(1, doi.getCatalogName()); ! pstmt.setString(2, doi.getSimpleName()); ! return pstmt; ! } } --- 18,69 ---- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.FormattedSourceTab; import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo; /** ! * This class provides the necessary information to the parent tab to display the source for a Sybase trigger. */ public class TriggerSourceTab extends FormattedSourceTab ! { ! /** ! * Constructor ! * ! * @param hint ! * what the user sees on mouse-over tool-tip ! * @param stmtSep ! * the string to use to separate SQL statements ! */ ! public TriggerSourceTab(String hint, String stmtSep) { super(hint); ! super.setCompressWhitespace(true); ! super.setupFormatter(stmtSep, null); } ! /** ! * @see net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.table.PSFormattedSourceTab#getSqlStatement() ! */ ! @Override ! protected String getSqlStatement() ! { ! return ! "SELECT trigger_defs.text " + ! "FROM sysobjects tables , sysobjects triggers, syscomments trigger_defs " + ! "where triggers.type = 'TR' " + ! "and triggers.id = trigger_defs.id " + ! "and triggers.deltrig = tables.id " + ! "and tables.loginame = ? " + ! // TODO: figure out how to get the name of the table that the trigger ! // is on. ! //"and tables.name = ? " + ! "and triggers.name = ? "; ! } ! ! /** ! * @see net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.table.PSFormattedSourceTab#getBindValues() ! */ ! @Override ! protected String[] getBindValues() ! { ! final IDatabaseObjectInfo doi = getDatabaseObjectInfo(); ! return new String[] { doi.getCatalogName(), doi.getSimpleName() }; ! } } Index: ViewSourceTab.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/plugins/sybase/src/net/sourceforge/squirrel_sql/plugins/SybaseASE/tab/ViewSourceTab.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ViewSourceTab.java 3 Aug 2007 09:36:09 -0000 1.1 --- ViewSourceTab.java 12 Dec 2009 18:06:05 -0000 1.2 *************** *** 18,50 **** * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - import java.sql.PreparedStatement; - import java.sql.SQLException; - - 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; - - import net.sourceforge.squirrel_sql.client.session.ISession; import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.FormattedSourceTab; /** ! * This class will display the source for an Sybase view. ! * ! * @author manningr */ public class ViewSourceTab extends FormattedSourceTab ! { ! /** SQL that retrieves the source of a stored procedure. */ ! private static String SQL = ! "select text " + ! "from sysobjects " + ! "inner join syscomments on syscomments.id = sysobjects.id " + ! "where loginame = ? " + ! "and name = ? "; ! ! /** Logger for this class. */ ! private final static ILogger s_log = ! LoggerController.createLogger(ViewSourceTab.class); ! public ViewSourceTab(String hint, String stmtSep) { --- 18,36 ---- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.FormattedSourceTab; + import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo; /** ! * This class provides the necessary information to the parent tab to display the source for an Sybase view. */ public class ViewSourceTab extends FormattedSourceTab ! { ! /** ! * Constructor ! * ! * @param hint ! * what the user sees on mouse-over tool-tip ! * @param stmtSep ! * the string to use to separate SQL statements ! */ public ViewSourceTab(String hint, String stmtSep) { *************** *** 54,73 **** } ! protected PreparedStatement createStatement() throws SQLException ! { ! final ISession session = getSession(); ! final IDatabaseObjectInfo doi = getDatabaseObjectInfo(); ! ! ISQLConnection conn = session.getSQLConnection(); ! if (s_log.isDebugEnabled()) { ! s_log.debug("Running SQL for View source tab: "+SQL); ! s_log.debug("Binding for param 1: "+doi.getCatalogName()); ! s_log.debug("Binding for param 2: "+doi.getSimpleName()); ! } ! PreparedStatement pstmt = conn.prepareStatement(SQL); ! ! pstmt.setString(1, doi.getCatalogName()); ! pstmt.setString(2, doi.getSimpleName()); ! return pstmt; ! } } --- 40,66 ---- } ! /** ! * @see net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.table.PSFormattedSourceTab#getSqlStatement() ! */ ! @Override ! protected String getSqlStatement() ! { ! return ! "select text " + ! "from sysobjects " + ! "inner join syscomments on syscomments.id = sysobjects.id " + ! "where loginame = ? " + ! "and name = ? "; ! } ! ! /** ! * @see net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.table.PSFormattedSourceTab#getBindValues() ! */ ! @Override ! protected String[] getBindValues() ! { ! final IDatabaseObjectInfo doi = getDatabaseObjectInfo(); ! return new String[] { doi.getCatalogName(), doi.getSimpleName() }; ! } ! } |
|
From: Rob M. <man...@us...> - 2009-12-12 18:06:15
|
Update of /cvsroot/squirrel-sql/sql12/plugins/postgres/src/net/sourceforge/squirrel_sql/plugins/postgres/tab In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv28994/plugins/postgres/src/net/sourceforge/squirrel_sql/plugins/postgres/tab Modified Files: IndexSourceTab.java ProcedureSourceTab.java Log Message: refactoring to remove duplicate plugin code. Index: IndexSourceTab.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/plugins/postgres/src/net/sourceforge/squirrel_sql/plugins/postgres/tab/IndexSourceTab.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** IndexSourceTab.java 30 Mar 2009 01:23:42 -0000 1.5 --- IndexSourceTab.java 12 Dec 2009 18:06:05 -0000 1.6 *************** *** 18,50 **** * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - import java.sql.PreparedStatement; - import java.sql.SQLException; - - 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; - - import net.sourceforge.squirrel_sql.client.session.ISession; import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.FormattedSourceTab; - import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.ViewSourceTab; /** ! * This class will display the source for an PostgreSQL index. ! * ! * @author manningr */ public class IndexSourceTab extends FormattedSourceTab { ! /** SQL that retrieves the source of an index. */ ! private static String SQL = ! "select indexdef " + ! "from pg_indexes " + ! "where schemaname = ? " + ! "and indexname = ? "; ! ! /** Logger for this class. */ ! private final static ILogger s_log = ! LoggerController.createLogger(ViewSourceTab.class); ! public IndexSourceTab(String hint, String stmtSep) { --- 18,36 ---- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.FormattedSourceTab; /** ! * This class provides the necessary information to the parent tab to display the source for an PostgreSQL ! * index. */ public class IndexSourceTab extends FormattedSourceTab { ! /** ! * Constructor ! * ! * @param hint ! * what the user sees on mouse-over tool-tip ! * @param stmtSep ! * the string to use to separate SQL statements ! */ public IndexSourceTab(String hint, String stmtSep) { *************** *** 54,73 **** } ! protected PreparedStatement createStatement() throws SQLException ! { ! final ISession session = getSession(); ! final IDatabaseObjectInfo doi = getDatabaseObjectInfo(); ! ! ISQLConnection conn = session.getSQLConnection(); ! if (s_log.isDebugEnabled()) { ! s_log.debug("Running SQL for index source tab: "+SQL); ! s_log.debug("schema name: "+doi.getSchemaName()); ! s_log.debug("index name: "+doi.getSimpleName()); ! } ! PreparedStatement pstmt = conn.prepareStatement(SQL); ! ! pstmt.setString(1, doi.getSchemaName()); ! pstmt.setString(2, doi.getSimpleName()); ! return pstmt; ! } } --- 40,55 ---- } ! /** ! * @see net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.table.PSFormattedSourceTab#getSqlStatement() ! */ ! @Override ! protected String getSqlStatement() ! { ! return ! "select indexdef " + ! "from pg_indexes " + ! "where schemaname = ? " + ! "and indexname = ? "; ! } ! } Index: ProcedureSourceTab.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/plugins/postgres/src/net/sourceforge/squirrel_sql/plugins/postgres/tab/ProcedureSourceTab.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ProcedureSourceTab.java 18 Jul 2007 01:24:26 -0000 1.5 --- ProcedureSourceTab.java 12 Dec 2009 18:06:05 -0000 1.6 *************** *** 1,3 **** --- 1,4 ---- package net.sourceforge.squirrel_sql.plugins.postgres.tab; + /* * Copyright (C) 2007 Rob Manning *************** *** 18,72 **** * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - 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.FormattedSourceTab; ! 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; /** ! * This class will display the source for an PostgreSQL trigger. ! * ! * @author manningr */ public class ProcedureSourceTab extends FormattedSourceTab { ! /** SQL that retrieves the source of a stored procedure. */ ! private static String SQL = ! "SELECT p.prosrc FROM pg_proc p, pg_namespace n " + ! "where p.pronamespace = n.oid " + ! "and n.nspname = ? " + ! "and p.proname = ? "; ! ! /** Logger for this class. */ ! private final static ILogger s_log = ! LoggerController.createLogger(ProcedureSourceTab.class); ! ! public ProcedureSourceTab(String hint) ! { super(hint); super.setCompressWhitespace(false); } ! protected PreparedStatement createStatement() throws SQLException { ! final ISession session = getSession(); ! final IDatabaseObjectInfo doi = getDatabaseObjectInfo(); ! ! if (s_log.isDebugEnabled()) { ! s_log.debug("Running SQL for procedure source: "+SQL); ! s_log.debug("schema="+doi.getSchemaName()); ! s_log.debug("procedure name="+doi.getSimpleName()); ! } ! ! ISQLConnection conn = session.getSQLConnection(); ! PreparedStatement pstmt = conn.prepareStatement(SQL); ! // Postgres pg_proc table doesn't appear to have schema. I couldn't ! // locate another table to join with to get this info either. ! pstmt.setString(1, doi.getSchemaName()); ! pstmt.setString(2, doi.getSimpleName()); ! return pstmt; } } --- 19,45 ---- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.FormattedSourceTab; ! /** ! * This class will display the source for an PostgreSQL procedure. */ public class ProcedureSourceTab extends FormattedSourceTab { ! public ProcedureSourceTab(String hint) { super(hint); super.setCompressWhitespace(false); } ! /** ! * @see net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.table.PSFormattedSourceTab#getSqlStatement() ! */ ! @Override ! protected String getSqlStatement() { ! return ! "SELECT p.prosrc FROM pg_proc p, pg_namespace n " + ! "where p.pronamespace = n.oid " + ! "and n.nspname = ? " + ! "and p.proname = ? "; } } |
|
From: Rob M. <man...@us...> - 2009-12-08 02:41:38
|
Update of /cvsroot/squirrel-sql/mavenize/update-site/squirrelsql-update-site In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv20120/update-site/squirrelsql-update-site Modified Files: pom.xml Log Message: create the update site as an archive that can be easily transferred to a server. Index: pom.xml =================================================================== RCS file: /cvsroot/squirrel-sql/mavenize/update-site/squirrelsql-update-site/pom.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** pom.xml 20 Nov 2009 01:27:42 -0000 1.1 --- pom.xml 8 Dec 2009 02:41:24 -0000 1.2 *************** *** 12,15 **** --- 12,17 ---- <artifactId>squirrelsql-update-site</artifactId> <version>3.1.0-SNAPSHOT</version> + + <packaging>jar</packaging> <name>SQuirreLSQL Update Site Project</name> *************** *** 400,403 **** --- 402,421 ---- </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>2.2</version> + <configuration> + <classesDirectory>${project.build.directory}/release</classesDirectory> + <archive> + <addMavenDescriptor>false</addMavenDescriptor> + </archive> + <includes> + <include>**/*.jar</include> + <include>**/*.zip</include> + <include>release.xml</include> + </includes> + </configuration> + </plugin> + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>wagon-maven-plugin</artifactId> *************** *** 411,415 **** <execution> <id>ftp-upload-release</id> ! <phase>package</phase> <goals> <goal>upload</goal> --- 429,433 ---- <execution> <id>ftp-upload-release</id> ! <phase>deploy</phase> <goals> <goal>upload</goal> *************** *** 423,437 **** </executions> </plugin> - <!-- - Since the update site is merely a collection of artifacts that are already available in maven, - skip deploying this artifact to the repository. - --> - <plugin> - <artifactId>maven-deploy-plugin</artifactId> - <version>2.4</version> - <configuration> - <skip>true</skip> - </configuration> - </plugin> </plugins> <extensions> --- 441,444 ---- *************** *** 444,446 **** </build> ! </project> \ No newline at end of file --- 451,453 ---- </build> ! </project> |
|
From: Rob M. <man...@us...> - 2009-12-06 00:19:55
|
Update of /cvsroot/squirrel-sql/sql12/doc In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv25793/doc Modified Files: changes.txt Log Message: Committed patch for displaying the source code of Derby stored procedures (give credit). Index: changes.txt =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/doc/changes.txt,v retrieving revision 1.520 retrieving revision 1.521 diff -C2 -d -r1.520 -r1.521 *** changes.txt 6 Dec 2009 00:11:13 -0000 1.520 --- changes.txt 6 Dec 2009 00:15:49 -0000 1.521 *************** *** 8,12 **** Derby Plugin: ! New tab to display the source code of Derby stored procedures (Patch ID 2907220) XML Export: --- 8,14 ---- Derby Plugin: ! New tab to display the source code of Derby stored procedures ! Thanks to Glenn (bassnfool2) for the patch (Patch ID 2907220) ! XML Export: |
|
From: Rob M. <man...@us...> - 2009-12-06 00:11:23
|
Update of /cvsroot/squirrel-sql/sql12/doc In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv25044/doc Modified Files: changes.txt Log Message: Committed patch for displaying the source code of Derby stored procedures. Index: changes.txt =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/doc/changes.txt,v retrieving revision 1.519 retrieving revision 1.520 diff -C2 -d -r1.519 -r1.520 *** changes.txt 1 Dec 2009 23:22:57 -0000 1.519 --- changes.txt 6 Dec 2009 00:11:13 -0000 1.520 *************** *** 7,10 **** --- 7,13 ---- Enhancements: + Derby Plugin: + New tab to display the source code of Derby stored procedures (Patch ID 2907220) + XML Export: Tables in SQuirreL's GUI now allow to export data as XML (besides CSV and MS-Excel export) |
|
From: Rob M. <man...@us...> - 2009-12-06 00:11:21
|
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-serv25044/plugins/derby/src/net/sourceforge/squirrel_sql/plugins/derby/tab Added Files: ProcedureSourceTab.java Log Message: Committed patch for displaying the source code of Derby stored procedures. --- NEW FILE: ProcedureSourceTab.java --- package net.sourceforge.squirrel_sql.plugins.derby.tab; /* * Copyright (C) 2009 Rob Manning * man...@us... * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ 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; } } |
|
From: Rob M. <man...@us...> - 2009-12-06 00:11:21
|
Update of /cvsroot/squirrel-sql/sql12/plugins/derby/src/net/sourceforge/squirrel_sql/plugins/derby In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv25044/plugins/derby/src/net/sourceforge/squirrel_sql/plugins/derby Modified Files: DerbyPlugin.java Log Message: Committed patch for displaying the source code of Derby stored procedures. Index: DerbyPlugin.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/plugins/derby/src/net/sourceforge/squirrel_sql/plugins/derby/DerbyPlugin.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** DerbyPlugin.java 18 Nov 2008 03:07:25 -0000 1.13 --- DerbyPlugin.java 6 Dec 2009 00:11:13 -0000 1.14 *************** *** 54,57 **** --- 54,58 ---- import net.sourceforge.squirrel_sql.plugins.derby.prefs.DerbyPluginPreferencesPanel; import net.sourceforge.squirrel_sql.plugins.derby.prefs.DerbyPreferenceBean; + import net.sourceforge.squirrel_sql.plugins.derby.tab.ProcedureSourceTab; import net.sourceforge.squirrel_sql.plugins.derby.tab.TriggerDetailsTab; import net.sourceforge.squirrel_sql.plugins.derby.tab.TriggerSourceTab; *************** *** 116,120 **** */ public String getVersion() { ! return "0.12"; } --- 117,121 ---- */ public String getVersion() { ! return "0.13"; } *************** *** 262,267 **** _treeAPI = session.getSessionInternalFrame().getObjectTreeAPI(); ! //_treeAPI.addDetailTab(DatabaseObjectType.PROCEDURE, ! // new ProcedureSourceTab(i18n.SHOW_PROCEDURE_SOURCE)); _treeAPI.addDetailTab(DatabaseObjectType.VIEW, --- 263,268 ---- _treeAPI = session.getSessionInternalFrame().getObjectTreeAPI(); ! _treeAPI.addDetailTab(DatabaseObjectType.PROCEDURE, ! new ProcedureSourceTab(i18n.SHOW_PROCEDURE_SOURCE)); _treeAPI.addDetailTab(DatabaseObjectType.VIEW, |
Update of /cvsroot/squirrel-sql/sql12/web-site/eclipse-setup In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv5041/web-site/eclipse-setup Added Files: newprojectwizard.jpg buildingworkspace.jpg cvsperspective.jpg antbuild.jpg checkingout.jpg javaperspective.jpg addcvs.jpg addsrc.jpg newrepository.jpg checkoutasjavaproject.jpg addjars.jpg projectproperties.jpg runas.jpg index.html checkoutas.jpg Log Message: Detailed description of Eclipse setup for web site Thanks David Durham (Patch ID 1868996) --- NEW FILE: buildingworkspace.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: javaperspective.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: newprojectwizard.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: addsrc.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: runas.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: addcvs.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: newrepository.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: antbuild.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: cvsperspective.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: index.html --- <html> <head> <title>SQuirreL SQL Eclipse Setup</title> <style type="text/css"> dt { font-weight: bold } </style> </head> <body> <h2>Eclipse setup</h2> <p>Here's a detailed guide to checking out squirrel from CVS and building from within eclipse. I've also included some information about project settings that aren't explicitly required. <p>You might consider creating a "squirrel" workspace.</p> <h4>Add squirrel cvs repository</h4> <ol> <li>Go to Window -> Open Perspective -> Other... and select CVS Perspective<br> <img src="cvsperspective.jpg"> </li> <li>Then add a new repository<br> <img src="newrepository.jpg"> </li> <li>Enter the following information: <dl><dt>host</dt><dd>squirrel-sql.cvs.sourceforge.net<dd> <dt>repository path</dt><dd>/cvsroot/squirrel-sql</dd> <dt>user</dt><dd>anonymous</dd> <dt>password</dt><dd>-- leave blank --</dd> <dt>connection type</dt><dd>pserver</dd> <dt>save password</dt><dd>-- check this box --</dd> </dl> <img src="addcvs.jpg"> </li> </ol> <h4>Check out project</h4> <ol> <li>Navigate to the sql12 directory, right click and selct "check out project as ..."<br> <img src="checkoutasmenu.jpg"></li> <li>Then select "Checkout project using the New Project wizard."<br> <img src="checkoutas.jpg"></li> <li>Select check out as a java project<br> <img src="newprojectwizard.jpg"></li> <li>Enter a project name and click finish<br> <img src="checkoutasjavaproject.jpg"/></li> <li>Change to the java perspective by clicking yes when this dialog appears.<br> <img src="javaperspective.jpg"></li> <li>You'll then see this window, which will take awhile to complete depending on your connection speed.<br> <img src="checkingout.jpg"></li> <h4>Setting project properties</h4> <ol> <li>Open the project properties dialog<br> <img src="projectproperties.jpg"> </li> <li>Add the src directories from areas of the project you intend to work with. (It's recommended that you add all of them, including the test/src directory to avoid classpath problems.)<br> <img src="addsrc.jpg"></li> <li>Add the jar files from various directories (there are a lot, so this part may take some patience, or it can be skipped if you don't mind compiler errors in your java editor view)<br> <img src="addjars.jpg"></li> <li>Click OK and you'll see this in the bottom right corner.<br> <img src="buildingworkspace.jpg"></li> </ol> <h4>Running the application</h4> Navigate to app/src/net.sourceforge.squirrel_sql.client, right click Main.java and select "run as java application." <img src="runas.jpg"> <h4>Building with ant</h4> <ol><li>Add the ant build file by opening the ant view from Window -> Show View -> Ant, then adding a build/build.xml as a build file. There's an ant icon with + next to it that can be used to add build files. At this point you'll see something like this:<br> <img src="antbuild.jpg"></li> <li>Execute the "make_dist" target to create distribution.</li> <li>You can run the "test" target, but this requires running make_dist first.</li> </ol> </body> </html> --- NEW FILE: checkoutas.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: checkoutasjavaproject.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: checkingout.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: projectproperties.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: addjars.jpg --- (This appears to be a binary file; contents omitted.) |
|
From: Gerd W. <ger...@us...> - 2009-12-01 23:39:04
|
Update of /cvsroot/squirrel-sql/sql12/web-site In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv5041/web-site Modified Files: programming.html Log Message: Detailed description of Eclipse setup for web site Thanks David Durham (Patch ID 1868996) Index: programming.html =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/web-site/programming.html,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** programming.html 23 Feb 2008 10:35:22 -0000 1.5 --- programming.html 1 Dec 2009 23:38:55 -0000 1.6 *************** *** 40,43 **** --- 40,44 ---- <FONT SIZE=3>You set breakpoints by double clicking the left border of the editor.</FONT><p> + <p><FONT SIZE=3>A detailed guide to eclipse setup can be found <a href="eclipse-setup/index.html">here</a></FONT><p> |
|
From: Gerd W. <ger...@us...> - 2009-12-01 23:30:54
|
Update of /cvsroot/squirrel-sql/sql12/web-site/eclipse-setup In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv3808/web-site/eclipse-setup Log Message: Directory /cvsroot/squirrel-sql/sql12/web-site/eclipse-setup added to the repository |
|
From: Gerd W. <ger...@us...> - 2009-12-01 23:23:11
|
Update of /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/gui In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv2561/fw/src/net/sourceforge/squirrel_sql/fw/gui Modified Files: TablePopupMenu.java I18NStrings.properties Log Message: XML Export: Tables in SQuirreL's GUI now allow to export data as XML (besides CSV and MS-Excel export) Thanks to mironsadziak for the patch (Patch ID 2905595) Index: TablePopupMenu.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/gui/TablePopupMenu.java,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** TablePopupMenu.java 19 May 2008 20:19:46 -0000 1.23 --- TablePopupMenu.java 1 Dec 2009 23:22:57 -0000 1.24 *************** *** 358,362 **** ExportCsvAction() { ! // i18n[TablePopupMenu.export=Export CSV / MS Excel ...] super(s_stringMgr.getString("TablePopupMenu.export")); } --- 358,362 ---- ExportCsvAction() { ! // i18n[TablePopupMenu.export=Export CSV / MS Excel / XML ...] super(s_stringMgr.getString("TablePopupMenu.export")); } Index: I18NStrings.properties =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/gui/I18NStrings.properties,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** I18NStrings.properties 18 May 2008 16:13:13 -0000 1.16 --- I18NStrings.properties 1 Dec 2009 23:22:57 -0000 1.17 *************** *** 40,44 **** TablePopupMenu.copyasupdatestatement=Copy as SQL UPDATE-SET statement TablePopupMenu.copyasinsertstatement=Copy as SQL INSERT-VALUES statement ! TablePopupMenu.export=Export CSV / MS Excel ... TablePopupMenu.cut=Cut TablePopupMenu.makeeditable=Make Editable --- 40,44 ---- TablePopupMenu.copyasupdatestatement=Copy as SQL UPDATE-SET statement TablePopupMenu.copyasinsertstatement=Copy as SQL INSERT-VALUES statement ! TablePopupMenu.export=Export CSV / MS Excel / XML ... TablePopupMenu.cut=Cut TablePopupMenu.makeeditable=Make Editable *************** *** 57,59 **** TablePopupMenu.adoptAllColWidthsAction=Adjust all column widths TablePopupMenu.alwaysAdoptAllColWiths=Always adjust all column widths ! TablePopupMenu.showRowNumbers=Show row numbers \ No newline at end of file --- 57,59 ---- TablePopupMenu.adoptAllColWidthsAction=Adjust all column widths TablePopupMenu.alwaysAdoptAllColWiths=Always adjust all column widths ! TablePopupMenu.showRowNumbers=Show row numbers |
Update of /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/gui/action In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv2561/fw/src/net/sourceforge/squirrel_sql/fw/gui/action Modified Files: TableExportCsvCommand.java I18NStrings.properties TableExportCsvDlg.java TableExportCsvController.java Log Message: XML Export: Tables in SQuirreL's GUI now allow to export data as XML (besides CSV and MS-Excel export) Thanks to mironsadziak for the patch (Patch ID 2905595) Index: TableExportCsvController.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/gui/action/TableExportCsvController.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** TableExportCsvController.java 9 Jul 2008 22:51:05 -0000 1.12 --- TableExportCsvController.java 1 Dec 2009 23:22:57 -0000 1.13 *************** *** 37,40 **** --- 37,41 ---- private static final String PREF_KEY_FORMAT_CSV = "SquirrelSQL.csvexport.formatCSV"; private static final String PREF_KEY_FORMAT_XLS = "SquirrelSQL.csvexport.formatXLS"; + private static final String PREF_KEY_FORMAT_XML = "SquirrelSQL.csvexport.formatXML"; private static final StringManager s_stringMgr = *************** *** 47,50 **** --- 48,52 ---- public static final int EXPORT_FORMAT_CSV = 0; public static final int EXPORT_FORMAT_XLS = 1; + public static final int EXPORT_FORMAT_XML = 2; TableExportCsvController() *************** *** 125,128 **** --- 127,138 ---- } }); + + _dlg.radFormatXML.addActionListener(new ActionListener() + { + public void actionPerformed(ActionEvent e) + { + onFormat(true); + } + }); *************** *** 202,205 **** --- 212,227 ---- } } + else if (_dlg.radFormatXML.isSelected()) + { + _dlg.lblSeparator.setEnabled(false); + _dlg.lblCharset.setEnabled(false); + _dlg.chkSeparatorTab.setEnabled(false); + _dlg.txtSeparatorChar.setEnabled(false); + _dlg.charsets.setEnabled(false); + if(replaceEnding) + { + replaceFileEnding(); + } + } else { *************** *** 220,223 **** --- 242,249 ---- newEnding = "xls"; } + else if (_dlg.radFormatXML.isSelected()) + { + newEnding = "xml"; + } else { *************** *** 377,380 **** --- 403,407 ---- Preferences.userRoot().putBoolean(PREF_KEY_FORMAT_CSV, _dlg.radFormatCSV.isSelected()); Preferences.userRoot().putBoolean(PREF_KEY_FORMAT_XLS, _dlg.radFormatXLS.isSelected()); + Preferences.userRoot().putBoolean(PREF_KEY_FORMAT_XML, _dlg.radFormatXML.isSelected()); Preferences.userRoot().putBoolean(PREF_KEY_SEPERATOR_TAB, _dlg.chkSeparatorTab.isSelected()); Preferences.userRoot().put(PREF_KEY_SEPERATOR_CHAR, _dlg.txtSeparatorChar.getText()); *************** *** 410,413 **** --- 437,444 ---- _dlg.radFormatXLS.setSelected(true); } + else if(userRoot.getBoolean(PREF_KEY_FORMAT_XML, false)) + { + _dlg.radFormatXML.setSelected(true); + } else { *************** *** 573,576 **** --- 604,611 ---- return EXPORT_FORMAT_XLS; } + else if(_dlg.radFormatXML.isSelected()) + { + return EXPORT_FORMAT_XML; + } else { Index: TableExportCsvDlg.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/gui/action/TableExportCsvDlg.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** TableExportCsvDlg.java 9 Jul 2008 11:47:54 -0000 1.6 --- TableExportCsvDlg.java 1 Dec 2009 23:22:57 -0000 1.7 *************** *** 34,37 **** --- 34,38 ---- JCheckBox chkWithHeaders; JRadioButton radFormatXLS; + JRadioButton radFormatXML; JRadioButton radFormatCSV; JLabel lblSeparator; *************** *** 75,79 **** super(GUIUtils.getMainFrame(), true); ! // i18n[TableExportCSVDlg.exportTitleNew=CSV / MS Excel export] setTitle(s_stringMgr.getString("TableExportCSVDlg.exportTitleNew")); --- 76,80 ---- super(GUIUtils.getMainFrame(), true); ! // i18n[TableExportCSVDlg.exportTitleNew=CSV / MS Excel / XML export] setTitle(s_stringMgr.getString("TableExportCSVDlg.exportTitleNew")); *************** *** 138,143 **** gbc = new GridBagConstraints(1, 0, 1, 1, 0, 0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0); ret.add(radFormatXLS, gbc); ! gbc = new GridBagConstraints(1, 0, 1, 1, 1, 0, GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0); ret.add(new JPanel(), gbc); --- 139,149 ---- gbc = new GridBagConstraints(1, 0, 1, 1, 0, 0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0); ret.add(radFormatXLS, gbc); + + // i18n[TableExportCsvDlg.formatXML=Export XML file] + radFormatXML = new JRadioButton(s_stringMgr.getString("TableExportCsvDlg.formatXML")); + gbc = new GridBagConstraints(2, 0, 1, 1, 0, 0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0); + ret.add(radFormatXML, gbc); ! gbc = new GridBagConstraints(2, 0, 1, 1, 1, 0, GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0); ret.add(new JPanel(), gbc); *************** *** 146,149 **** --- 152,156 ---- bg.add(radFormatCSV); bg.add(radFormatXLS); + bg.add(radFormatXML); return ret; Index: I18NStrings.properties =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/gui/action/I18NStrings.properties,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** I18NStrings.properties 9 Jul 2008 11:47:54 -0000 1.12 --- I18NStrings.properties 1 Dec 2009 23:22:57 -0000 1.13 *************** *** 12,16 **** TableExportCsvDlg.defaultLabel=Default ! TableExportCSVDlg.exportTitleNew=CSV / MS Excel export TableExportCsvDlg.exportCsvFile=Export to file: TableExportCsvDlg.columnSeparator=Column Separator: --- 12,16 ---- TableExportCsvDlg.defaultLabel=Default ! TableExportCSVDlg.exportTitleNew=CSV / MS Excel / XML export TableExportCsvDlg.exportCsvFile=Export to file: TableExportCsvDlg.columnSeparator=Column Separator: *************** *** 45,48 **** --- 45,49 ---- TableExportCsvDlg.formatCSV=Export CSV file TableExportCsvDlg.formatXLS=Export MS Excel (XLS) file + TableExportCsvDlg.formatXML=Export XML file TableExportCsvDlg.useGlobalPrefsFormatingExcel=Use formatting as configured in Global Prefs (recommended for MS Excel) \ No newline at end of file Index: TableExportCsvCommand.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/gui/action/TableExportCsvCommand.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** TableExportCsvCommand.java 1 Dec 2009 22:59:31 -0000 1.16 --- TableExportCsvCommand.java 1 Dec 2009 23:22:57 -0000 1.17 *************** *** 3,9 **** --- 3,11 ---- import java.io.BufferedWriter; import java.io.File; + import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStreamWriter; + import java.io.PrintStream; import java.sql.Types; import java.util.Calendar; *************** *** 11,14 **** --- 13,28 ---- import javax.swing.JOptionPane; import javax.swing.JTable; + import javax.xml.parsers.DocumentBuilder; + import javax.xml.parsers.DocumentBuilderFactory; + import javax.xml.parsers.ParserConfigurationException; + import javax.xml.transform.OutputKeys; + import javax.xml.transform.Transformer; + import javax.xml.transform.TransformerException; + import javax.xml.transform.TransformerFactory; + import javax.xml.transform.dom.DOMSource; + import javax.xml.transform.stream.StreamResult; + + import org.w3c.dom.Document; + import org.w3c.dom.Element; import jxl.Workbook; *************** *** 208,211 **** --- 222,229 ---- return writeXLS(file, includeHeaders, nbrSelCols, selCols, nbrSelRows, ctrl, selRows); } + else if(TableExportCsvController.EXPORT_FORMAT_XML == ctrl.getExportFormat()) + { + return writeXML(file, includeHeaders, nbrSelCols, selCols, nbrSelRows, ctrl, selRows); + } else { *************** *** 234,238 **** JOptionPane.showMessageDialog(GUIUtils.getMainFrame(), msg); return false; ! } } --- 252,270 ---- JOptionPane.showMessageDialog(GUIUtils.getMainFrame(), msg); return false; ! } catch (ParserConfigurationException e) { ! Object[] params = new Object[]{file, e.getMessage()}; ! // i18n[TableExportCsvCommand.failedToWriteFile=Failed to write file\n{0}\nError message\n{1}\nSee last log entry for details.] ! String msg = s_stringMgr.getString("TableExportCsvCommand.failedToWriteFile", params); ! s_log.error(msg, e); ! JOptionPane.showMessageDialog(GUIUtils.getMainFrame(), msg); ! return false; ! } catch (TransformerException e) { ! Object[] params = new Object[]{file, e.getMessage()}; ! // i18n[TableExportCsvCommand.failedToWriteFile=Failed to write file\n{0}\nError message\n{1}\nSee last log entry for details.] ! String msg = s_stringMgr.getString("TableExportCsvCommand.failedToWriteFile", params); ! s_log.error(msg, e); ! JOptionPane.showMessageDialog(GUIUtils.getMainFrame(), msg); ! return false; ! } } *************** *** 286,289 **** --- 318,439 ---- } + /** + * Writes the selected table data to XML file. + * + * <p> + * Uses DOM for output + * </p> + * + * @param file + * File to output to + * @param includeHeaders + * Set to true if header info (column names) should be included + * @param nbrSelCols + * Number of selected columns + * @param selCols + * Selected columns + * @param nbrSelRows + * Number of selected rows + * @param ctrl + * Export controller + * @param selRows + * Selected rows + * @return If everything went well returns true + * @throws ParserConfigurationException + * If the XML DocumentBuilder cannnot be created + * @throws FileNotFoundException + * When failing to create the file + * @throws TransformerException + * When failing to output the XML structure to the file + */ + private boolean writeXML(File file, boolean includeHeaders, int nbrSelCols, + int[] selCols, int nbrSelRows, TableExportCsvController ctrl, + int[] selRows) throws ParserConfigurationException, + FileNotFoundException, TransformerException { + + // Using a factory to get DocumentBuilder for creating XML's + DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); + DocumentBuilder builder = factory.newDocumentBuilder(); + + // Here instead of parsing an existing document we want to + // create a new one. + Document testDoc = builder.newDocument(); + + // 'table' is the main tag in the XML. + Element root = testDoc.createElement("table"); + testDoc.appendChild(root); + + // 'columns' tag will contain informations about columns + Element columns = testDoc.createElement("columns"); + root.appendChild(columns); + int curRow = 0; + if (includeHeaders) { + for (int colIdx = 0; colIdx < nbrSelCols; ++colIdx) { + String columnName = _table.getColumnName(selCols[colIdx]); + + Element columnEl = testDoc.createElement("column"); + columnEl.setAttribute("number", String.valueOf(colIdx)); + columns.appendChild(columnEl); + + Element columnNameEl = testDoc.createElement("name"); + columnNameEl.setTextContent(columnName); + columnEl.appendChild(columnNameEl); + } + curRow++; + } + + // 'rows' tag contains the data extracted from the table + Element rows = testDoc.createElement("rows"); + root.appendChild(rows); + + for (int rowIdx = 0; rowIdx < nbrSelRows; ++rowIdx) { + Element row = testDoc.createElement("row"); + row.setAttribute("rowNumber", String.valueOf(rowIdx)); + rows.appendChild(row); + for (int colIdx = 0; colIdx < nbrSelCols; ++colIdx) { + + Element value = testDoc.createElement("value"); + Object cellValue = _table.getValueAt(selRows[rowIdx], selCols[colIdx]); + String strCellValue = ""; + if(null != cellValue) + { + strCellValue = cellValue.toString(); + } + + value.setAttribute("columnNumber", String.valueOf(colIdx)); + value.setTextContent(strCellValue); + row.appendChild(value); + + } + curRow++; + } + + // The XML document we created above is still in memory + // so we have to output it to a real file. + // In order to do it we first have to create + // an instance of DOMSource + DOMSource source = new DOMSource(testDoc); + + // PrintStream will be responsible for writing + // the text data to the file + PrintStream ps = new PrintStream(file); + StreamResult result = new StreamResult(ps); + + // Once again we are using a factory of some sort, + // this time for getting a Transformer instance, + // which we use to output the XML + TransformerFactory transformerFactory = TransformerFactory + .newInstance(); + Transformer transformer = transformerFactory.newTransformer(); + + // Indenting the XML + transformer.setOutputProperty(OutputKeys.INDENT, "yes"); + + // The actual output to a file goes here + transformer.transform(source, result); + + return true; + } + private WritableCell getXlsCell(ExtTableColumn col, int colIdx, int curRow, Object cellObj) { |
|
From: Gerd W. <ger...@us...> - 2009-12-01 22:59:43
|
Update of /cvsroot/squirrel-sql/sql12/doc In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv27238/doc Modified Files: changes.txt Log Message: 2879711: Fix for Excel date export concerning dates earlier than 1900-03-01. Thanks to mironsadziak for the patch (Patch ID 2905218) Index: changes.txt =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/doc/changes.txt,v retrieving revision 1.517 retrieving revision 1.518 diff -C2 -d -r1.517 -r1.518 *** changes.txt 30 Nov 2009 23:02:55 -0000 1.517 --- changes.txt 1 Dec 2009 22:59:31 -0000 1.518 *************** *** 69,72 **** --- 69,75 ---- Bug-Fixes: + 2879711: Fix for Excel date export concerning dates earlier than 1900-03-01. + Thanks to mironsadziak for the patch (Patch ID 2905218) + Fixed startup error: java.lang.NullPointerException |
|
From: Gerd W. <ger...@us...> - 2009-12-01 22:59:39
|
Update of /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/gui/action In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv27238/fw/src/net/sourceforge/squirrel_sql/fw/gui/action Modified Files: TableExportCsvCommand.java Log Message: 2879711: Fix for Excel date export concerning dates earlier than 1900-03-01. Thanks to mironsadziak for the patch (Patch ID 2905218) Index: TableExportCsvCommand.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/gui/action/TableExportCsvCommand.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** TableExportCsvCommand.java 9 Jul 2008 11:47:54 -0000 1.15 --- TableExportCsvCommand.java 1 Dec 2009 22:59:31 -0000 1.16 *************** *** 343,347 **** int offset = (cal.get(Calendar.ZONE_OFFSET) + cal.get(Calendar.DST_OFFSET)); ! java.util.Date xlsUTCDate = new java.util.Date(time + offset); ret = new jxl.write.DateTime(colIdx, curRow, xlsUTCDate, jxl.write.DateTime.GMT); break; --- 343,359 ---- int offset = (cal.get(Calendar.ZONE_OFFSET) + cal.get(Calendar.DST_OFFSET)); ! ! long utcTime = time+offset; ! /* Work around Excel's problem with dates before 1900-03-01 ! * http://support.microsoft.com/kb/214058 ! * -2203891200000l is 1900-03-01 UTC time ! * 8640000 means 24 hours ! */ ! if (utcTime < -2203891200000l) ! { ! utcTime += 86400000; ! } ! ! java.util.Date xlsUTCDate = new java.util.Date(utcTime); ret = new jxl.write.DateTime(colIdx, curRow, xlsUTCDate, jxl.write.DateTime.GMT); break; |
|
From: Gerd W. <ger...@us...> - 2009-11-30 23:03:06
|
Update of /cvsroot/squirrel-sql/sql12/doc In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv3797/doc Modified Files: changes.txt Log Message: Fixed startup error Index: changes.txt =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/doc/changes.txt,v retrieving revision 1.516 retrieving revision 1.517 diff -C2 -d -r1.516 -r1.517 *** changes.txt 29 Nov 2009 21:17:54 -0000 1.516 --- changes.txt 30 Nov 2009 23:02:55 -0000 1.517 *************** *** 69,72 **** --- 69,76 ---- Bug-Fixes: + Fixed startup error: + java.lang.NullPointerException + at ... .AliasFolderState.applyExpansionAndSelectionToNode(AliasFolderState.java:144) + Error in Alias tree: Alias vanished / rose error when dragged on itself. |
