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: <ger...@us...> - 2011-02-17 19:01:12
|
Revision: 6160
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6160&view=rev
Author: gerdwagner
Date: 2011-02-17 19:01:06 +0000 (Thu, 17 Feb 2011)
Log Message:
-----------
Added link to Wiki to overview section.
Modified Paths:
--------------
trunk/sql12/web-site/home.html
Modified: trunk/sql12/web-site/home.html
===================================================================
--- trunk/sql12/web-site/home.html 2011-02-13 20:06:44 UTC (rev 6159)
+++ trunk/sql12/web-site/home.html 2011-02-17 19:01:06 UTC (rev 6160)
@@ -172,8 +172,8 @@
<p>For a more detailed introduction see the <a href="paper/SQuirreL_us.pdf">English</a> or
<a href="paper/SQuirreL_de.pdf">German</a> of our paper on SQuirreL.</p>
+ <p>SQuirreL's Wiki page can be found <a href="http://sourceforge.net/apps/trac/squirrel-sql/wiki">here</a>.</p>
-
<p>Susan Cline graciously took the time to document the
<a href="http://db.apache.org/derby/integrate/SQuirreL_Derby.html">steps</a>
she followed to setup an <a href="http://db.apache.org/">Apache Derby</a>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2011-02-13 20:06:50
|
Revision: 6159
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6159&view=rev
Author: manningr
Date: 2011-02-13 20:06:44 +0000 (Sun, 13 Feb 2011)
Log Message:
-----------
New artifactIds added to copy-dependencies for the DBDiff plugin.
Modified Paths:
--------------
trunk/sql12/installer/squirrelsql-other-installer/pom.xml
Modified: trunk/sql12/installer/squirrelsql-other-installer/pom.xml
===================================================================
--- trunk/sql12/installer/squirrelsql-other-installer/pom.xml 2011-02-13 20:06:32 UTC (rev 6158)
+++ trunk/sql12/installer/squirrelsql-other-installer/pom.xml 2011-02-13 20:06:44 UTC (rev 6159)
@@ -119,7 +119,7 @@
-->
<!-- Can we make this list smaller by using groupIds ? -->
- <includeArtifactIds>antlr,asm,asm-attrs,autocomplete,axis,axis-jaxrpc,cglib,common,commons-cli,commons-codec,commons-collections,commons-httpclient,commons-logging,forms,fw,hibernate-annotations,hibernate-commons-annotations,hibernate-entitymanager,hibernate,jxl,log4j,nanoxml,openide,openide-loaders,org-netbeans-modules-editor-fold,org-netbeans-modules-editor-lib,org-netbeans-modules-editor-util,org-netbeans-modules-editor,ostermiller-syntax,rsyntaxtextarea,rtext,spring-beans,squirrel-sql,spring-context-support,spring-context,spring-core,stringtemplate,treetable</includeArtifactIds>
+ <includeArtifactIds>antlr,asm,asm-attrs,autocomplete,axis,axis-jaxrpc,cglib,common,commons-cli,commons-codec,commons-collections,commons-httpclient,commons-logging,forms,fw,hibernate-annotations,hibernate-commons-annotations,hibernate-entitymanager,hibernate,jxl,log4j,nanoxml,openide,openide-loaders,org-netbeans-modules-editor-fold,org-netbeans-modules-editor-lib,org-netbeans-modules-editor-util,org-netbeans-modules-editor,ostermiller-syntax,rsyntaxtextarea,rtext,spring-beans,squirrel-sql,spring-context-support,spring-context,spring-core,stringtemplate,treetable,x86,core,jmeld,javahelp,jide-oss,swing-worker,icu4j,osgi</includeArtifactIds>
<excludeGroupIds>net.sf.squirrel-sql.plugins</excludeGroupIds>
<outputDirectory>${staging.dir}/lib</outputDirectory>
</configuration>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2011-02-13 20:06:38
|
Revision: 6158
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6158&view=rev
Author: manningr
Date: 2011-02-13 20:06:32 +0000 (Sun, 13 Feb 2011)
Log Message:
-----------
New artifactIds added to copy-dependencies for the DBDiff plugin.
Modified Paths:
--------------
trunk/sql12/installer/squirrelsql-macosx-installer/pom.xml
Modified: trunk/sql12/installer/squirrelsql-macosx-installer/pom.xml
===================================================================
--- trunk/sql12/installer/squirrelsql-macosx-installer/pom.xml 2011-02-13 17:48:13 UTC (rev 6157)
+++ trunk/sql12/installer/squirrelsql-macosx-installer/pom.xml 2011-02-13 20:06:32 UTC (rev 6158)
@@ -136,7 +136,7 @@
-->
<!-- Can we make this list smaller by using groupIds ? -->
- <includeArtifactIds>antlr,asm,asm-attrs,autocomplete,axis,axis-jaxrpc,cglib,common,commons-cli,commons-codec,commons-collections,commons-httpclient,commons-logging,forms,fw,hibernate-annotations,hibernate-commons-annotations,hibernate-entitymanager,hibernate,jxl,log4j,nanoxml,openide,openide-loaders,org-netbeans-modules-editor-fold,org-netbeans-modules-editor-lib,org-netbeans-modules-editor-util,org-netbeans-modules-editor,ostermiller-syntax,rsyntaxtextarea,rtext,spring-beans,squirrel-sql,spring-context-support,spring-context,spring-core,stringtemplate,treetable</includeArtifactIds>
+ <includeArtifactIds>antlr,asm,asm-attrs,autocomplete,axis,axis-jaxrpc,cglib,common,commons-cli,commons-codec,commons-collections,commons-httpclient,commons-logging,forms,fw,hibernate-annotations,hibernate-commons-annotations,hibernate-entitymanager,hibernate,jxl,log4j,nanoxml,openide,openide-loaders,org-netbeans-modules-editor-fold,org-netbeans-modules-editor-lib,org-netbeans-modules-editor-util,org-netbeans-modules-editor,ostermiller-syntax,rsyntaxtextarea,rtext,spring-beans,squirrel-sql,spring-context-support,spring-context,spring-core,stringtemplate,treetable,x86,core,jmeld,javahelp,jide-oss,swing-worker,icu4j,osgi</includeArtifactIds>
<excludeGroupIds>net.sf.squirrel-sql.plugins</excludeGroupIds>
<outputDirectory>${staging.dir}/lib</outputDirectory>
</configuration>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2011-02-13 17:48:19
|
Revision: 6157
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6157&view=rev
Author: manningr
Date: 2011-02-13 17:48:13 +0000 (Sun, 13 Feb 2011)
Log Message:
-----------
Added "Getting Started" link to overview section.
Modified Paths:
--------------
trunk/sql12/web-site/home.html
Modified: trunk/sql12/web-site/home.html
===================================================================
--- trunk/sql12/web-site/home.html 2011-02-13 17:01:24 UTC (rev 6156)
+++ trunk/sql12/web-site/home.html 2011-02-13 17:48:13 UTC (rev 6157)
@@ -150,7 +150,10 @@
<p>SQuirreL SQL Client is a graphical Java program that will
allow you to view the structure of a JDBC compliant
- database, browse the data in tables, issue SQL commands etc, see <a href="index.php?page=screenshots">Introduction</a>.
+ database, browse the data in tables, issue SQL commands etc, see
+ <a href="http://sourceforge.net/apps/trac/squirrel-sql/wiki/GettingStarted">Getting Started</a>
+ and
+ <a href="index.php?page=screenshots">Introduction</a>.
The minimum version of Java supported is 1.6.x as of SQuirreL version 3.0. See the
<a href="index.php?page=old">Old Versions</a>
page for versions of SQuirreL that will work with older
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2011-02-13 17:01:33
|
Revision: 6156
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6156&view=rev
Author: manningr
Date: 2011-02-13 17:01:24 +0000 (Sun, 13 Feb 2011)
Log Message:
-----------
Added new mode (side-by-side table definition comparison using internal/external diff tool). Uses components from JMeld to perform internal table definition comparison. Old tabular comparison is still supported via configuration. Default is internal side-by-side comparison.
Modified Paths:
--------------
trunk/sql12/plugins/dbdiff/pom.xml
trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/ColumnDifference.java
trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/DBDiffPlugin.java
trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/DBDiffPluginResources.java
trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/DBDiffPluginSessionCallback.java
trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/SessionInfoProvider.java
trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/TableDiffExecutor.java
trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/actions/CompareAction.java
trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/actions/SelectAction.java
trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/commands/CompareCommand.java
trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/commands/SelectCommand.java
trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/gui/ColumnDiffDialog.java
trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/util/AbstractDifference.java
trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/util/DBUtil.java
trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/util/TableColumnDifference.java
trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/util/TableDifference.java
trunk/sql12/plugins/dbdiff/src/main/resources/doc/changes.txt
trunk/sql12/plugins/dbdiff/src/test/java/net/sourceforge/squirrel_sql/plugins/dbdiff/ColumnDifferenceTest.java
trunk/sql12/plugins/dbdiff/src/test/java/net/sourceforge/squirrel_sql/plugins/dbdiff/DBDiffPluginResourcesTest.java
trunk/sql12/plugins/dbdiff/src/test/java/net/sourceforge/squirrel_sql/plugins/dbdiff/DBDiffPluginTest.java
trunk/sql12/plugins/dbdiff/src/test/java/net/sourceforge/squirrel_sql/plugins/dbdiff/util/AbstractDifferenceTest.java
Added Paths:
-----------
trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/IScriptFileManager.java
trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/ScriptFileManager.java
trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/actions/AbstractDiffAction.java
trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/commands/AbstractDiffCommand.java
trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/gui/AbstractDiffPresentation.java
trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/gui/AbstractSideBySideDiffPresentation.java
trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/gui/DiffPresentationFactoryImpl.java
trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/gui/ExternalToolSideBySideDiffPresentation.java
trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/gui/IDiffPresentation.java
trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/gui/IDiffPresentationFactory.java
trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/gui/JMeldDiffPresentation.java
trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/gui/TabularDiffPresentation.java
trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/prefs/
trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/prefs/DBDiffPreferenceBean.java
trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/prefs/DBDiffPreferencesPanel.java
trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/prefs/DefaultPluginGlobalPreferencesTab.java
trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/prefs/DefaultPluginPreferencesManager.java
trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/prefs/IPluginPreferenceBean.java
trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/prefs/IPluginPreferencesManager.java
trunk/sql12/plugins/dbdiff/src/main/resources/net/sourceforge/squirrel_sql/plugins/dbdiff/prefs/
trunk/sql12/plugins/dbdiff/src/main/resources/net/sourceforge/squirrel_sql/plugins/dbdiff/prefs/I18NStrings.properties
trunk/sql12/plugins/dbdiff/src/test/java/net/sourceforge/squirrel_sql/plugins/dbdiff/gui/
trunk/sql12/plugins/dbdiff/src/test/java/net/sourceforge/squirrel_sql/plugins/dbdiff/gui/AbstractSideBySideDiffPresentationTest.java
trunk/sql12/plugins/dbdiff/src/test/java/net/sourceforge/squirrel_sql/plugins/dbdiff/gui/DiffPresentationFactoryImplTest.java
trunk/sql12/plugins/dbdiff/src/test/java/net/sourceforge/squirrel_sql/plugins/dbdiff/prefs/
trunk/sql12/plugins/dbdiff/src/test/java/net/sourceforge/squirrel_sql/plugins/dbdiff/prefs/DBDiffPreferencesPanelTestUI.java
Removed Paths:
-------------
trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/DiffExecutor.java
Modified: trunk/sql12/plugins/dbdiff/pom.xml
===================================================================
--- trunk/sql12/plugins/dbdiff/pom.xml 2011-02-13 16:04:52 UTC (rev 6155)
+++ trunk/sql12/plugins/dbdiff/pom.xml 2011-02-13 17:01:24 UTC (rev 6156)
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>net.sf.squirrel-sql.plugins</groupId>
@@ -83,6 +84,31 @@
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jmeld</groupId>
+ <artifactId>jmeld</artifactId>
+ <version>2.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.ui</groupId>
+ <artifactId>forms</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse</groupId>
+ <artifactId>compare</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.swt.win32.win32</groupId>
+ <artifactId>x86</artifactId>
+ <version>3.3.0-v3346</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mod4j.org.eclipse.compare</groupId>
+ <artifactId>core</artifactId>
+ <version>3.5.0</version>
+ </dependency>
</dependencies>
<properties>
<pluginClassName>net.sourceforge.squirrel_sql.plugins.dbdiff.DBDiffPlugin</pluginClassName>
@@ -92,7 +118,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- </plugin>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
Modified: trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/ColumnDifference.java
===================================================================
--- trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/ColumnDifference.java 2011-02-13 16:04:52 UTC (rev 6155)
+++ trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/ColumnDifference.java 2011-02-13 17:01:24 UTC (rev 6156)
@@ -1,4 +1,3 @@
-package net.sourceforge.squirrel_sql.plugins.dbdiff;
/*
* Copyright (C) 2007 Rob Manning
* man...@us...
@@ -17,262 +16,309 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
+package net.sourceforge.squirrel_sql.plugins.dbdiff;
+
import net.sourceforge.squirrel_sql.fw.sql.TableColumnInfo;
-
/**
- * This class is responsible for identifying and storing differences between
- * columns in a table.
+ * This class is responsible for identifying and storing differences between columns in a table.
*
* @author manningr
*/
-public class ColumnDifference {
+public class ColumnDifference
+{
- private String tableName = "";
- private String columnName = "";
+ private String tableName = "";
- private int col1Type = -1;
- private int col2Type = -1;
-
- private int col1Length = 0;
- private int col2Length = 0;
-
- private boolean col1IsNullable = false;
- private boolean col2IsNullable = false;
-
- private boolean col1Exists = true;
- private boolean col2Exists = true;
-
- private String col1remarks = "";
- private String col2remarks = "";
-
- private String col1default = "";
- private String col2default = "";
-
- public ColumnDifference() {}
-
- public void setColumns(TableColumnInfo c1, TableColumnInfo c2) {
- if (c1 == null || c2 == null) {
- throw new IllegalArgumentException("c1, c2 cannot be null");
- }
- if (!c1.getTableName().equals(c2.getTableName())) {
- throw new IllegalArgumentException(
- "Columns to be compared must be from the same table");
- }
- if (!c1.getColumnName().equals(c2.getColumnName())) {
- throw new IllegalArgumentException(
- "Columns to be compared must have the same column name");
- }
- setColumn1(c1);
- setColumn2(c2);
- }
+ private String columnName = "";
- public void setColumn1(TableColumnInfo c1) {
- col1Type = c1.getDataType();
- col1Length = c1.getColumnSize();
- col1IsNullable = c1.isNullable().equalsIgnoreCase("NO") ? false : true;
- tableName = c1.getTableName();
- columnName = c1.getColumnName();
- col1remarks = c1.getRemarks();
- col1default = c1.getDefaultValue();
- }
+ private int col1Type = -1;
- public void setColumn2(TableColumnInfo c2) {
- col2Type = c2.getDataType();
- col2Length = c2.getColumnSize();
- col2IsNullable = c2.isNullable().equalsIgnoreCase("NO") ? false : true;
- tableName = c2.getTableName();
- columnName = c2.getColumnName();
- col2remarks = c2.getRemarks();
- col2default = c2.getDefaultValue();
- }
-
- public int getCol1Type() {
- return col1Type;
- }
-
- public int getCol1Length() {
- return col1Length;
- }
-
- public boolean col1AllowsNull() {
- return col1IsNullable;
- }
+ private int col2Type = -1;
- public int getCol2Type() {
- return col2Type;
- }
-
- public int getCol2Length() {
- return col2Length;
- }
-
- public boolean col2AllowsNull() {
- return col2IsNullable;
- }
-
- public String getCol1Remarks() {
- return col1remarks;
- }
-
- public String getCol2Remarks() {
- return col2remarks;
- }
+ private int col1Length = 0;
- public String getCol1Default() {
- return col1default;
- }
-
- public String getCol2Default() {
- return col2default;
- }
-
- /**
- * Returns a boolean indicating whether or not the two columns are different
- * in any aspect.
- *
- * @return
- */
- public boolean execute() {
- if (!col1Exists || !col2Exists) {
- return true;
- }
- if (col1Type != col2Type) {
- return true;
- }
- if (col1Length != col2Length) {
- return true;
- }
- if (col1IsNullable != col2IsNullable) {
- return true;
- }
- if (!remarksEqual()) {
- return true;
- }
- return false;
- }
+ private int col2Length = 0;
- /**
- * @param tableName the tableName to set
- */
- public void setTableName(String tableName) {
- this.tableName = tableName;
- }
+ private boolean col1IsNullable = false;
- /**
- * @return the tableName
- */
- public String getTableName() {
- return tableName;
- }
+ private boolean col2IsNullable = false;
- /**
- * @param columnName the columnName to set
- */
- public void setColumnName(String columnName) {
- this.columnName = columnName;
- }
+ private boolean col1Exists = true;
- /**
- * @return the columnName
- */
- public String getColumnName() {
- return columnName;
- }
+ private boolean col2Exists = true;
- /**
- * @param col1Exists the col1Exists to set
- */
- public void setCol1Exists(boolean col1Exists) {
- this.col1Exists = col1Exists;
- }
+ private String col1remarks = "";
- /**
- * @return the col1Exists
- */
- public boolean isCol1Exists() {
- return col1Exists;
- }
+ private String col2remarks = "";
- /**
- * @param col2Exists the col2Exists to set
- */
- public void setCol2Exists(boolean col2Exists) {
- this.col2Exists = col2Exists;
- }
+ private String col1default = "";
- /**
- * @return the col2Exists
- */
- public boolean isCol2Exists() {
- return col2Exists;
- }
-
- public boolean defaultsEqual() {
- if (col1default == null && col2default == null) {
- return true;
- }
- if ((col1default == null && col2default != null)
- || (col1default != null && col2default == null)) {
- return false;
- }
- return col1default.equals(col2default);
- }
-
- public boolean remarksEqual() {
- if (col1remarks == null && col2remarks == null) {
- return true;
- }
- if ((col1remarks == null && col2remarks != null)
- || (col1remarks != null && col2remarks == null)) {
- return false;
- }
- return col1remarks.equals(col2remarks);
- }
-
- public boolean typesEqual() {
- return col1Type == col2Type;
- }
-
- public boolean lengthsEqual() {
- return col1Length == col2Length;
- }
-
- public boolean nullableEqual() {
- return col1IsNullable == col2IsNullable;
- }
-
- public String toString() {
- StringBuilder result = new StringBuilder();
- result.append("TABLE: ");
- result.append(tableName);
- result.append(" COLUMN: ");
- result.append(columnName);
- result.append("\n");
- result.append("source colType: ");
- result.append(col1Type);
- result.append("\n");
-
- result.append("dest colType: ");
- result.append(col2Type);
- result.append("\n");
+ private String col2default = "";
- result.append("source colLength: ");
- result.append(col1Length);
- result.append("\n");
+ public ColumnDifference()
+ {
+ }
- result.append("dest colLength: ");
- result.append(col2Length);
- result.append("\n");
+ public void setColumns(TableColumnInfo c1, TableColumnInfo c2)
+ {
+ if (c1 == null || c2 == null)
+ {
+ throw new IllegalArgumentException("c1, c2 cannot be null");
+ }
+ if (!c1.getColumnName().equals(c2.getColumnName()))
+ {
+ throw new IllegalArgumentException("Columns to be compared must have the same column name");
+ }
+ setColumn1(c1);
+ setColumn2(c2);
+ }
- result.append("source IsNullable: ");
- result.append(col1IsNullable);
- result.append("\n");
+ public void setColumn1(TableColumnInfo c1)
+ {
+ col1Type = c1.getDataType();
+ col1Length = c1.getColumnSize();
+ col1IsNullable = c1.isNullable().equalsIgnoreCase("NO") ? false : true;
+ tableName = c1.getTableName();
+ columnName = c1.getColumnName();
+ col1remarks = c1.getRemarks();
+ col1default = c1.getDefaultValue();
+ }
- result.append("dest IsNullable: ");
- result.append(col2IsNullable);
- result.append("\n");
-
- return result.toString();
- }
+ public void setColumn2(TableColumnInfo c2)
+ {
+ col2Type = c2.getDataType();
+ col2Length = c2.getColumnSize();
+ col2IsNullable = c2.isNullable().equalsIgnoreCase("NO") ? false : true;
+ tableName = c2.getTableName();
+ columnName = c2.getColumnName();
+ col2remarks = c2.getRemarks();
+ col2default = c2.getDefaultValue();
+ }
+
+ public int getCol1Type()
+ {
+ return col1Type;
+ }
+
+ public int getCol1Length()
+ {
+ return col1Length;
+ }
+
+ public boolean col1AllowsNull()
+ {
+ return col1IsNullable;
+ }
+
+ public int getCol2Type()
+ {
+ return col2Type;
+ }
+
+ public int getCol2Length()
+ {
+ return col2Length;
+ }
+
+ public boolean col2AllowsNull()
+ {
+ return col2IsNullable;
+ }
+
+ public String getCol1Remarks()
+ {
+ return col1remarks;
+ }
+
+ public String getCol2Remarks()
+ {
+ return col2remarks;
+ }
+
+ public String getCol1Default()
+ {
+ return col1default;
+ }
+
+ public String getCol2Default()
+ {
+ return col2default;
+ }
+
+ /**
+ * Returns a boolean indicating whether or not the two columns are different in any aspect.
+ *
+ * @return
+ */
+ public boolean execute()
+ {
+ if (!col1Exists || !col2Exists)
+ {
+ return true;
+ }
+ if (col1Type != col2Type)
+ {
+ return true;
+ }
+ if (col1Length != col2Length)
+ {
+ return true;
+ }
+ if (col1IsNullable != col2IsNullable)
+ {
+ return true;
+ }
+ if (!remarksEqual())
+ {
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * @param tableName
+ * the tableName to set
+ */
+ public void setTableName(String tableName)
+ {
+ this.tableName = tableName;
+ }
+
+ /**
+ * @return the tableName
+ */
+ public String getTableName()
+ {
+ return tableName;
+ }
+
+ /**
+ * @param columnName
+ * the columnName to set
+ */
+ public void setColumnName(String columnName)
+ {
+ this.columnName = columnName;
+ }
+
+ /**
+ * @return the columnName
+ */
+ public String getColumnName()
+ {
+ return columnName;
+ }
+
+ /**
+ * @param col1Exists
+ * the col1Exists to set
+ */
+ public void setCol1Exists(boolean col1Exists)
+ {
+ this.col1Exists = col1Exists;
+ }
+
+ /**
+ * @return the col1Exists
+ */
+ public boolean isCol1Exists()
+ {
+ return col1Exists;
+ }
+
+ /**
+ * @param col2Exists
+ * the col2Exists to set
+ */
+ public void setCol2Exists(boolean col2Exists)
+ {
+ this.col2Exists = col2Exists;
+ }
+
+ /**
+ * @return the col2Exists
+ */
+ public boolean isCol2Exists()
+ {
+ return col2Exists;
+ }
+
+ public boolean defaultsEqual()
+ {
+ if (col1default == null && col2default == null)
+ {
+ return true;
+ }
+ if ((col1default == null && col2default != null) || (col1default != null && col2default == null))
+ {
+ return false;
+ }
+ return col1default.equals(col2default);
+ }
+
+ public boolean remarksEqual()
+ {
+ if (col1remarks == null && col2remarks == null)
+ {
+ return true;
+ }
+ if ((col1remarks == null && col2remarks != null) || (col1remarks != null && col2remarks == null))
+ {
+ return false;
+ }
+ return col1remarks.equals(col2remarks);
+ }
+
+ public boolean typesEqual()
+ {
+ return col1Type == col2Type;
+ }
+
+ public boolean lengthsEqual()
+ {
+ return col1Length == col2Length;
+ }
+
+ public boolean nullableEqual()
+ {
+ return col1IsNullable == col2IsNullable;
+ }
+
+ @Override
+ public String toString()
+ {
+ final StringBuilder result = new StringBuilder();
+ result.append("TABLE: ");
+ result.append(tableName);
+ result.append(" COLUMN: ");
+ result.append(columnName);
+ result.append("\n");
+ result.append("source colType: ");
+ result.append(col1Type);
+ result.append("\n");
+
+ result.append("dest colType: ");
+ result.append(col2Type);
+ result.append("\n");
+
+ result.append("source colLength: ");
+ result.append(col1Length);
+ result.append("\n");
+
+ result.append("dest colLength: ");
+ result.append(col2Length);
+ result.append("\n");
+
+ result.append("source IsNullable: ");
+ result.append(col1IsNullable);
+ result.append("\n");
+
+ result.append("dest IsNullable: ");
+ result.append(col2IsNullable);
+ result.append("\n");
+
+ return result.toString();
+ }
}
Modified: trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/DBDiffPlugin.java
===================================================================
--- trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/DBDiffPlugin.java 2011-02-13 16:04:52 UTC (rev 6155)
+++ trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/DBDiffPlugin.java 2011-02-13 17:01:24 UTC (rev 6156)
@@ -1,5 +1,3 @@
-package net.sourceforge.squirrel_sql.plugins.dbdiff;
-
/*
* Copyright (C) 2007 Rob Manning
* man...@us...
@@ -19,6 +17,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+package net.sourceforge.squirrel_sql.plugins.dbdiff;
+
import javax.swing.JMenu;
import javax.swing.JMenuItem;
import javax.swing.SwingUtilities;
@@ -29,14 +29,21 @@
import net.sourceforge.squirrel_sql.client.plugin.PluginException;
import net.sourceforge.squirrel_sql.client.plugin.PluginResources;
import net.sourceforge.squirrel_sql.client.plugin.PluginSessionCallback;
+import net.sourceforge.squirrel_sql.client.preferences.IGlobalPreferencesPanel;
import net.sourceforge.squirrel_sql.client.session.IObjectTreeAPI;
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectType;
import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo;
+import net.sourceforge.squirrel_sql.fw.util.Utilities;
import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
import net.sourceforge.squirrel_sql.plugins.dbdiff.actions.CompareAction;
import net.sourceforge.squirrel_sql.plugins.dbdiff.actions.SelectAction;
+import net.sourceforge.squirrel_sql.plugins.dbdiff.prefs.DBDiffPreferenceBean;
+import net.sourceforge.squirrel_sql.plugins.dbdiff.prefs.DBDiffPreferencesPanel;
+import net.sourceforge.squirrel_sql.plugins.dbdiff.prefs.DefaultPluginGlobalPreferencesTab;
+import net.sourceforge.squirrel_sql.plugins.dbdiff.prefs.DefaultPluginPreferencesManager;
+import net.sourceforge.squirrel_sql.plugins.dbdiff.prefs.IPluginPreferencesManager;
/**
* The class that sets up the various resources required by SQuirreL to implement a plugin. This plugin
@@ -54,59 +61,70 @@
private ISession diffDestSession = null;
- private IDatabaseObjectInfo[] selectedDatabaseObjects = null;
+ private IDatabaseObjectInfo[] selectedSourceDatabaseObjects = null;
private IDatabaseObjectInfo[] selectedDestDatabaseObjects = null;
+ private IPluginPreferencesManager pluginPreferencesManager = new DefaultPluginPreferencesManager();
+
+ private IScriptFileManager scriptFileManager = new ScriptFileManager();
+
public static final String BUNDLE_BASE_NAME = "net.sourceforge.squirrel_sql.plugins.dbdiff.dbdiff";
- /* (non-Javadoc)
- * @see net.sourceforge.squirrel_sql.client.plugin.ISessionPlugin#sessionStarted(net.sourceforge.squirrel_sql.client.session.ISession)
+ /**
+ * @see net.sourceforge.squirrel_sql.client.plugin.ISessionPlugin#
+ * sessionStarted(net.sourceforge.squirrel_sql.client.session.ISession)
*/
+ @Override
public PluginSessionCallback sessionStarted(final ISession session)
{
addMenuItemsToContextMenu(session);
return new DBDiffPluginSessionCallback(this);
}
- /* (non-Javadoc)
+ /**
* @see net.sourceforge.squirrel_sql.client.plugin.IPlugin#getInternalName()
*/
+ @Override
public String getInternalName()
{
return "dbdiff";
}
- /* (non-Javadoc)
+ /**
* @see net.sourceforge.squirrel_sql.client.plugin.IPlugin#getDescriptiveName()
*/
+ @Override
public String getDescriptiveName()
{
return "DBDiff Plugin";
}
- /* (non-Javadoc)
+ /**
* @see net.sourceforge.squirrel_sql.client.plugin.IPlugin#getAuthor()
*/
+ @Override
public String getAuthor()
{
return "Rob Manning";
}
- /* (non-Javadoc)
+ /**
* @see net.sourceforge.squirrel_sql.client.plugin.DefaultPlugin#getContributors()
*/
+ @Override
public String getContributors()
{
return "";
}
- /* (non-Javadoc)
+ /**
* @see net.sourceforge.squirrel_sql.client.plugin.IPlugin#getVersion()
*/
+ @Override
public String getVersion()
{
- return "0.01";
+ return "0.02";
}
/**
@@ -115,6 +133,7 @@
*
* @return the Help file name or <TT>null</TT> if plugin doesn't have a help file.
*/
+ @Override
public String getHelpFileName()
{
return "readme.html";
@@ -126,6 +145,7 @@
*
* @return the changelog file name or <TT>null</TT> if plugin doesn't have a change log.
*/
+ @Override
public String getChangeLogFileName()
{
return "changes.txt";
@@ -140,6 +160,7 @@
return "licence.txt";
}
+ @Override
public void initialize() throws PluginException
{
super.initialize();
@@ -150,33 +171,53 @@
}
_resources = new DBDiffPluginResources(DBDiffPlugin.BUNDLE_BASE_NAME, this);
+ pluginPreferencesManager.initialize(this, DBDiffPreferenceBean.class);
- IApplication app = getApplication();
- ActionCollection coll = app.getActionCollection();
- coll.add(new SelectAction(app, _resources, this));
- coll.add(new CompareAction(app, _resources, this));
+ final IApplication app = getApplication();
+ final ActionCollection coll = app.getActionCollection();
+ final SelectAction selectAction = new SelectAction(app, _resources, this);
+ selectAction.setPluginPreferencesManager(pluginPreferencesManager);
+ final CompareAction compareAction = new CompareAction(app, _resources, this);
+ compareAction.setPluginPreferencesManager(pluginPreferencesManager);
+
+ coll.add(selectAction);
+ coll.add(compareAction);
+
}
+ /**
+ * Create panel for the Global Properties dialog.
+ *
+ * @return properties panel.
+ */
+ @Override
+ public IGlobalPreferencesPanel[] getGlobalPreferencePanels()
+ {
+ final DBDiffPreferencesPanel preferencesPanel = new DBDiffPreferencesPanel(pluginPreferencesManager);
+ final DefaultPluginGlobalPreferencesTab tab = new DefaultPluginGlobalPreferencesTab(preferencesPanel);
+ return new IGlobalPreferencesPanel[] { tab };
+ }
+
+ @Override
public void unload()
{
super.unload();
- /*
diffSourceSession = null;
- setPasteMenuEnabled(false);
- PreferencesManager.unload();
- */
+ diffDestSession = null;
+ pluginPreferencesManager.unload();
+ scriptFileManager.cleanupScriptFiles();
}
/**
- * @param selectedDatabaseObjects
+ * @param selectedSourceDatabaseObjects
* The selectedDatabaseObjects to set.
*/
public void setSelectedDatabaseObjects(IDatabaseObjectInfo[] dbObjArr)
{
if (dbObjArr != null)
{
- selectedDatabaseObjects = dbObjArr;
+ selectedSourceDatabaseObjects = dbObjArr;
for (int i = 0; i < dbObjArr.length; i++)
{
if (s_log.isDebugEnabled())
@@ -216,10 +257,10 @@
{
// Uses menu.dbdiff.* in dbdiff.properties
- JMenu dbdiffMenu = _resources.createMenu("dbdiff");
+ final JMenu dbdiffMenu = _resources.createMenu("dbdiff");
- JMenuItem selectItem = new JMenuItem(coll.get(SelectAction.class));
- JMenuItem compareItem = new JMenuItem(coll.get(CompareAction.class));
+ final JMenuItem selectItem = new JMenuItem(coll.get(SelectAction.class));
+ final JMenuItem compareItem = new JMenuItem(coll.get(CompareAction.class));
dbdiffMenu.add(selectItem);
dbdiffMenu.add(compareItem);
@@ -230,34 +271,30 @@
}
- /*
- private class DBCopyPluginResources extends PluginResources {
- DBCopyPluginResources(String rsrcBundleBaseName, IPlugin plugin) {
- super(rsrcBundleBaseName, plugin);
- }
- }
- */
public void setCompareMenuEnabled(boolean enabled)
{
final ActionCollection coll = getApplication().getActionCollection();
- CompareAction compareAction = (CompareAction) coll.get(CompareAction.class);
+ final CompareAction compareAction = (CompareAction) coll.get(CompareAction.class);
compareAction.setEnabled(enabled);
}
// Interface SessionInfoProvider implementation
- /* (non-Javadoc)
- * @see net.sourceforge.squirrel_sql.plugins.dbcopy.SessionInfoProvider#getCopySourceSession()
+ /**
+ * @see net.sourceforge.squirrel_sql.plugins.dbdiff.SessionInfoProvider#getSourceSession()
*/
- public ISession getDiffSourceSession()
+ @Override
+ public ISession getSourceSession()
{
return diffSourceSession;
}
- /* (non-Javadoc)
- * @see net.sourceforge.squirrel_sql.plugins.dbcopy.SessionInfoProvider#setCopySourceSession(net.sourceforge.squirrel_sql.client.session.ISession)
+ /**
+ * @see net.sourceforge.squirrel_sql.plugins.dbdiff.SessionInfoProvider#
+ * setSourceSession(net.sourceforge.squirrel_sql.client.session.ISession)
*/
- public void setDiffSourceSession(ISession session)
+ @Override
+ public void setSourceSession(ISession session)
{
if (session != null)
{
@@ -265,40 +302,84 @@
}
}
- /* (non-Javadoc)
- * @see net.sourceforge.squirrel_sql.plugins.dbcopy.SessionInfoProvider#getSelectedDatabaseObjects()
+ /**
+ * @see net.sourceforge.squirrel_sql.plugins.dbdiff.SessionInfoProvider#getSourceSelectedDatabaseObjects()
*/
+ @Override
public IDatabaseObjectInfo[] getSourceSelectedDatabaseObjects()
{
- return selectedDatabaseObjects;
+ return selectedSourceDatabaseObjects;
}
- /* (non-Javadoc)
- * @see net.sourceforge.squirrel_sql.plugins.dbcopy.SessionInfoProvider#getCopyDestSession()
+ /**
+ * @see net.sourceforge.squirrel_sql.plugins.dbdiff.SessionInfoProvider#getDestSession()
*/
- public ISession getDiffDestSession()
+ @Override
+ public ISession getDestSession()
{
return diffDestSession;
}
- /* (non-Javadoc)
- * @see net.sourceforge.squirrel_sql.plugins.dbcopy.SessionInfoProvider#setDestCopySession(net.sourceforge.squirrel_sql.client.session.ISession)
+ /**
+ * @see net.sourceforge.squirrel_sql.plugins.dbdiff.SessionInfoProvider#
+ * setDestSession(net.sourceforge.squirrel_sql.client.session.ISession)
*/
- public void setDestDiffSession(ISession session)
+ @Override
+ public void setDestSession(ISession session)
{
diffDestSession = session;
}
- /* (non-Javadoc)
- * @see net.sourceforge.squirrel_sql.plugins.dbcopy.SessionInfoProvider#getDestSelectedDatabaseObject()
+ /**
+ * @see net.sourceforge.squirrel_sql.plugins.dbdiff.SessionInfoProvider#getDestSelectedDatabaseObjects()
*/
+ @Override
public IDatabaseObjectInfo[] getDestSelectedDatabaseObjects()
{
return selectedDestDatabaseObjects;
}
- public void setDestSelectedDatabaseObjects(IDatabaseObjectInfo[] info)
+ /**
+ * @see net.sourceforge.squirrel_sql.plugins.dbdiff.SessionInfoProvider#
+ * setDestSelectedDatabaseObjects(net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo[])
+ */
+ @Override
+ public void setDestSelectedDatabaseObjects(IDatabaseObjectInfo[] infos)
{
- selectedDestDatabaseObjects = info;
+ selectedDestDatabaseObjects = infos;
}
+
+ @Override
+ public void setSourceSelectedDatabaseObjects(IDatabaseObjectInfo[] infos)
+ {
+ this.selectedSourceDatabaseObjects = infos;
+ }
+
+ /**
+ * @param pluginPreferencesManager
+ * the pluginPreferencesManager to set
+ */
+ public void setPluginPreferencesManager(IPluginPreferencesManager pluginPreferencesManager)
+ {
+ Utilities.checkNull("setPluginPreferencesManager", pluginPreferencesManager, "pluginPreferencesManager");
+ this.pluginPreferencesManager = pluginPreferencesManager;
+ }
+
+ /**
+ * @param scriptFileManager
+ * the scriptFileManager to set
+ */
+ public void setScriptFileManager(IScriptFileManager scriptFileManager)
+ {
+ this.scriptFileManager = scriptFileManager;
+ }
+
+ /**
+ * @return the scriptFileManager
+ */
+ public IScriptFileManager getScriptFileManager()
+ {
+ return scriptFileManager;
+ }
+
}
Modified: trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/DBDiffPluginResources.java
===================================================================
--- trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/DBDiffPluginResources.java 2011-02-13 16:04:52 UTC (rev 6155)
+++ trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/DBDiffPluginResources.java 2011-02-13 17:01:24 UTC (rev 6156)
@@ -16,6 +16,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package net.sourceforge.squirrel_sql.plugins.dbdiff;
import net.sourceforge.squirrel_sql.client.plugin.IPlugin;
Modified: trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/DBDiffPluginSessionCallback.java
===================================================================
--- trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/DBDiffPluginSessionCallback.java 2011-02-13 16:04:52 UTC (rev 6155)
+++ trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/DBDiffPluginSessionCallback.java 2011-02-13 17:01:24 UTC (rev 6156)
@@ -16,6 +16,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package net.sourceforge.squirrel_sql.plugins.dbdiff;
import net.sourceforge.squirrel_sql.client.gui.session.ObjectTreeInternalFrame;
@@ -24,27 +25,27 @@
import net.sourceforge.squirrel_sql.client.session.ISession;
/**
- *
* @author manningr
- *
*/
-public class DBDiffPluginSessionCallback implements PluginSessionCallback {
+public class DBDiffPluginSessionCallback implements PluginSessionCallback
+{
- DBDiffPlugin _plugin = null;
-
- public DBDiffPluginSessionCallback(DBDiffPlugin plugin) {
- _plugin = plugin;
- }
-
- public void sqlInternalFrameOpened(SQLInternalFrame sqlInternalFrame,
- ISession session) {
- // Nothing to do for an SQL internal frame
+ DBDiffPlugin _plugin = null;
- }
+ public DBDiffPluginSessionCallback(DBDiffPlugin plugin)
+ {
+ _plugin = plugin;
+ }
- public void objectTreeInternalFrameOpened(ObjectTreeInternalFrame objectTreeInternalFrame,
- ISession session) {
- _plugin.addMenuItemsToContextMenu(session);
- }
+ public void sqlInternalFrameOpened(SQLInternalFrame sqlInternalFrame, ISession session)
+ {
+ // Nothing to do for an SQL internal frame
+ }
+
+ public void objectTreeInternalFrameOpened(ObjectTreeInternalFrame objectTreeInternalFrame, ISession session)
+ {
+ _plugin.addMenuItemsToContextMenu(session);
+ }
+
}
Deleted: trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/DiffExecutor.java
===================================================================
--- trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/DiffExecutor.java 2011-02-13 16:04:52 UTC (rev 6155)
+++ trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/DiffExecutor.java 2011-02-13 17:01:24 UTC (rev 6156)
@@ -1,282 +0,0 @@
-package net.sourceforge.squirrel_sql.plugins.dbdiff;
-/*
- * Copyright (C) 2007 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.SQLException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.swing.JOptionPane;
-import javax.swing.SwingUtilities;
-
-import net.sourceforge.squirrel_sql.client.gui.mainframe.MainFrame;
-import net.sourceforge.squirrel_sql.client.session.ISession;
-import net.sourceforge.squirrel_sql.fw.dialects.DialectFactory;
-import net.sourceforge.squirrel_sql.fw.gui.GUIUtils;
-import net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectType;
-import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo;
-import net.sourceforge.squirrel_sql.fw.sql.ISQLDatabaseMetaData;
-import net.sourceforge.squirrel_sql.fw.sql.ITableInfo;
-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;
-import net.sourceforge.squirrel_sql.plugins.dbdiff.gui.ColumnDiffDialog;
-import net.sourceforge.squirrel_sql.plugins.dbdiff.util.DBUtil;
-
-/**
- * This is the class that performs the table copy using database connections
- * to two different database schemas.
- */
-public class DiffExecutor {
-
- /** Logger for this class. */
- private final static ILogger s_log =
- LoggerController.createLogger(DiffExecutor.class);
-
- /** Internationalized strings for this class. */
- private static final StringManager s_stringMgr =
- StringManagerFactory.getStringManager(DiffExecutor.class);
-
- static interface i18n {
- // i18n[DiffExecutor.noDiffsMessage=No differences were detected]
- String NO_DIFFS_MESSAGE =
- s_stringMgr.getString("DiffExecutor.noDiffsMessage");
- }
-
- /** the class that provides out session information */
- SessionInfoProvider prov = null;
-
- /** the source session. This comes from prov */
- ISession sourceSession = null;
-
- /** the destination session. This comes from prov */
- ISession destSession = null;
-
- /** the thread we do the work in */
- private Thread execThread = null;
-
- private List<ColumnDifference> colDifferences =
- new ArrayList<ColumnDifference>();
-
- /**
- * Constructor.
- *
- * @param p the provider of information regarding what to copy where.
- */
- public DiffExecutor(SessionInfoProvider p) {
- prov = p;
- sourceSession = prov.getDiffSourceSession();
- destSession = prov.getDiffDestSession();
- }
-
- /**
- * Starts the thread that executes the copy operation.
- */
- public void execute() {
- Runnable runnable = new Runnable() {
- public void run() {
- try {
- _execute();
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- };
- execThread = new Thread(runnable);
- execThread.setName("DBDiff Executor Thread");
- execThread.start();
- }
-
- /**
- * Performs the table diff operation.
- */
- private void _execute() throws SQLException {
- boolean encounteredException = false;
- IDatabaseObjectInfo[] sourceObjs =
- prov.getSourceSelectedDatabaseObjects();
- IDatabaseObjectInfo[] destObjs =
- prov.getDestSelectedDatabaseObjects();
-
- if (!sanityCheck(sourceObjs, destObjs)) {
- return;
- }
-
- ISQLDatabaseMetaData sourceMetaData =
- prov.getDiffSourceSession().getMetaData();
- ISQLDatabaseMetaData destMetaData =
- prov.getDiffDestSession().getMetaData();
-
-
-
- Map<String, ITableInfo> tableMap1 = getTableMap(sourceMetaData, sourceObjs);
- Map<String, ITableInfo> tableMap2 = getTableMap(destMetaData, destObjs);
-
- Set<String> tableNames = getAllTableNames(tableMap1);
- tableNames.addAll(getAllTableNames(tableMap2));
-
- try {
- TableDiffExecutor diff = new TableDiffExecutor(sourceMetaData,
- destMetaData);
- for (String table : tableNames) {
- if (tableMap1.containsKey(table)) {
- if (tableMap2.containsKey(table)) {
- ITableInfo t1 = tableMap1.get(table);
- ITableInfo t2 = tableMap2.get(table);
- diff.setTableInfos(t1, t2);
- diff.execute();
- List<ColumnDifference> columnDiffs =
- diff.getColumnDifferences();
- if (columnDiffs != null && columnDiffs.size() > 0) {
- colDifferences.addAll(columnDiffs);
- for (ColumnDifference colDiff : columnDiffs) {
- System.out.println(colDiff.toString());
- }
- }
- } else {
- // table exists in source db but not dest
- }
- } else {
- // table doesn't exist in source db
- }
-
- }
- final MainFrame frame = sourceSession.getApplication().getMainFrame();
- if (colDifferences != null && colDifferences.size() > 0) {
- GUIUtils.processOnSwingEventThread(new Runnable() {
- public void run() {
- ColumnDiffDialog dialog = new ColumnDiffDialog(frame, false);
- dialog.setColumnDifferences(colDifferences);
- dialog.setSession1Label(sourceSession.getAlias().getName());
- dialog.setSession2Label(destSession.getAlias().getName());
- dialog.setVisible(true);
- }
- });
- } else {
- SwingUtilities.invokeLater(new Runnable() {
- public void run() {
- JOptionPane.showMessageDialog(frame,
- i18n.NO_DIFFS_MESSAGE,
- "DBDiff",
- JOptionPane.INFORMATION_MESSAGE);
- }
- });
- }
- } catch (SQLException e) {
- s_log.error("Encountered unexpected exception while executing " +
- "diff: "+e.getMessage(), e);
- }
-
- if (encounteredException) {
- return;
- }
- }
-
- private Set<String> getAllTableNames(Map<String, ITableInfo> tables) {
- HashSet<String> result = new HashSet<String>();
- result.addAll(tables.keySet());
- return result;
- }
-
- private Map<String, ITableInfo> getTableMap(ISQLDatabaseMetaData md,
- IDatabaseObjectInfo[] objs)
- throws SQLException
- {
- HashMap<String, ITableInfo> result = new HashMap<String, ITableInfo>();
- if (objs[0].getDatabaseObjectType() == DatabaseObjectType.TABLE) {
- for (int i = 0; i < objs.length; i++) {
- IDatabaseObjectInfo info = objs[i];
-
- // TODO: allow the user to specify ignore case or preserve case.
- result.put(info.getSimpleName().toUpperCase(), (ITableInfo)info);
- }
- } else {
- // Assume objs[0] is a schema/catalog
- String catalog = objs[0].getCatalogName();
- String schema = objs[0].getSchemaName();
- md.getTables(catalog, schema, null, new String[] { "TABLE" }, null);
- }
- return result;
- }
-
- /**
- * Returns a list of column differences.
- *
- * @return Returns null if no diffs exist.
- */
- public List<ColumnDifference> getColumnDifferences() {
- return colDifferences;
- }
-
- /**
- * Must have the same number of objects to compare in each set, and they
- * must be the same type of Objects (Schemas or Tables)
- *
- * @param sourceObjs
- * @param destObjs
- * @return
- */
- private boolean sanityCheck(IDatabaseObjectInfo[] sourceObjs,
- IDatabaseObjectInfo[] destObjs)
- {
- boolean result = true;
- if (sourceObjs.length != destObjs.length) {
- result = false;
- }
- if (sourceObjs[0].getDatabaseObjectType()
- != destObjs[0].getDatabaseObjectType())
- {
- result = false;
- }
- return result;
- }
-
- private int[] getTableCounts() {
- int[] result = null;
-
- ISession sourceSession = prov.getDiffSourceSession();
- IDatabaseObjectInfo[] dbObjs = prov.getSourceSelectedDatabaseObjects();
- if (dbObjs != null) {
- result = new int[dbObjs.length];
- for (int i = 0; i < dbObjs.length; i++) {
- if (false == dbObjs[i] instanceof ITableInfo) {
- continue;
- }
- try {
- ITableInfo ti = (ITableInfo) dbObjs[i];
- result[i] =
- DBUtil.getTableCount(sourceSession,
- ti.getCatalogName(),
- ti.getSchemaName(),
- ti.getSimpleName(),
- DialectFactory.SOURCE_TYPE);
- } catch (Exception e) {
- s_log.error(
- "Unexpected exception while attempting to get table counts",e);
- result[i] = 0;
- }
- }
- }
- return result;
- }
-
-}
Added: trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/IScriptFileManager.java
===================================================================
--- trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/IScriptFileManager.java (rev 0)
+++ trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/IScriptFileManager.java 2011-02-13 17:01:24 UTC (rev 6156)
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2011 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
+ */
+
+package net.sourceforge.squirrel_sql.plugins.dbdiff;
+
+import java.io.IOException;
+
+import net.sourceforge.squirrel_sql.client.session.ISession;
+
+/**
+ * Interface for manager of script files. Ihis allows the plugin to cleanup any temporary script files that
+ * were created for comparison purposes.
+ */
+public interface IScriptFileManager
+{
+
+ /**
+ * Creates a filename (for a temporary file) based on the specified session information. This should have
+ * the side effect of storing the filename off for cleanup later.
+ *
+ * @param session
+ * the session in which objects have been selected to have their definitions compared
+ * @param number
+ * which of the two sessions (generally, 1 or 2) is one being passed.
+ * @return a temporary filename
+ * @throws IOException
+ */
+ String getOutputFilenameForSession(ISession session, int number) throws IOException;
+
+ /**
+ * Remove the previously created filenames if they exist.
+ */
+ void cleanupScriptFiles();
+
+}
\ No newline at end of file
Added: trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/ScriptFileManager.java
===================================================================
--- trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/ScriptFileManager.java (rev 0)
+++ trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/ScriptFileManager.java 2011-02-13 17:01:24 UTC (rev 6156)
@@ -0,0 +1,100 @@
+/*
+ * Copyright (C) 2011 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
+ */
+
+package net.sourceforge.squirrel_sql.plugins.dbdiff;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.HashSet;
+
+import net.sourceforge.squirrel_sql.client.session.ISession;
+import net.sourceforge.squirrel_sql.fw.util.FileWrapper;
+import net.sourceforge.squirrel_sql.fw.util.FileWrapperFactory;
+import net.sourceforge.squirrel_sql.fw.util.FileWrapperFactoryImpl;
+import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
+import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
+
+/**
+ *
+ */
+public class ScriptFileManager implements IScriptFileManager
+{
+
+ /** Logger for this class. */
+ private final static ILogger s_log = LoggerController.createLogger(ScriptFileManager.class);
+
+ private final HashSet<String> scriptFiles = new HashSet<String>();
+
+ private FileWrapperFactory fileWrapperFactory = new FileWrapperFactoryImpl();
+
+ /**
+ * @see net.sourceforge.squirrel_sql.plugins.dbdiff.IScriptFileManager#
+ * getOutputFilenameForSession(net.sourceforge.squirrel_sql.client.session.ISession, int)
+ */
+ public String getOutputFilenameForSession(ISession session, int number) throws IOException
+ {
+ final String sessionUserName = session.getAlias().getUserName();
+ final File tempSessionFile =
+ File.createTempFile(sessionUserName + "-" + number + "-session-for-diff-", ".sql");
+ scriptFiles.add(tempSessionFile.getAbsolutePath());
+ if (s_log.isDebugEnabled())
+ {
+ s_log.debug("Created temporary script filename for session: " + tempSessionFile.getAbsolutePath());
+ }
+
+ return tempSessionFile.getAbsolutePath();
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.plugins.dbdiff.IScriptFileManager#cleanupScriptFiles()
+ */
+ public void cleanupScriptFiles()
+ {
+ for (final String scriptFile : scriptFiles)
+ {
+ final FileWrapper fileWrapper = fileWrapperFactory.create(scriptFile);
+ if (fileWrapper.exists())
+ {
+ if (s_log.isDebugEnabled())
+ {
+ s_log.debug("Attempting to delete previously created temporary script file: " + scriptFile);
+ }
+ fileWrapper.delete();
+ }
+ else
+ {
+ if (s_log.isDebugEnabled())
+ {
+ s_log.debug("Previously created temporary script file did not exist: " + scriptFile);
+ }
+
+ }
+ }
+ }
+
+ /**
+ * @param fileWrapperFactory
+ * the fileWrapperFactory to set
+ */
+ public void setFileWrapperFactory(FileWrapperFactory fileWrapperFactory)
+ {
+ this.fileWrapperFactory = fileWrapperFactory;
+ }
+
+}
Modified: trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/SessionInfoProvider.java
===================================================================
--- trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/SessionInfoProvider.java 2011-02-13 16:04:52 UTC (rev 6155)
+++ trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/SessionInfoProvider.java 2011-02-13 17:01:24 UTC (rev 6156)
@@ -2,19 +2,19 @@
* Copyright (C) 2007 Rob Manning
* man...@us...
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or any later version.
+ * 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 program is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
+ * 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 General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * 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
*/
package net.sourceforge.squirrel_sql.plugins.dbdiff;
@@ -22,22 +22,29 @@
import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo;
/**
- * This is implemented in order to pass needed info along to diff executor.
- *
+ * This is implemented in order to pass needed info along to diff executor.
*/
-public interface SessionInfoProvider {
-
- public void setDiffSourceSession(ISession session);
-
- public ISession getDiffSourceSession();
-
- public IDatabaseObjectInfo[] getSourceSelectedDatabaseObjects();
-
- public IDatabaseObjectInfo[] getDestSelectedDatabaseObjects();
-
- public void setDestSelectedDatabaseObjects(IDatabaseObjectInfo[] infos);
-
- public void setDestDiffSession(ISession session);
-
- public ISession getDiffDestSession();
+public interface SessionInfoProvider
+{
+
+ public void setSourceSession(ISession session);
+
+ public ISession getSourceSession();
+
+ public IDatabaseObjectInfo[] getSourceSelectedDatabaseObjects();
+
+ public IDatabaseObjectInfo[] getDestSelectedDatabaseObjects();
+
+ public void setDestSelectedDatabaseObjects(IDatabaseObjectInfo[] infos);
+
+ public void setSourceSelectedDatabaseObjects(IDatabaseObjectInfo[] infos);
+
+ public void setDestSession(ISession session);
+
+ public ISession getDestSession();
+
+ /**
+ * @return the scriptFileManager
+ */
+ public IScriptFileManager getScriptFileManager();
}
Modified: trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/TableDiffExecutor.java
===================================================================
--- trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/TableDiffExecutor.java 2011-02-13 16:04:52 UTC (rev 6155)
+++ trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/TableDiffExecutor.java 2011-02-13 17:01:24 UTC (rev 6156)
@@ -1,3 +1,22 @@
+/*
+ * Copyright (C) 2007 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
+ */
+
package net.sourceforge.squirrel_sql.plugins.dbdiff;
import java.sql.SQLException;
@@ -2,3 +21,2 @@
import java.util.ArrayList;
-import java.util.Comparator;
import java.util.HashMap;
@@ -13,113 +31,117 @@
import net.sourceforge.squirrel_sql.fw.sql.ITableInfo;
import net.sourceforge.squirrel_sql.fw.sql.TableColumnInfo;
-public class TableDiffExecutor {
-
- private ISQLDatabaseMetaData _md1;
- private ISQLDatabaseMetaData _md2;
-
- private ITableInfo _t1;
- private ITableInfo _t2;
-
- private List<ColumnDifference> colDifferences = null;
-
- public TableDiffExecutor(ISQLDatabaseMetaData md1,
- ISQLDatabaseMetaData md2)
- {
- _md1 = md1;
- _md2 = md2;
- }
-
- public void setTableInfos(ITableInfo t1, ITableInfo t2) {
- _t1 = t1;
- _t2 = t2;
- if (colDifferences != null) {
- colDifferences.clear();
- }
- }
-
- public void execute() throws SQLException {
- colDifferences = new ArrayList<ColumnDifference>();
- TableColumnInfo[] t1cols = _md1.getColumnInfo(_t1);
- TableColumnInfo[] t2cols = _md2.getColumnInfo(_t2);
- Set<String> columnNames = getAllColumnNames(t1cols, t2cols);
- Set<String> t1ColumnNames = getAllColumnNames(t1cols);
- Map<String, TableColumnInfo> t1ColMap = getColumnMap(t1cols);
- Set<String> t2ColumnNames = getAllColumnNames(t2cols);
- Map<String, TableColumnInfo> t2ColMap = getColumnMap(t2cols);
-
- for (String columnName : columnNames) {
- ColumnDifference diff = new ColumnDifference();
- if (t1ColumnNames.contains(columnName)) {
- TableColumnInfo c1 = t1ColMap.get(columnName);
-
- if (t2ColumnNames.contains(columnName)) { // Column is in both table 1 and 2
- TableColumnInfo c2 = t2ColMap.get(columnName);
- diff.setColumns(c1, c2);
- } else {
- // Column is in table 1, but not table 2
- diff.setCol2Exists(false);
- diff.setColumn1(c...
[truncated message content] |
|
From: <man...@us...> - 2011-02-13 16:04:59
|
Revision: 6155
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6155&view=rev
Author: manningr
Date: 2011-02-13 16:04:52 +0000 (Sun, 13 Feb 2011)
Log Message:
-----------
A wrapper class for inject-able instances of IDialectFactory that allows the coupling between static DialectFactory methods and many other classes to be removed.
Added Paths:
-----------
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/dialects/DialectFactoryImpl.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/dialects/IDialectFactory.java
Added: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/dialects/DialectFactoryImpl.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/dialects/DialectFactoryImpl.java (rev 0)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/dialects/DialectFactoryImpl.java 2011-02-13 16:04:52 UTC (rev 6155)
@@ -0,0 +1,321 @@
+package net.sourceforge.squirrel_sql.fw.dialects;
+
+import javax.swing.JFrame;
+
+import net.sourceforge.squirrel_sql.fw.sql.ISQLDatabaseMetaData;
+
+/*
+ * Copyright (C) 2010 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
+ */
+
+/**
+ * An implementation of IDialectFactory that delegates to DialectFactory. Since DialectFactory is mostly
+ * static, and performs some static initialization that cannot be undone once initialized, this wrapper allows
+ * classes to have a non-static IDialectFactory injected, rather than rely on the static methods in
+ * DialectFactory which is essentially a big and complex global variable. This means that alternative (for
+ * example, mock) implementations can be substituted for the real DialectFactory, when testing if a real
+ * DialectFactory isn't needed for test purposes.
+ */
+public class DialectFactoryImpl implements IDialectFactory
+{
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.IDialectFactory#
+ * isAxion(net.sourceforge.squirrel_sql.fw.sql.ISQLDatabaseMetaData)
+ */
+ public boolean isAxion(ISQLDatabaseMetaData md)
+ {
+ return DialectFactory.isAxion(md);
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.IDialectFactory#
+ * isDaffodil(net.sourceforge.squirrel_sql.fw.sql.ISQLDatabaseMetaData)
+ */
+ public boolean isDaffodil(ISQLDatabaseMetaData md)
+ {
+ return DialectFactory.isDaffodil(md);
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.IDialectFactory#
+ * isDB2(net.sourceforge.squirrel_sql.fw.sql.ISQLDatabaseMetaData)
+ */
+ public boolean isDB2(ISQLDatabaseMetaData md)
+ {
+ return DialectFactory.isDB2(md);
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.IDialectFactory#
+ * isDerby(net.sourceforge.squirrel_sql.fw.sql.ISQLDatabaseMetaData)
+ */
+ public boolean isDerby(ISQLDatabaseMetaData md)
+ {
+ return DialectFactory.isDerby(md);
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.IDialectFactory#
+ * isFirebird(net.sourceforge.squirrel_sql.fw.sql.ISQLDatabaseMetaData)
+ */
+ public boolean isFirebird(ISQLDatabaseMetaData md)
+ {
+ return DialectFactory.isFirebird(md);
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.IDialectFactory#
+ * isFrontBase(net.sourceforge.squirrel_sql.fw.sql.ISQLDatabaseMetaData)
+ */
+ public boolean isFrontBase(ISQLDatabaseMetaData md)
+ {
+ return DialectFactory.isFrontBase(md);
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.IDialectFactory#
+ * isHADB(net.sourceforge.squirrel_sql.fw.sql.ISQLDatabaseMetaData)
+ */
+ public boolean isHADB(ISQLDatabaseMetaData md)
+ {
+ return DialectFactory.isHADB(md);
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.IDialectFactory#
+ * isH2(net.sourceforge.squirrel_sql.fw.sql.ISQLDatabaseMetaData)
+ */
+ public boolean isH2(ISQLDatabaseMetaData md)
+ {
+ return DialectFactory.isH2(md);
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.IDialectFactory#
+ * isHSQL(net.sourceforge.squirrel_sql.fw.sql.ISQLDatabaseMetaData)
+ */
+ public boolean isHSQL(ISQLDatabaseMetaData md)
+ {
+ return DialectFactory.isHSQL(md);
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.IDialectFactory#
+ * isInformix(net.sourceforge.squirrel_sql.fw.sql.ISQLDatabaseMetaData)
+ */
+ public boolean isInformix(ISQLDatabaseMetaData md)
+ {
+ return DialectFactory.isInformix(md);
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.IDialectFactory#
+ * isIngres(net.sourceforge.squirrel_sql.fw.sql.ISQLDatabaseMetaData)
+ */
+ public boolean isIngres(ISQLDatabaseMetaData md)
+ {
+ return DialectFactory.isIngres(md);
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.IDialectFactory#
+ * isInterbase(net.sourceforge.squirrel_sql.fw.sql.ISQLDatabaseMetaData)
+ */
+ public boolean isInterbase(ISQLDatabaseMetaData md)
+ {
+ return DialectFactory.isInterbase(md);
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.IDialectFactory#
+ * isIntersystemsCacheDialectExt(net.sourceforge.squirrel_sql.fw.sql.ISQLDatabaseMetaData)
+ */
+ public boolean isIntersystemsCacheDialectExt(ISQLDatabaseMetaData md)
+ {
+ return DialectFactory.isIntersystemsCacheDialectExt(md);
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.IDialectFactory#
+ * isMaxDB(net.sourceforge.squirrel_sql.fw.sql.ISQLDatabaseMetaData)
+ */
+ public boolean isMaxDB(ISQLDatabaseMetaData md)
+ {
+ return DialectFactory.isMaxDB(md);
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.IDialectFactory#
+ * isMcKoi(net.sourceforge.squirrel_sql.fw.sql.ISQLDatabaseMetaData)
+ */
+ public boolean isMcKoi(ISQLDatabaseMetaData md)
+ {
+ return DialectFactory.isMcKoi(md);
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.IDialectFactory#
+ * isMSSQLServer(net.sourceforge.squirrel_sql.fw.sql.ISQLDatabaseMetaData)
+ */
+ public boolean isMSSQLServer(ISQLDatabaseMetaData md)
+ {
+ return DialectFactory.isMSSQLServer(md);
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.IDialectFactory#
+ * isMySQL(net.sourceforge.squirrel_sql.fw.sql.ISQLDatabaseMetaData)
+ */
+ public boolean isMySQL(ISQLDatabaseMetaData md)
+ {
+ return DialectFactory.isMySQL(md);
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.IDialectFactory#
+ * isMySQL5(net.sourceforge.squirrel_sql.fw.sql.ISQLDatabaseMetaData)
+ */
+ public boolean isMySQL5(ISQLDatabaseMetaData md)
+ {
+ return DialectFactory.isMySQL5(md);
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.IDialectFactory#
+ * isNetezza(net.sourceforge.squirrel_sql.fw.sql.ISQLDatabaseMetaData)
+ */
+ public boolean isNetezza(ISQLDatabaseMetaData md)
+ {
+ return DialectFactory.isNetezza(md);
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.IDialectFactory#
+ * isOracle(net.sourceforge.squirrel_sql.fw.sql.ISQLDatabaseMetaData)
+ */
+ public boolean isOracle(ISQLDatabaseMetaData md)
+ {
+ return DialectFactory.isOracle(md);
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.IDialectFactory#
+ * isPointbase(net.sourceforge.squirrel_sql.fw.sql.ISQLDatabaseMetaData)
+ */
+ public boolean isPointbase(ISQLDatabaseMetaData md)
+ {
+ return DialectFactory.isPointbase(md);
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.IDialectFactory#
+ * isPostgreSQL(net.sourceforge.squirrel_sql.fw.sql.ISQLDatabaseMetaData)
+ */
+ public boolean isPostgreSQL(ISQLDatabaseMetaData md)
+ {
+ return DialectFactory.isPostgreSQL(md);
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.IDialectFactory#
+ * isProgress(net.sourceforge.squirrel_sql.fw.sql.ISQLDatabaseMetaData)
+ */
+ public boolean isProgress(ISQLDatabaseMetaData md)
+ {
+ return DialectFactory.isProgress(md);
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.IDialectFactory#
+ * isSyBase(net.sourceforge.squirrel_sql.fw.sql.ISQLDatabaseMetaData)
+ */
+ public boolean isSyBase(ISQLDatabaseMetaData md)
+ {
+ return DialectFactory.isSyBase(md);
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.IDialectFactory#
+ * isTimesTen(net.sourceforge.squirrel_sql.fw.sql.ISQLDatabaseMetaData)
+ */
+ public boolean isTimesTen(ISQLDatabaseMetaData md)
+ {
+ return DialectFactory.isTimesTen(md);
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.IDialectFactory#
+ * getDialectType(net.sourceforge.squirrel_sql.fw.sql.ISQLDatabaseMetaData)
+ */
+ public DialectType getDialectType(ISQLDatabaseMetaData md)
+ {
+ return DialectFactory.getDialectType(md);
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.IDialectFactory#getDialect(java.lang.String)
+ */
+ public HibernateDialect getDialect(String dbName)
+ {
+ return DialectFactory.getDialect(dbName);
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.IDialectFactory#getDialectIgnoreCase(java.lang.String)
+ */
+ public HibernateDialect getDialectIgnoreCase(String dbName)
+ {
+ return DialectFactory.getDialectIgnoreCase(dbName);
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.IDialectFactory#
+ * getDialect(net.sourceforge.squirrel_sql.fw.sql.ISQLDatabaseMetaData)
+ */
+ public HibernateDialect getDialect(ISQLDatabaseMetaData md)
+ {
+ return DialectFactory.getDialect(md);
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.IDialectFactory#getDialect(int, javax.swing.JFrame,
+ * net.sourceforge.squirrel_sql.fw.sql.ISQLDatabaseMetaData)
+ */
+ public HibernateDialect getDialect(int sessionType, JFrame parent, ISQLDatabaseMetaData md)
+ throws UserCancelledOperationException
+ {
+ return DialectFactory.getDialect(sessionType, parent, md);
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.IDialectFactory#getDbNames()
+ */
+ public Object[] getDbNames()
+ {
+ return DialectFactory.getDbNames();
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.dialects.IDialectFactory#getSupportedDialects()
+ */
+ public Object[] getSupportedDialects()
+ {
+ return DialectFactory.getSupportedDialects();
+ }
+}
Added: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/dialects/IDialectFactory.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/dialects/IDialectFactory.java (rev 0)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/dialects/IDialectFactory.java 2011-02-13 16:04:52 UTC (rev 6155)
@@ -0,0 +1,359 @@
+package net.sourceforge.squirrel_sql.fw.dialects;
+
+import javax.swing.JFrame;
+
+import net.sourceforge.squirrel_sql.fw.sql.ISQLDatabaseMetaData;
+
+/*
+ * Copyright (C) 2010 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
+ */
+
+/**
+ * An interface for a non-static inject-able DialectFactory.
+ */
+public interface IDialectFactory
+{
+
+ /**
+ * Returns a boolean value indicating whether or not the specified metadata indicates that it is Axion
+ *
+ * @param md
+ * The SQLDatabaseMetaData retrieved from either ISQLConnection.getSQLMetaData() or
+ * ISession.getMetaData()
+ * @return boolean indicating whether or not the specified metadata matches the database type
+ */
+ boolean isAxion(ISQLDatabaseMetaData md);
+
+ /**
+ * Returns a boolean value indicating whether or not the specified metadata indicates that it is Daffodil
+ *
+ * @param md
+ * The SQLDatabaseMetaData retrieved from either ISQLConnection.getSQLMetaData() or
+ * ISession.getMetaData()
+ * @return boolean indicating whether or not the specified metadata matches the database type
+ */
+ boolean isDaffodil(ISQLDatabaseMetaData md);
+
+ /**
+ * Returns a boolean value indicating whether or not the specified metadata indicates that it is DB2
+ *
+ * @param md
+ * The SQLDatabaseMetaData retrieved from either ISQLConnection.getSQLMetaData() or
+ * ISession.getMetaData()
+ * @return boolean indicating whether or not the specified metadata matches the database type
+ */
+ boolean isDB2(ISQLDatabaseMetaData md);
+
+ /**
+ * Returns a boolean value indicating whether or not the specified metadata indicates that it is derby
+ *
+ * @param md
+ * The SQLDatabaseMetaData retrieved from either ISQLConnection.getSQLMetaData() or
+ * ISession.getMetaData()
+ * @return boolean indicating whether or not the specified metadata matches the database type
+ */
+ boolean isDerby(ISQLDatabaseMetaData md);
+
+ /**
+ * Returns a boolean value indicating whether or not the specified metadata indicates that it is firebird
+ *
+ * @param md
+ * The SQLDatabaseMetaData retrieved from either ISQLConnection.getSQLMetaData() or
+ * ISession.getMetaData()
+ * @return boolean indicating whether or not the specified metadata matches the database type
+ */
+ boolean isFirebird(ISQLDatabaseMetaData md);
+
+ /**
+ * Returns a boolean value indicating whether or not the specified metadata indicates that it is frontbase
+ *
+ * @param md
+ * The SQLDatabaseMetaData retrieved from either ISQLConnection.getSQLMetaData() or
+ * ISession.getMetaData()
+ * @return boolean indicating whether or not the specified metadata matches the database type
+ */
+ boolean isFrontBase(ISQLDatabaseMetaData md);
+
+ /**
+ * Returns a boolean value indicating whether or not the specified metadata indicates that it is HADB
+ *
+ * @param md
+ * The SQLDatabaseMetaData retrieved from either ISQLConnection.getSQLMetaData() or
+ * ISession.getMetaData()
+ * @return boolean indicating whether or not the specified metadata matches the database type
+ */
+ boolean isHADB(ISQLDatabaseMetaData md);
+
+ /**
+ * Returns a boolean value indicating whether or not the specified metadata indicates that it is H2
+ *
+ * @param md
+ * The SQLDatabaseMetaData retrieved from either ISQLConnection.getSQLMetaData() or
+ * ISession.getMetaData()
+ * @return boolean indicating whether or not the specified metadata matches the database type
+ */
+ boolean isH2(ISQLDatabaseMetaData md);
+
+ /**
+ * Returns a boolean value indicating whether or not the specified metadata indicates that it is HSQL
+ *
+ * @param md
+ * The SQLDatabaseMetaData retrieved from either ISQLConnection.getSQLMetaData() or
+ * ISession.getMetaData()
+ * @return boolean indicating whether or not the specified metadata matches the database type
+ */
+ boolean isHSQL(ISQLDatabaseMetaData md);
+
+ /**
+ * Returns a boolean value indicating whether or not the specified metadata indicates that it is Informix
+ *
+ * @param md
+ * The SQLDatabaseMetaData retrieved from either ISQLConnection.getSQLMetaData() or
+ * ISession.getMetaData()
+ * @return boolean indicating whether or not the specified metadata matches the database type
+ */
+ boolean isInformix(ISQLDatabaseMetaData md);
+
+ /**
+ * Returns a boolean value indicating whether or not the specified metadata indicates that it is Ingres
+ *
+ * @param md
+ * The SQLDatabaseMetaData retrieved from either ISQLConnection.getSQLMetaData() or
+ * ISession.getMetaData()
+ * @return boolean indicating whether or not the specified metadata matches the database type
+ */
+ boolean isIngres(ISQLDatabaseMetaData md);
+
+ /**
+ * Returns a boolean value indicating whether or not the specified metadata indicates that it is Interbase
+ *
+ * @param md
+ * The SQLDatabaseMetaData retrieved from either ISQLConnection.getSQLMetaData() or
+ * ISession.getMetaData()
+ * @return boolean indicating whether or not the specified metadata matches the database type
+ */
+ boolean isInterbase(ISQLDatabaseMetaData md);
+
+ /**
+ * Returns a boolean value indicating whether or not the specified metadata indicates that it is
+ * InterSystems Cache
+ *
+ * @param md
+ * The SQLDatabaseMetaData retrieved from either ISQLConnection.getSQLMetaData() or
+ * ISession.getMetaData()
+ * @return boolean indicating whether or not the specified metadata matches the database type
+ */
+ boolean isIntersystemsCacheDialectExt(ISQLDatabaseMetaData md);
+
+ /**
+ * Returns a boolean value indicating whether or not the specified metadata indicates that it is MaxDB
+ *
+ * @param md
+ * The SQLDatabaseMetaData retrieved from either ISQLConnection.getSQLMetaData() or
+ * ISession.getMetaData()
+ * @return boolean indicating whether or not the specified metadata matches the database type
+ */
+ boolean isMaxDB(ISQLDatabaseMetaData md);
+
+ /**
+ * Returns a boolean value indicating whether or not the specified metadata indicates that it is McKoi
+ *
+ * @param md
+ * The SQLDatabaseMetaData retrieved from either ISQLConnection.getSQLMetaData() or
+ * ISession.getMetaData()
+ * @return boolean indicating whether or not the specified metadata matches the database type
+ */
+ boolean isMcKoi(ISQLDatabaseMetaData md);
+
+ /**
+ * Returns a boolean value indicating whether or not the specified metadata indicates that it is MSSQL
+ * Server
+ *
+ * @param md
+ * The SQLDatabaseMetaData retrieved from either ISQLConnection.getSQLMetaData() or
+ * ISession.getMetaData()
+ * @return boolean indicating whether or not the specified metadata matches the database type
+ */
+ boolean isMSSQLServer(ISQLDatabaseMetaData md);
+
+ /**
+ * Returns a boolean value indicating whether or not the specified metadata indicates that it is MySQL 4 or
+ * below
+ *
+ * @param md
+ * The SQLDatabaseMetaData retrieved from either ISQLConnection.getSQLMetaData() or
+ * ISession.getMetaData()
+ * @return boolean indicating whether or not the specified metadata matches the database type
+ */
+ boolean isMySQL(ISQLDatabaseMetaData md);
+
+ /**
+ * Returns a boolean value indicating whether or not the specified metadata indicates that it is MySQL 5
+ *
+ * @param md
+ * The SQLDatabaseMetaData retrieved from either ISQLConnection.getSQLMetaData() or
+ * ISession.getMetaData()
+ * @return boolean indicating whether or not the specified metadata matches the database type
+ */
+ boolean isMySQL5(ISQLDatabaseMetaData md);
+
+ /**
+ * Returns a boolean value indicating whether or not the specified metadata indicates that it is Netezza
+ *
+ * @param md
+ * The SQLDatabaseMetaData retrieved from either ISQLConnection.getSQLMetaData() or
+ * ISession.getMetaData()
+ * @return boolean indicating whether or not the specified metadata matches the database type
+ */
+ boolean isNetezza(ISQLDatabaseMetaData md);
+
+ /**
+ * Returns a boolean value indicating whether or not the specified metadata indicates that it is Oracle
+ *
+ * @param md
+ * The SQLDatabaseMetaData retrieved from either ISQLConnection.getSQLMetaData() or
+ * ISession.getMetaData()
+ * @return boolean indicating whether or not the specified metadata matches the database type
+ */
+ boolean isOracle(ISQLDatabaseMetaData md);
+
+ /**
+ * Returns a boolean value indicating whether or not the specified metadata indicates that it is Pointbase
+ *
+ * @param md
+ * The SQLDatabaseMetaData retrieved from either ISQLConnection.getSQLMetaData() or
+ * ISession.getMetaData()
+ * @return boolean indicating whether or not the specified metadata matches the database type
+ */
+ boolean isPointbase(ISQLDatabaseMetaData md);
+
+ /**
+ * Returns a boolean value indicating whether or not the specified metadata indicates that it is PostgreSQL
+ *
+ * @param md
+ * The SQLDatabaseMetaData retrieved from either ISQLConnection.getSQLMetaData() or
+ * ISession.getMetaData()
+ * @return boolean indicating whether or not the specified metadata matches the database type
+ */
+ boolean isPostgreSQL(ISQLDatabaseMetaData md);
+
+ /**
+ * Returns a boolean value indicating whether or not the specified metadata indicates that it is Progress
+ *
+ * @param md
+ * The SQLDatabaseMetaData retrieved from either ISQLConnection.getSQLMetaData() or
+ * ISession.getMetaData()
+ * @return boolean indicating whether or not the specified metadata matches the database type
+ */
+ boolean isProgress(ISQLDatabaseMetaData md);
+
+ /**
+ * Returns a boolean value indicating whether or not the specified metadata indicates that it is SyBase
+ *
+ * @param md
+ * The SQLDatabaseMetaData retrieved from either ISQLConnection.getSQLMetaData() or
+ * ISession.getMetaData()
+ * @return boolean indicating whether or not the specified metadata matches the database type
+ */
+ boolean isSyBase(ISQLDatabaseMetaData md);
+
+ /**
+ * Returns a boolean value indicating whether or not the specified metadata indicates that it is Oracle
+ * Times Ten
+ *
+ * @param md
+ * The SQLDatabaseMetaData retrieved from either ISQLConnection.getSQLMetaData() or
+ * ISession.getMetaData()
+ * @return boolean indicating whether or not the specified metadata matches the database type
+ */
+ boolean isTimesTen(ISQLDatabaseMetaData md);
+
+ /**
+ * Returns a DialectType for the specified ISQLDatabaseMetaData
+ *
+ * @param md
+ * The SQLDatabaseMetaData retrieved from either ISQLConnection.getSQLMetaData() or
+ * ISession.getMetaData()
+ * @return a dialect type
+ */
+ DialectType getDialectType(ISQLDatabaseMetaData md);
+
+ /**
+ * Returns the HibernateDialect that corresponds with the specified database display name.
+ *
+ * @param dbName
+ * the database display name
+ * @return a HibernateDialect matching the specified database display name exactly, or null.
+ */
+ HibernateDialect getDialect(String dbName);
+
+ /**
+ * Returns the HibernateDialect that corresponds with the specified metadata.
+ *
+ * @param dbName
+ * the database display name
+ * @return a HibernateDialect matching the specified database display name ignoring case, or null.
+ */
+ HibernateDialect getDialectIgnoreCase(String dbName);
+
+ /**
+ * Returns the HibernateDialect that corresponds with the specified metadata.
+ *
+ * @param md
+ * The SQLDatabaseMetaData retrieved from either ISQLConnection.getSQLMetaData() or
+ * ISession.getMetaData()
+ * @return the HibernateDialect that corresponds with the specified metadata. If no specific implementation
+ * matches the specified metadata, then a generic dialect is returned.
+ */
+ HibernateDialect getDialect(ISQLDatabaseMetaData md);
+
+ /**
+ * Shows the user a dialog explaining that we failed to detect the dialect of the destination database, and
+ * we are offering the user the opportunity to pick one from our supported dialects list. If the user
+ * cancels this dialog, null is returned to indicate that the user doesn't wish to continue the paste
+ * operation.
+ *
+ * @param sessionType
+ * the type of the session (source or destination). This is a left over from DBCopy Plugin and
+ * should be refactored to not need this at some point.
+ * @param parent
+ * the JFrame to use to display the dialog over.
+ * @param md
+ * The SQLDatabaseMetaData retrieved from either ISQLConnection.getSQLMetaData() or
+ * ISession.getMetaData()
+ * @return the dialect that the user picked.
+ */
+ HibernateDialect getDialect(int sessionType, JFrame parent, ISQLDatabaseMetaData md)
+ throws UserCancelledOperationException;
+
+ /**
+ * Returns a list of Database display names that can be presented to the user whenever we want the user to
+ * pick a dialect. It is from this list, that the string parameter in getDialect(String) should be chosen.
+ *
+ * @return a list of database display names
+ */
+ Object[] getDbNames();
+
+ /**
+ * Returns an array of HibernateDialect instances, one for each supported dialect.
+ *
+ * @return an array of HibernateDialect instances. This array doesn't include the generic dialect.
+ */
+ Object[] getSupportedDialects();
+
+}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2011-02-05 16:05:41
|
Revision: 6154
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6154&view=rev
Author: manningr
Date: 2011-02-05 16:05:35 +0000 (Sat, 05 Feb 2011)
Log Message:
-----------
Fixes bug #3171762 (Wrong syntax for DROP KEY). Don't "pre-qualify" the table name. Let the dialect system do it according to the user's preference.
Modified Paths:
--------------
trunk/sql12/doc/src/main/resources/changes.txt
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2011-02-05 16:03:32 UTC (rev 6153)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2011-02-05 16:05:35 UTC (rev 6154)
@@ -18,6 +18,8 @@
Bug-fixes:
+3171762: Wrong syntax for DROP KEY (When qualify table name preference is selected this produced two schema
+ or catalog prefixes on the table name)
3148653: Missing App Icon on Mac OS X (Fix is available in the Mac OS X 3.2.1 installer file)
Fixed NullPointerException in Hibernate Plugin when executing HQL with 'view objects' switched on.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 6153
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6153&view=rev
Author: manningr
Date: 2011-02-05 16:03:32 +0000 (Sat, 05 Feb 2011)
Log Message:
-----------
Fixes bug #3171762 (Wrong syntax for DROP KEY). Don't "pre-qualify" the table name. Let the dialect system do it according to the user's preference.
Modified Paths:
--------------
trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/DropPrimaryKeyCommand.java
Modified: trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/DropPrimaryKeyCommand.java
===================================================================
--- trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/DropPrimaryKeyCommand.java 2011-02-05 15:15:32 UTC (rev 6152)
+++ trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/DropPrimaryKeyCommand.java 2011-02-05 16:03:32 UTC (rev 6153)
@@ -172,7 +172,11 @@
customDialog.addShowSQLListener(new ShowSQLListener(i18n.SHOWSQL_DIALOG_TITLE, customDialog));
customDialog.setLocationRelativeTo(_session.getApplication().getMainFrame());
customDialog.setMultiSelection();
- customDialog.setTableName(ti.getQualifiedName());
+
+ // We use simple name here so that the user can choose for themselves whether or not to qualify the
+ // table name. This also addresses Bug #3171762 which results in "double qualifying" the table name
+ // if the user's preference is to qualify table names.
+ customDialog.setTableName(ti.getSimpleName());
SQLDatabaseMetaData md = _session.getSQLConnection().getSQLMetaData();
PrimaryKeyInfo[] infos = md.getPrimaryKey(ti);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2011-02-05 15:15:38
|
Revision: 6152
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6152&view=rev
Author: manningr
Date: 2011-02-05 15:15:32 +0000 (Sat, 05 Feb 2011)
Log Message:
-----------
Update test dependencies for new snapshot release.
Modified Paths:
--------------
trunk/sql12/squirrelsql-integration-environment/pom.xml
Modified: trunk/sql12/squirrelsql-integration-environment/pom.xml
===================================================================
--- trunk/sql12/squirrelsql-integration-environment/pom.xml 2011-02-03 03:48:23 UTC (rev 6151)
+++ trunk/sql12/squirrelsql-integration-environment/pom.xml 2011-02-05 15:15:32 UTC (rev 6152)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>squirrel-root-pom</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.3.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>squirrelsql-integration-environment</artifactId>
@@ -55,6 +55,10 @@
<url>https://www.squirrel-sql.org/hudson/</url>
</ciManagement>
+ <properties>
+ <squirrel-sql-version>3.3.0-SNAPSHOT</squirrel-sql-version>
+ </properties>
+
<!-- This is blatant copy/paste from squirrelsql-launcher pom.xml -->
<build>
<resources>
@@ -78,23 +82,23 @@
<dependency>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>fw</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>${squirrel-sql-version}</version>
</dependency>
<dependency>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>fw</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>${squirrel-sql-version}</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>squirrel-sql</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>${squirrel-sql-version}</version>
</dependency>
<dependency>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>squirrel-sql</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>${squirrel-sql-version}</version>
<type>test-jar</type>
</dependency>
<dependency>
@@ -110,22 +114,22 @@
<dependency>
<groupId>net.sf.squirrel-sql.plugins</groupId>
<artifactId>db2</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>${squirrel-sql-version}</version>
</dependency>
<dependency>
<groupId>net.sf.squirrel-sql.plugins</groupId>
<artifactId>informix</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>${squirrel-sql-version}</version>
</dependency>
<dependency>
<groupId>net.sf.squirrel-sql.plugins</groupId>
<artifactId>refactoring</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>${squirrel-sql-version}</version>
</dependency>
<dependency>
<groupId>net.sf.squirrel-sql.plugins</groupId>
<artifactId>sqlscript</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>${squirrel-sql-version}</version>
</dependency>
<dependency>
<groupId>gsbase</groupId>
@@ -194,13 +198,11 @@
</build>
</profile>
<!--
- Some of the following jdbc driver profiles contain dependencies that
- aren't hosted in Maven Central because they are proprietary. That is
- one reason they appear in profiles. They each get their own profile
- to support running with different versions of the same driver, which
- would not be possible if all versions of a given driver were included
- in a single profile. These dependencies are hosted on
- https://www.squirrel-sql.org/nexus/content/groups/public.
+ Some of the following jdbc driver profiles contain dependencies that aren't hosted in Maven
+ Central because they are proprietary. That is one reason they appear in profiles. They each get
+ their own profile to support running with different versions of the same driver, which would not
+ be possible if all versions of a given driver were included in a single profile. These
+ dependencies are hosted on https://www.squirrel-sql.org/nexus/content/groups/public.
-->
<profile>
<id>db2-8.1</id>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2011-02-03 03:48:29
|
Revision: 6151
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6151&view=rev
Author: gerdwagner
Date: 2011-02-03 03:48:23 +0000 (Thu, 03 Feb 2011)
Log Message:
-----------
Message Panel right mouse menu "Save size 0"
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/mainframe/SplitPnResizeHandler.java
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/mainframe/SplitPnResizeHandler.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/mainframe/SplitPnResizeHandler.java 2011-02-03 03:27:49 UTC (rev 6150)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/mainframe/SplitPnResizeHandler.java 2011-02-03 03:48:23 UTC (rev 6151)
@@ -102,7 +102,7 @@
{
if (0 == prefMsgPanelHeight)
{
- setUnexpanded();
+ tryForceUnexpanded();
}
else
{
@@ -117,6 +117,22 @@
}
}
+ /**
+ * Used at startup and almost always makes it to hide the Message panel at startup
+ */
+ private void tryForceUnexpanded()
+ {
+ setUnexpanded();
+ Runnable runnable = new Runnable()
+ {
+ public void run()
+ {
+ setUnexpanded();
+ }
+ };
+ SwingUtilities.invokeLater(runnable);
+ }
+
private int getDividerLocation(int wantedBottomComponentHeight, JSplitPane splitPn)
{
int splitBarSize =
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2011-02-03 03:27:55
|
Revision: 6150
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6150&view=rev
Author: gerdwagner
Date: 2011-02-03 03:27:49 +0000 (Thu, 03 Feb 2011)
Log Message:
-----------
Hibernate Plugin: Removed unused imports to regain compile independence from Hibernate API changes, see patch ID 3168381
Modified Paths:
--------------
trunk/sql12/doc/src/main/resources/changes.txt
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/util/HibernateUtil.java
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2011-01-31 23:31:25 UTC (rev 6149)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2011-02-03 03:27:49 UTC (rev 6150)
@@ -24,6 +24,7 @@
Hibernate Plugin: Made HQL code completion work more exact.
+Hibernate Plugin: Removed unused imports to regain compile independence from Hibernate API changes, see patch ID 3168381
3.2.1 (12/29/2010)
==================
Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/util/HibernateUtil.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/util/HibernateUtil.java 2011-01-31 23:31:25 UTC (rev 6149)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/util/HibernateUtil.java 2011-02-03 03:27:49 UTC (rev 6150)
@@ -18,26 +18,15 @@
*/
package net.sourceforge.squirrel_sql.plugins.hibernate.util;
-import java.io.*;
-import java.sql.SQLException;
-
-import net.sourceforge.squirrel_sql.client.gui.db.ISQLAliasExt;
-import net.sourceforge.squirrel_sql.client.session.ISession;
-import net.sourceforge.squirrel_sql.fw.sql.ISQLDatabaseMetaData;
-import net.sourceforge.squirrel_sql.fw.sql.ISQLDriver;
import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
-
import net.sourceforge.squirrel_sql.fw.xml.XMLBeanReader;
import net.sourceforge.squirrel_sql.fw.xml.XMLException;
import net.sourceforge.squirrel_sql.plugins.hibernate.HibernatePlugin;
import net.sourceforge.squirrel_sql.plugins.hibernate.configuration.HibernateConfigController;
-import org.hibernate.SessionFactory;
-import org.hibernate.cfg.Configuration;
-import org.hibernate.cfg.Environment;
-import org.hibernate.dialect.Dialect;
-import org.hibernate.dialect.DialectFactory;
+import java.io.*;
+
/**
* Class that provides utility methods for obtaining SessionFactory objects.
*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2011-01-31 23:31:32
|
Revision: 6149
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6149&view=rev
Author: gerdwagner
Date: 2011-01-31 23:31:25 +0000 (Mon, 31 Jan 2011)
Log Message:
-----------
Message Panel right mouse menu "Save size 0"
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/mainframe/MainFrame.java
trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/gui/mainframe/I18NStrings.properties
trunk/sql12/doc/src/main/resources/changes.txt
Added Paths:
-----------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/mainframe/SplitPnResizeHandler.java
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/mainframe/MainFrame.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/mainframe/MainFrame.java 2011-01-27 22:17:41 UTC (rev 6148)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/mainframe/MainFrame.java 2011-01-31 23:31:25 UTC (rev 6149)
@@ -84,14 +84,10 @@
private IDesktopContainer _desktop;
-
- private static final String PREFS_KEY_MESSAGEPANEL_HEIGHT = "squirrelSql_msgPanel_height";
-
-
- private boolean m_hasBeenVisible;
-
private JSplitPane _splitPn;
+ private SplitPnResizeHandler _splitPnResizeHandler;
+
/**
* Ctor.
*
@@ -332,7 +328,7 @@
// had not height = 0. If someone knows a better way
// please tell me I'll apreciate any advice.
// ger...@us...
- resizeSplitOnStartup();
+ _splitPnResizeHandler.resizeSplitOnStartup();
}
}
};
@@ -346,40 +342,11 @@
_splitPn.setResizeWeight(1);
_splitPn.setOneTouchExpandable(true);
+ _splitPnResizeHandler = new SplitPnResizeHandler(_splitPn, _msgPnl);
- //i18n[MainFrame.saveSize=Save size]
- String key = s_stringMgr.getString("MainFrame.saveSize");
- Action splitDividerLocAction = new AbstractAction(key)
- {
- public void actionPerformed(ActionEvent e)
- {
- int msgPanelHeight = _splitPn.getBottomComponent().getSize().height;
- Preferences.userRoot().putInt(PREFS_KEY_MESSAGEPANEL_HEIGHT, msgPanelHeight);
- }
- };
- _msgPnl.addToMessagePanelPopup(splitDividerLocAction);
- //i18n[MainFrame.restoreSize=Restore saved size]
- key = s_stringMgr.getString("MainFrame.restoreSize");
-
- Action setSplitDividerLocAction = new AbstractAction(key)
- {
- public void actionPerformed(ActionEvent e)
- {
- int prefMsgPanelHeight = Preferences.userRoot().getInt(PREFS_KEY_MESSAGEPANEL_HEIGHT, -1);
- if(-1 != prefMsgPanelHeight)
- {
- int divLoc = getDividerLocation(prefMsgPanelHeight, _splitPn);
- _splitPn.setDividerLocation(divLoc);
- }
- }
- };
- _msgPnl.addToMessagePanelPopup(setSplitDividerLocAction);
+ content.add(_splitPn, BorderLayout.CENTER);
-
-
- content.add(_splitPn, BorderLayout.CENTER);
-
_statusBar = new MainFrameStatusBar(_app);
final Font fn = _app.getFontInfoStore().getStatusBarFontInfo().createFont();
_statusBar.setFont(fn);
@@ -417,48 +384,6 @@
});
}
-
- public void resizeSplitOnStartup()
- {
-
- if(false == m_hasBeenVisible)
- {
- m_hasBeenVisible = true;
- final int prefMsgPanelHeight = Preferences.userRoot().getInt(PREFS_KEY_MESSAGEPANEL_HEIGHT, -1);
-
- SwingUtilities.invokeLater(new Runnable()
- {
- public void run()
- {
- if (-1 == prefMsgPanelHeight)
- {
- int divLoc = getDividerLocation(50, _splitPn);
- _splitPn.setDividerLocation(divLoc);
- }
- else
- {
- int divLoc = getDividerLocation(prefMsgPanelHeight, _splitPn);
- _splitPn.setDividerLocation(divLoc);
-
- }
- }
- });
-
- }
- }
-
- private int getDividerLocation(int wantedBottomComponentHeight, JSplitPane splitPn)
- {
- int splitBarSize =
- splitPn.getSize().height -
- splitPn.getBottomComponent().getSize().height -
- splitPn.getTopComponent().getSize().height - 1;
-
- int divLoc = splitPn.getSize().height - wantedBottomComponentHeight - splitBarSize;
- return divLoc;
- }
-
-
private void setupFromPreferences()
{
final SquirrelPreferences prefs = _app.getSquirrelPreferences();
Added: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/mainframe/SplitPnResizeHandler.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/mainframe/SplitPnResizeHandler.java (rev 0)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/mainframe/SplitPnResizeHandler.java 2011-01-31 23:31:25 UTC (rev 6149)
@@ -0,0 +1,130 @@
+package net.sourceforge.squirrel_sql.client.gui.mainframe;
+
+import net.sourceforge.squirrel_sql.client.session.MessagePanel;
+import net.sourceforge.squirrel_sql.fw.util.StringManager;
+import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
+
+import javax.swing.*;
+import java.awt.event.ActionEvent;
+import java.util.prefs.Preferences;
+
+public class SplitPnResizeHandler
+{
+ private static final StringManager s_stringMgr =
+ StringManagerFactory.getStringManager(SplitPnResizeHandler.class);
+
+ private static final String PREFS_KEY_MESSAGEPANEL_HEIGHT = "squirrelSql_msgPanel_height";
+
+ private boolean m_hasBeenVisible;
+
+ private JSplitPane _splitPn;
+ private MessagePanel _msgPnl;
+
+ public SplitPnResizeHandler(JSplitPane splitPn, MessagePanel msgPnl)
+ {
+ _splitPn = splitPn;
+ _msgPnl = msgPnl;
+
+ String key;
+
+ //i18n[MainFrame.saveSize=Save size]
+ key = s_stringMgr.getString("MainFrame.saveSize");
+ Action saveSplitDividerLocAction = new AbstractAction(key)
+ {
+ public void actionPerformed(ActionEvent e)
+ {
+ int msgPanelHeight = _splitPn.getBottomComponent().getSize().height;
+ Preferences.userRoot().putInt(PREFS_KEY_MESSAGEPANEL_HEIGHT, msgPanelHeight);
+ }
+ };
+ _msgPnl.addToMessagePanelPopup(saveSplitDividerLocAction);
+
+ //i18n[MainFrame.saveSize0=Save size 0]
+ key = s_stringMgr.getString("MainFrame.saveSize0");
+ Action save0SplitDividerLocAction = new AbstractAction(key)
+ {
+ public void actionPerformed(ActionEvent e)
+ {
+ Preferences.userRoot().putInt(PREFS_KEY_MESSAGEPANEL_HEIGHT, 0);
+ setUnexpanded();
+ }
+ };
+ _msgPnl.addToMessagePanelPopup(save0SplitDividerLocAction);
+
+
+ key = s_stringMgr.getString("MainFrame.restoreSize");
+ Action setSplitDividerLocAction = new AbstractAction(key)
+ {
+ public void actionPerformed(ActionEvent e)
+ {
+ int prefMsgPanelHeight = Preferences.userRoot().getInt(PREFS_KEY_MESSAGEPANEL_HEIGHT, -1);
+ if(-1 != prefMsgPanelHeight)
+ {
+ if (0 == prefMsgPanelHeight)
+ {
+ setUnexpanded();
+ }
+ else
+ {
+ int divLoc = getDividerLocation(prefMsgPanelHeight, _splitPn);
+ _splitPn.setDividerLocation(divLoc);
+ }
+ }
+ }
+ };
+ _msgPnl.addToMessagePanelPopup(setSplitDividerLocAction);
+
+ }
+
+ private void setUnexpanded()
+ {
+ _splitPn.setDividerLocation(_splitPn.getMaximumDividerLocation() + 100);
+ }
+
+ void resizeSplitOnStartup()
+ {
+
+ if(false == m_hasBeenVisible)
+ {
+ m_hasBeenVisible = true;
+ final int prefMsgPanelHeight = Preferences.userRoot().getInt(PREFS_KEY_MESSAGEPANEL_HEIGHT, -1);
+
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ if (-1 == prefMsgPanelHeight)
+ {
+ int divLoc = getDividerLocation(50, _splitPn);
+ _splitPn.setDividerLocation(divLoc);
+ }
+ else
+ {
+ if (0 == prefMsgPanelHeight)
+ {
+ setUnexpanded();
+ }
+ else
+ {
+ int divLoc = getDividerLocation(prefMsgPanelHeight, _splitPn);
+ _splitPn.setDividerLocation(divLoc);
+ }
+
+ }
+ }
+ });
+
+ }
+ }
+
+ private int getDividerLocation(int wantedBottomComponentHeight, JSplitPane splitPn)
+ {
+ int splitBarSize =
+ splitPn.getSize().height -
+ splitPn.getBottomComponent().getSize().height -
+ splitPn.getTopComponent().getSize().height - 1;
+
+ int divLoc = splitPn.getSize().height - wantedBottomComponentHeight - splitBarSize;
+ return divLoc;
+ }
+}
Modified: trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/gui/mainframe/I18NStrings.properties
===================================================================
--- trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/gui/mainframe/I18NStrings.properties 2011-01-27 22:17:41 UTC (rev 6148)
+++ trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/gui/mainframe/I18NStrings.properties 2011-01-31 23:31:25 UTC (rev 6149)
@@ -20,6 +20,7 @@
MainFrame.errorOnClose=Couldn't close all sessions. Exit anyway?
MainFrame.restoreSize=Restore saved size
MainFrame.saveSize=Save size
+MainFrame.saveSize0=Save size 0
MainFrameStatusBar.gc=Garbage collection requested
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2011-01-27 22:17:41 UTC (rev 6148)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2011-01-31 23:31:25 UTC (rev 6149)
@@ -11,8 +11,10 @@
Display errors in result tab:
SQL execution errors are now additionally displayed in a temporary result tab.
- This new feature is switched on by default and can be switched off in
- Menu File --> New Session Properties --> Tab SQL --> Show SQL execution errors in result tab
+ - This new feature is switched on by default and can be switched off in
+ Menu File --> New Session Properties --> Tab SQL --> Show SQL execution errors in result tab.
+ - Along with this feature comes a new Message Panel right mouse menu "Save size 0" that allows
+ to hide the Message panel at application start up.
Bug-fixes:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2011-01-27 22:17:47
|
Revision: 6148
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6148&view=rev
Author: gerdwagner
Date: 2011-01-27 22:17:41 +0000 (Thu, 27 Jan 2011)
Log Message:
-----------
Improved HQL code completion
Modified Paths:
--------------
trunk/sql12/doc/src/main/resources/changes.txt
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2011-01-27 20:45:53 UTC (rev 6147)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2011-01-27 22:17:41 UTC (rev 6148)
@@ -20,6 +20,9 @@
Fixed NullPointerException in Hibernate Plugin when executing HQL with 'view objects' switched on.
+Hibernate Plugin: Made HQL code completion work more exact.
+
+
3.2.1 (12/29/2010)
==================
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 6147
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6147&view=rev
Author: gerdwagner
Date: 2011-01-27 20:45:53 +0000 (Thu, 27 Jan 2011)
Log Message:
-----------
Improved HQL code completion
Modified Paths:
--------------
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/completion/HQLCompletionInfoCollection.java
Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/completion/HQLCompletionInfoCollection.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/completion/HQLCompletionInfoCollection.java 2011-01-27 02:30:19 UTC (rev 6146)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/completion/HQLCompletionInfoCollection.java 2011-01-27 20:45:53 UTC (rev 6147)
@@ -234,12 +234,21 @@
private MappedClassInfo getMappedClassInfoForNonAliasedToken(CompletionParser cp, boolean matchNameExact)
{
+ MappedClassInfo ret = null;
+
for (MappedClassInfo mappedClassInfo : _mappedClassInfos)
{
- if(mappedClassInfo.matches(cp, matchNameExact, true))
+ if(mappedClassInfo.matches(cp, true, true))
{
+ // An exact match always ends search
return mappedClassInfo;
}
+ else if(false == matchNameExact && mappedClassInfo.matches(cp, false, true))
+ {
+ // We have a non exact match here.
+ // Nonetheless we continue the loop to see if an exact match exists
+ ret = mappedClassInfo;
+ }
if(
cp.getStringToParse().startsWith(mappedClassInfo.getClassName()) ||
@@ -257,7 +266,7 @@
}
}
- return null;
+ return ret;
}
public boolean mayBeClassOrAliasName(String token)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2011-01-27 02:30:26
|
Revision: 6146
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6146&view=rev
Author: gerdwagner
Date: 2011-01-27 02:30:19 +0000 (Thu, 27 Jan 2011)
Log Message:
-----------
Fixed NullPointerException in Hibernate Plugin when executing HQL with 'view objects' switched on
Modified Paths:
--------------
trunk/sql12/doc/src/main/resources/changes.txt
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/completion/HQLCompletionInfoCollection.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/completion/HqlAliasParser.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/completion/MappingInfoProvider.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/mapping/MappedClassInfo.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/HibernatePropertyReader.java
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2011-01-13 20:55:17 UTC (rev 6145)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2011-01-27 02:30:19 UTC (rev 6146)
@@ -18,6 +18,7 @@
3148653: Missing App Icon on Mac OS X (Fix is available in the Mac OS X 3.2.1 installer file)
+Fixed NullPointerException in Hibernate Plugin when executing HQL with 'view objects' switched on.
3.2.1 (12/29/2010)
==================
Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/completion/HQLCompletionInfoCollection.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/completion/HQLCompletionInfoCollection.java 2011-01-13 20:55:17 UTC (rev 6145)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/completion/HQLCompletionInfoCollection.java 2011-01-27 02:30:19 UTC (rev 6146)
@@ -74,7 +74,7 @@
public CompletionCandidates getInfosStartingWith(CompletionParser parser)
{
- // Tricky alias and chaining completion examples
+ // Tricky alias and chaining completion examples
//
// au to auftr in
// from Kv auftr where au
@@ -194,17 +194,17 @@
_currentAliasInfos = aliasInfos;
}
- public MappedClassInfo getMappedClassInfoFor(String token, boolean matchNameExact, boolean stateless)
+ public MappedClassInfo getMappedClassInfoFor(String token)
{
// Example for this code:
- // Completion should
+ // Completion should
// from Kv k inner join fetch k.positionen as posses where posses.artNr = 'sdfsdf'
CompletionParser cp = new CompletionParser(token);
if(2 > cp.size())
{
- return getMappedClassInfoForNonAliasedToken(cp, matchNameExact, stateless);
+ return getMappedClassInfoForNonAliasedToken(cp, true);
}
String aliasCandidate = cp.getToken(0);
@@ -229,14 +229,14 @@
}
}
- return getMappedClassInfoForNonAliasedToken(cp, false, stateless);
+ return getMappedClassInfoForNonAliasedToken(cp, false);
}
- private MappedClassInfo getMappedClassInfoForNonAliasedToken(CompletionParser cp, boolean matchNameExact, boolean stateless)
+ private MappedClassInfo getMappedClassInfoForNonAliasedToken(CompletionParser cp, boolean matchNameExact)
{
for (MappedClassInfo mappedClassInfo : _mappedClassInfos)
{
- if(mappedClassInfo.matches(cp, matchNameExact, stateless))
+ if(mappedClassInfo.matches(cp, matchNameExact, true))
{
return mappedClassInfo;
}
@@ -291,6 +291,12 @@
}
+ @Override
+ public MappedClassInfo getExactMappedClassInfoFor(String className)
+ {
+ return _mappedClassInfoByClassName.get(className);
+ }
+
public ISyntaxHighlightTokenMatcher getHqlSyntaxHighlightTokenMatcher()
{
return _hqlSyntaxHighlightTokenMatcher;
Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/completion/HqlAliasParser.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/completion/HqlAliasParser.java 2011-01-13 20:55:17 UTC (rev 6145)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/completion/HqlAliasParser.java 2011-01-27 02:30:19 UTC (rev 6146)
@@ -36,7 +36,7 @@
}
else
{
- lastMappedClass = mappingInfoProvider.getMappedClassInfoFor(token, true, true);
+ lastMappedClass = mappingInfoProvider.getMappedClassInfoFor(token);
}
}
else
Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/completion/MappingInfoProvider.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/completion/MappingInfoProvider.java 2011-01-13 20:55:17 UTC (rev 6145)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/completion/MappingInfoProvider.java 2011-01-27 02:30:19 UTC (rev 6146)
@@ -5,7 +5,9 @@
public interface MappingInfoProvider
{
// Will be called asynchronously to the event dispatch thread
- MappedClassInfo getMappedClassInfoFor(String token, boolean matchNameExact, boolean stateless);
+ MappedClassInfo getMappedClassInfoFor(String token);
boolean mayBeClassOrAliasName(String token);
+
+ MappedClassInfo getExactMappedClassInfoFor(String className);
}
Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/mapping/MappedClassInfo.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/mapping/MappedClassInfo.java 2011-01-13 20:55:17 UTC (rev 6145)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/mapping/MappedClassInfo.java 2011-01-27 02:30:19 UTC (rev 6146)
@@ -19,12 +19,12 @@
{
_mappedClassInfoData = mappedClassInfoData;
- setPropertyInfos(new PropertyInfo[_mappedClassInfoData.getHibernatePropertyInfos().length + 1]);
+ _propertyInfos = new PropertyInfo[_mappedClassInfoData.getHibernatePropertyInfos().length + 1];
- getPropertyInfos()[0] = new PropertyInfo(_mappedClassInfoData.getIndentifierHibernatePropertyInfo(), _mappedClassInfoData.getMappedClassName());
+ _propertyInfos[0] = new PropertyInfo(_mappedClassInfoData.getIndentifierHibernatePropertyInfo(), _mappedClassInfoData.getMappedClassName());
for (int i = 0; i < _mappedClassInfoData.getHibernatePropertyInfos().length; i++)
{
- getPropertyInfos()[i+1] = new PropertyInfo(_mappedClassInfoData.getHibernatePropertyInfos()[i], _mappedClassInfoData.getMappedClassName());
+ _propertyInfos[i+1] = new PropertyInfo(_mappedClassInfoData.getHibernatePropertyInfos()[i], _mappedClassInfoData.getMappedClassName());
}
}
@@ -84,7 +84,7 @@
ArrayList<String> props = getArrayFormChain(propertyChainBegin);
- PropertyInfo[] propInfoBuf = getPropertyInfos();
+ PropertyInfo[] propInfoBuf = _propertyInfos;
for (int i = 0; i < props.size(); i++)
{
@@ -136,7 +136,7 @@
{
ArrayList<CompletionInfo> ret = new ArrayList<CompletionInfo>();
- for (PropertyInfo propertyInfo : getPropertyInfos())
+ for (PropertyInfo propertyInfo : _propertyInfos )
{
if(propertyInfo.matchesUnQualified(parser.getLastToken()))
{
@@ -165,11 +165,11 @@
public String[] getAttributeNames()
{
- String[] ret = new String[getPropertyInfos().length];
+ String[] ret = new String[_propertyInfos.length];
- for (int i = 0; i < getPropertyInfos().length; i++)
+ for (int i = 0; i < _propertyInfos.length; i++)
{
- ret[i] = getPropertyInfos()[i].getCompareString();
+ ret[i] = _propertyInfos[i].getCompareString();
}
@@ -178,7 +178,7 @@
public PropertyInfo getAttributeByName(String attrName)
{
- for (PropertyInfo propertyInfo : getPropertyInfos())
+ for (PropertyInfo propertyInfo : _propertyInfos )
{
if(propertyInfo.getCompareString().equals(attrName))
{
@@ -193,7 +193,7 @@
public PropertyInfo[] getAttributes()
{
- return getPropertyInfos();
+ return _propertyInfos;
}
@@ -204,21 +204,11 @@
public void initAttributesWithClassInfo(MappingInfoProvider mappingInfoProvider)
{
- for (PropertyInfo propertyInfo : getPropertyInfos())
+ for (PropertyInfo propertyInfo : _propertyInfos )
{
- propertyInfo.setMappedClassInfo(mappingInfoProvider.getMappedClassInfoFor(propertyInfo.getHibernatePropertyInfo().getClassName(), false, false));
+ propertyInfo.setMappedClassInfo(mappingInfoProvider.getExactMappedClassInfoFor(propertyInfo.getHibernatePropertyInfo().getClassName()));
}
}
- public PropertyInfo[] getPropertyInfos()
- {
- return _propertyInfos;
- }
-
- public void setPropertyInfos(PropertyInfo[] propertyInfos)
- {
- _propertyInfos = propertyInfos;
- }
-
}
Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/HibernatePropertyReader.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/HibernatePropertyReader.java 2011-01-13 20:55:17 UTC (rev 6145)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/HibernatePropertyReader.java 2011-01-27 02:30:19 UTC (rev 6146)
@@ -32,7 +32,7 @@
}
catch (Exception e)
{
- throw new RuntimeException(e);
+ throw new RuntimeException("Cannot access property: " + _obj.getClass().getName() + "." + _propertyName, e);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2011-01-13 20:55:23
|
Revision: 6145
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6145&view=rev
Author: gerdwagner
Date: 2011-01-13 20:55:17 +0000 (Thu, 13 Jan 2011)
Log Message:
-----------
New default driver: CUBRID JDBC Driver
Modified Paths:
--------------
trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/defaults/default_drivers.xml
Modified: trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/defaults/default_drivers.xml
===================================================================
--- trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/defaults/default_drivers.xml 2011-01-13 20:06:27 UTC (rev 6144)
+++ trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/defaults/default_drivers.xml 2011-01-13 20:55:17 UTC (rev 6145)
@@ -2,18 +2,30 @@
<Beans>
- <Bean Class="net.sourceforge.squirrel_sql.fw.sql.SQLDriver">
- <driverClassName>com.ibm.as400.access.AS400JDBCDriver</driverClassName>
- <identifier Class="net.sourceforge.squirrel_sql.fw.id.UidIdentifier">
- <string>-50</string>
- </identifier>
- <jarFileName/>
- <jarFileNames Indexed="true"/>
- <name>JTOpen(AS/400)</name>
- <url>jdbc:as400://<host_name>/<default-schema>;<properties></url>
- <websiteUrl>http://jt400.sourceforge.net</websiteUrl>
- </Bean>
+ <Bean Class="net.sourceforge.squirrel_sql.fw.sql.SQLDriver">
+ <name>CUBRID JDBC Driver</name>
+ <driverClassName>cubrid.jdbc.driver.CUBRIDDriver</driverClassName>
+ <url>jdbc:cubrid:<hostname>:33000:<dbname>:<username>:<password>:</url>
+ <usesClassPath>true</usesClassPath>
+ <jarFileNames Indexed="true"/>
+ <identifier Class="net.sourceforge.squirrel_sql.fw.id.UidIdentifier">
+ <string>-51</string>
+ </identifier>
+ <websiteUrl>http://www.cubrid.org</websiteUrl>
+ </Bean>
+ <Bean Class="net.sourceforge.squirrel_sql.fw.sql.SQLDriver">
+ <driverClassName>com.ibm.as400.access.AS400JDBCDriver</driverClassName>
+ <identifier Class="net.sourceforge.squirrel_sql.fw.id.UidIdentifier">
+ <string>-50</string>
+ </identifier>
+ <jarFileName/>
+ <jarFileNames Indexed="true"/>
+ <name>JTOpen(AS/400)</name>
+ <url>jdbc:as400://<host_name>/<default-schema>;<properties></url>
+ <websiteUrl>http://jt400.sourceforge.net</websiteUrl>
+ </Bean>
+
<Bean Class="net.sourceforge.squirrel_sql.fw.sql.SQLDriver">
<driverClassName>com.informix.jdbc.IfxDriver</driverClassName>
<identifier Class="net.sourceforge.squirrel_sql.fw.id.UidIdentifier">
@@ -583,7 +595,7 @@
</identifier>
<websiteUrl>http://www.oracle.com/technology/tech/java/sqlj_jdbc/htdocs/jdbc_faq.htm</websiteUrl>
</Bean>
-
+
<Bean Class="net.sourceforge.squirrel_sql.fw.sql.SQLDriver">
<name>JDBC ODBC Bridge</name>
<driverClassName>sun.jdbc.odbc.JdbcOdbcDriver</driverClassName>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2011-01-13 20:06:33
|
Revision: 6144
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6144&view=rev
Author: gerdwagner
Date: 2011-01-13 20:06:27 +0000 (Thu, 13 Jan 2011)
Log Message:
-----------
Made latest news work
Modified Paths:
--------------
trunk/sql12/web-site/home.html
Modified: trunk/sql12/web-site/home.html
===================================================================
--- trunk/sql12/web-site/home.html 2011-01-13 19:51:51 UTC (rev 6143)
+++ trunk/sql12/web-site/home.html 2011-01-13 20:06:27 UTC (rev 6144)
@@ -122,7 +122,7 @@
<center>
<h3 class="body">
<a href="https://sourceforge.net/news/?group_id=28383">Click here</a>
- to go to our SourceForge news page.
+ to go to our SourceForge news page for details.
</h3>
</center>
</td>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2011-01-13 19:51:57
|
Revision: 6143
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6143&view=rev
Author: gerdwagner
Date: 2011-01-13 19:51:51 +0000 (Thu, 13 Jan 2011)
Log Message:
-----------
Made latest news work
Modified Paths:
--------------
trunk/sql12/web-site/home.html
Modified: trunk/sql12/web-site/home.html
===================================================================
--- trunk/sql12/web-site/home.html 2011-01-12 00:26:55 UTC (rev 6142)
+++ trunk/sql12/web-site/home.html 2011-01-13 19:51:51 UTC (rev 6143)
@@ -112,9 +112,19 @@
<td class="body_left_border"> </td>
<td width='100%' class="body" bgcolor="white" valign="top">
<h1 class="body"><a name="latestnews">Latest News</a></h1>
-<?php
- include ("http://sourceforge.net/export/projnews.php?group_id=28383&limit=3&flat=0&show_summaries=0");
-?>
+ <center>
+ <iframe src="http://sourceforge.net/export/projnews.php?group_id=28383&limit=3&flat=0&show_summaries=0" width="800" height="300">
+ <a href="http://sourceforge.net/export/projnews.php?group_id=28383&limit=3&flat=0&show_summaries=0">
+ Hmm, you are using a very old browser. Click here to go directly to included content.</a>
+ </iframe>
+ </center>
+ <br>
+ <center>
+ <h3 class="body">
+ <a href="https://sourceforge.net/news/?group_id=28383">Click here</a>
+ to go to our SourceForge news page.
+ </h3>
+ </center>
</td>
<td class="body_right_border"> </td>
</tr>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2011-01-12 00:27:02
|
Revision: 6142
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6142&view=rev
Author: manningr
Date: 2011-01-12 00:26:55 +0000 (Wed, 12 Jan 2011)
Log Message:
-----------
Update to the new version of the update site plugin to produce additional artifacts necessary for versions of SQuirreL prior to 3.2.1 to upgrade
Modified Paths:
--------------
branches/squirrel-3_2_1-branch/pom.xml
Modified: branches/squirrel-3_2_1-branch/pom.xml
===================================================================
--- branches/squirrel-3_2_1-branch/pom.xml 2011-01-10 00:34:41 UTC (rev 6141)
+++ branches/squirrel-3_2_1-branch/pom.xml 2011-01-12 00:26:55 UTC (rev 6142)
@@ -73,8 +73,8 @@
<release-plugin-version>2.1</release-plugin-version>
<scm-plugin-version>1.4</scm-plugin-version>
<source-plugin-version>2.1.2</source-plugin-version>
- <squirrelsql-version-plugin-version>1.0.5</squirrelsql-version-plugin-version>
- <squirrelsql-update-site-plugin-version>1.0.4</squirrelsql-update-site-plugin-version>
+ <squirrelsql-version-plugin-version>1.0.6</squirrelsql-version-plugin-version>
+ <squirrelsql-update-site-plugin-version>1.0.6</squirrelsql-update-site-plugin-version>
<surefire-plugin-version>2.6</surefire-plugin-version>
<surefire-report-plugin-version>2.0-beta-1</surefire-report-plugin-version>
<wagon-plugin-version>1.0-beta-3</wagon-plugin-version>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2011-01-10 00:34:47
|
Revision: 6141
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6141&view=rev
Author: manningr
Date: 2011-01-10 00:34:41 +0000 (Mon, 10 Jan 2011)
Log Message:
-----------
Use the new version of the update-site plugin to produce plugin files with the old naming convention, in addition to the new one.
Modified Paths:
--------------
trunk/sql12/pom.xml
Modified: trunk/sql12/pom.xml
===================================================================
--- trunk/sql12/pom.xml 2011-01-09 04:12:25 UTC (rev 6140)
+++ trunk/sql12/pom.xml 2011-01-10 00:34:41 UTC (rev 6141)
@@ -75,7 +75,7 @@
<scm-plugin-version>1.4</scm-plugin-version>
<source-plugin-version>2.1.2</source-plugin-version>
<squirrelsql-version-plugin-version>1.0.5</squirrelsql-version-plugin-version>
- <squirrelsql-update-site-plugin-version>1.0.4</squirrelsql-update-site-plugin-version>
+ <squirrelsql-update-site-plugin-version>1.0.6</squirrelsql-update-site-plugin-version>
<surefire-plugin-version>2.6</surefire-plugin-version>
<surefire-report-plugin-version>2.0-beta-1</surefire-report-plugin-version>
<wagon-plugin-version>1.0-beta-3</wagon-plugin-version>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2011-01-09 04:12:31
|
Revision: 6140
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6140&view=rev
Author: manningr
Date: 2011-01-09 04:12:25 +0000 (Sun, 09 Jan 2011)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/maven-plugin-workspace/pom.xml
trunk/maven-plugin-workspace/squirrelsql-update-site-plugin/pom.xml
trunk/maven-plugin-workspace/squirrelsql-version-plugin/pom.xml
Modified: trunk/maven-plugin-workspace/pom.xml
===================================================================
--- trunk/maven-plugin-workspace/pom.xml 2011-01-09 04:12:19 UTC (rev 6139)
+++ trunk/maven-plugin-workspace/pom.xml 2011-01-09 04:12:25 UTC (rev 6140)
@@ -9,7 +9,7 @@
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>maven-plugin-workspace</artifactId>
- <version>1.0.6</version>
+ <version>1.0.7-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Maven Plugin Workspace</name>
<description>
@@ -41,9 +41,9 @@
</licenses>
<url>http://www.squirrelsql.org/</url>
<scm>
- <connection>scm:svn:http://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/maven-plugin-workspace-1.0.6</connection>
- <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/maven-plugin-workspace-1.0.6</developerConnection>
- <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/maven-plugin-workspace-1.0.6</url>
+ <connection>scm:svn:http://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/maven-plugin-workspace</connection>
+ <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/maven-plugin-workspace</developerConnection>
+ <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/maven-plugin-workspace</url>
</scm>
<issueManagement>
<system>SourceForge Tracker</system>
Modified: trunk/maven-plugin-workspace/squirrelsql-update-site-plugin/pom.xml
===================================================================
--- trunk/maven-plugin-workspace/squirrelsql-update-site-plugin/pom.xml 2011-01-09 04:12:19 UTC (rev 6139)
+++ trunk/maven-plugin-workspace/squirrelsql-update-site-plugin/pom.xml 2011-01-09 04:12:25 UTC (rev 6140)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>maven-plugin-workspace</artifactId>
- <version>1.0.6</version>
+ <version>1.0.7-SNAPSHOT</version>
</parent>
<artifactId>squirrelsql-update-site-plugin</artifactId>
@@ -45,9 +45,9 @@
</licenses>
<url>http://www.squirrelsql.org/</url>
<scm>
- <connection>scm:svn:http://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/maven-plugin-workspace-1.0.6/squirrelsql-update-site-plugin</connection>
- <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/maven-plugin-workspace-1.0.6/squirrelsql-update-site-plugin</developerConnection>
- <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/maven-plugin-workspace-1.0.6/squirrelsql-update-site-plugin</url>
+ <connection>scm:svn:http://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/maven-plugin-workspace/squirrelsql-update-site-plugin</connection>
+ <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/maven-plugin-workspace/squirrelsql-update-site-plugin</developerConnection>
+ <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/maven-plugin-workspace/squirrelsql-update-site-plugin</url>
</scm>
<issueManagement>
<system>SourceForge Tracker</system>
Modified: trunk/maven-plugin-workspace/squirrelsql-version-plugin/pom.xml
===================================================================
--- trunk/maven-plugin-workspace/squirrelsql-version-plugin/pom.xml 2011-01-09 04:12:19 UTC (rev 6139)
+++ trunk/maven-plugin-workspace/squirrelsql-version-plugin/pom.xml 2011-01-09 04:12:25 UTC (rev 6140)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>maven-plugin-workspace</artifactId>
- <version>1.0.6</version>
+ <version>1.0.7-SNAPSHOT</version>
</parent>
<artifactId>squirrelsql-version-plugin</artifactId>
@@ -45,9 +45,9 @@
</licenses>
<url>http://www.squirrelsql.org/</url>
<scm>
- <connection>scm:svn:http://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/maven-plugin-workspace-1.0.6/squirrelsql-version-plugin</connection>
- <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/maven-plugin-workspace-1.0.6/squirrelsql-version-plugin</developerConnection>
- <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/maven-plugin-workspace-1.0.6/squirrelsql-version-plugin</url>
+ <connection>scm:svn:http://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/maven-plugin-workspace/squirrelsql-version-plugin</connection>
+ <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/maven-plugin-workspace/squirrelsql-version-plugin</developerConnection>
+ <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/maven-plugin-workspace/squirrelsql-version-plugin</url>
</scm>
<issueManagement>
<system>SourceForge Tracker</system>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2011-01-09 04:12:25
|
Revision: 6139
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6139&view=rev
Author: manningr
Date: 2011-01-09 04:12:19 +0000 (Sun, 09 Jan 2011)
Log Message:
-----------
[maven-release-plugin] copy for tag maven-plugin-workspace-1.0.6
Added Paths:
-----------
tags/maven-plugin-workspace-1.0.6/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2011-01-09 04:12:19
|
Revision: 6138
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6138&view=rev
Author: manningr
Date: 2011-01-09 04:12:13 +0000 (Sun, 09 Jan 2011)
Log Message:
-----------
[maven-release-plugin] prepare release maven-plugin-workspace-1.0.6
Modified Paths:
--------------
trunk/maven-plugin-workspace/pom.xml
trunk/maven-plugin-workspace/squirrelsql-update-site-plugin/pom.xml
trunk/maven-plugin-workspace/squirrelsql-version-plugin/pom.xml
Modified: trunk/maven-plugin-workspace/pom.xml
===================================================================
--- trunk/maven-plugin-workspace/pom.xml 2011-01-08 23:45:17 UTC (rev 6137)
+++ trunk/maven-plugin-workspace/pom.xml 2011-01-09 04:12:13 UTC (rev 6138)
@@ -9,7 +9,7 @@
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>maven-plugin-workspace</artifactId>
- <version>1.0.6-SNAPSHOT</version>
+ <version>1.0.6</version>
<packaging>pom</packaging>
<name>Maven Plugin Workspace</name>
<description>
@@ -41,9 +41,9 @@
</licenses>
<url>http://www.squirrelsql.org/</url>
<scm>
- <connection>scm:svn:http://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/maven-plugin-workspace</connection>
- <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/maven-plugin-workspace</developerConnection>
- <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/maven-plugin-workspace</url>
+ <connection>scm:svn:http://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/maven-plugin-workspace-1.0.6</connection>
+ <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/maven-plugin-workspace-1.0.6</developerConnection>
+ <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/maven-plugin-workspace-1.0.6</url>
</scm>
<issueManagement>
<system>SourceForge Tracker</system>
Modified: trunk/maven-plugin-workspace/squirrelsql-update-site-plugin/pom.xml
===================================================================
--- trunk/maven-plugin-workspace/squirrelsql-update-site-plugin/pom.xml 2011-01-08 23:45:17 UTC (rev 6137)
+++ trunk/maven-plugin-workspace/squirrelsql-update-site-plugin/pom.xml 2011-01-09 04:12:13 UTC (rev 6138)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>maven-plugin-workspace</artifactId>
- <version>1.0.6-SNAPSHOT</version>
+ <version>1.0.6</version>
</parent>
<artifactId>squirrelsql-update-site-plugin</artifactId>
@@ -45,9 +45,9 @@
</licenses>
<url>http://www.squirrelsql.org/</url>
<scm>
- <connection>scm:svn:http://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/maven-plugin-workspace/squirrelsql-update-site-plugin</connection>
- <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/maven-plugin-workspace/squirrelsql-update-site-plugin</developerConnection>
- <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/maven-plugin-workspace/squirrelsql-update-site-plugin</url>
+ <connection>scm:svn:http://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/maven-plugin-workspace-1.0.6/squirrelsql-update-site-plugin</connection>
+ <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/maven-plugin-workspace-1.0.6/squirrelsql-update-site-plugin</developerConnection>
+ <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/maven-plugin-workspace-1.0.6/squirrelsql-update-site-plugin</url>
</scm>
<issueManagement>
<system>SourceForge Tracker</system>
Modified: trunk/maven-plugin-workspace/squirrelsql-version-plugin/pom.xml
===================================================================
--- trunk/maven-plugin-workspace/squirrelsql-version-plugin/pom.xml 2011-01-08 23:45:17 UTC (rev 6137)
+++ trunk/maven-plugin-workspace/squirrelsql-version-plugin/pom.xml 2011-01-09 04:12:13 UTC (rev 6138)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>maven-plugin-workspace</artifactId>
- <version>1.0.6-SNAPSHOT</version>
+ <version>1.0.6</version>
</parent>
<artifactId>squirrelsql-version-plugin</artifactId>
@@ -45,9 +45,9 @@
</licenses>
<url>http://www.squirrelsql.org/</url>
<scm>
- <connection>scm:svn:http://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/maven-plugin-workspace/squirrelsql-version-plugin</connection>
- <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/maven-plugin-workspace/squirrelsql-version-plugin</developerConnection>
- <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/maven-plugin-workspace/squirrelsql-version-plugin</url>
+ <connection>scm:svn:http://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/maven-plugin-workspace-1.0.6/squirrelsql-version-plugin</connection>
+ <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/maven-plugin-workspace-1.0.6/squirrelsql-version-plugin</developerConnection>
+ <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/maven-plugin-workspace-1.0.6/squirrelsql-version-plugin</url>
</scm>
<issueManagement>
<system>SourceForge Tracker</system>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2011-01-08 23:45:23
|
Revision: 6137
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6137&view=rev
Author: manningr
Date: 2011-01-08 23:45:17 +0000 (Sat, 08 Jan 2011)
Log Message:
-----------
Updated release dependency on fw module.
Modified Paths:
--------------
trunk/maven-plugin-workspace/squirrelsql-update-site-plugin/pom.xml
Modified: trunk/maven-plugin-workspace/squirrelsql-update-site-plugin/pom.xml
===================================================================
--- trunk/maven-plugin-workspace/squirrelsql-update-site-plugin/pom.xml 2011-01-08 22:59:32 UTC (rev 6136)
+++ trunk/maven-plugin-workspace/squirrelsql-update-site-plugin/pom.xml 2011-01-08 23:45:17 UTC (rev 6137)
@@ -62,7 +62,7 @@
<dependency>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>squirrel-sql</artifactId>
- <version>3.0.2</version>
+ <version>3.2.1</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 6136
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6136&view=rev
Author: manningr
Date: 2011-01-08 22:59:32 +0000 (Sat, 08 Jan 2011)
Log Message:
-----------
3153349: added step to copy the assembly archive files to the old format.
Modified Paths:
--------------
trunk/maven-plugin-workspace/squirrelsql-update-site-plugin/src/main/java/net/sf/squirrel_sql/BuildUpdateSiteMojo.java
Modified: trunk/maven-plugin-workspace/squirrelsql-update-site-plugin/src/main/java/net/sf/squirrel_sql/BuildUpdateSiteMojo.java
===================================================================
--- trunk/maven-plugin-workspace/squirrelsql-update-site-plugin/src/main/java/net/sf/squirrel_sql/BuildUpdateSiteMojo.java 2011-01-08 16:53:25 UTC (rev 6135)
+++ trunk/maven-plugin-workspace/squirrelsql-update-site-plugin/src/main/java/net/sf/squirrel_sql/BuildUpdateSiteMojo.java 2011-01-08 22:59:32 UTC (rev 6136)
@@ -22,10 +22,6 @@
import java.io.File;
import java.io.IOException;
import java.util.Date;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.Map.Entry;
import net.sourceforge.squirrel_sql.client.update.UpdateUtil;
import net.sourceforge.squirrel_sql.client.update.xmlbeans.ArtifactXmlBean;
@@ -34,7 +30,9 @@
import net.sourceforge.squirrel_sql.client.update.xmlbeans.ReleaseXmlBean;
import net.sourceforge.squirrel_sql.client.update.xmlbeans.UpdateXmlSerializer;
import net.sourceforge.squirrel_sql.client.update.xmlbeans.UpdateXmlSerializerImpl;
-import net.sourceforge.squirrel_sql.client.update.xmlbeans.XmlBeanUtilities;
+import net.sourceforge.squirrel_sql.fw.util.FileWrapper;
+import net.sourceforge.squirrel_sql.fw.util.FileWrapperFactory;
+import net.sourceforge.squirrel_sql.fw.util.FileWrapperFactoryImpl;
import net.sourceforge.squirrel_sql.fw.util.IOUtilities;
import net.sourceforge.squirrel_sql.fw.util.IOUtilitiesImpl;
@@ -54,6 +52,8 @@
private org.apache.maven.plugin.logging.Log log = getLog();
private IOUtilities _iou = new IOUtilitiesImpl();
+
+ private FileWrapperFactory _fileWrapperFactory = new FileWrapperFactoryImpl();
/**
* Transitive dependencies that are not used directly by SQuirreL are excluded so that the update site
@@ -126,6 +126,7 @@
try
{
+ copyPluginAssemblies();
ChannelXmlBean channelBean =
buildChannelRelease(channelName, releaseName, releaseVersion, releaseDir.getAbsolutePath());
UpdateXmlSerializer serializer = new UpdateXmlSerializerImpl();
@@ -200,6 +201,36 @@
}
/**
+ * In order for versions older than 3.2.1 to be properly upgraded, the plugin assmebly files that have the
+ * form :
+ *
+ * <pre>
+ * <plugin internal name>-assembly.zip
+ * </pre>
+ *
+ * must be copied to the old archive form :
+ *
+ * <pre>
+ * <plugin internal name>.zip
+ * </pre>
+ *
+ * This method loops through all of the plugin assembly archives and copies them to the old format.
+ */
+ private void copyPluginAssemblies() throws IOException {
+ FileWrapper pluginsDir = _fileWrapperFactory.create(releaseDirectory, "plugin");
+ String[] pluginsList = pluginsDir.list();
+ for (String plugin : pluginsList) {
+ String oldFormat = plugin.replace("-assembly", "");
+ FileWrapper pluginAssemblyArchiveFile = _fileWrapperFactory.create(pluginsDir, plugin);
+ FileWrapper oldFormatArchiveFile = _fileWrapperFactory.create(pluginsDir, oldFormat);
+ if (log.isInfoEnabled()) {
+ log.info("Copying assembly file ( "+plugin+" ) to old format: "+oldFormat);
+ }
+ _iou.copyFile(pluginAssemblyArchiveFile, oldFormatArchiveFile);
+ }
+ }
+
+ /**
* Searches for the specified filename in the excludedPatterns array and compares to see if any pattern
* matches.
*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
