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: <man...@us...> - 2011-08-01 23:52:36
|
Revision: 6335
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6335&view=rev
Author: manningr
Date: 2011-08-01 23:52:30 +0000 (Mon, 01 Aug 2011)
Log Message:
-----------
changes specific to Oracle. Will relocate this to ../sql/oracle.
Modified Paths:
--------------
trunk/sql12/squirrelsql-integration-environment/src/test/resources/dbmonster/test.xml
Modified: trunk/sql12/squirrelsql-integration-environment/src/test/resources/dbmonster/test.xml
===================================================================
--- trunk/sql12/squirrelsql-integration-environment/src/test/resources/dbmonster/test.xml 2011-07-30 17:20:16 UTC (rev 6334)
+++ trunk/sql12/squirrelsql-integration-environment/src/test/resources/dbmonster/test.xml 2011-08-01 23:52:30 UTC (rev 6335)
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE dbmonster-schema PUBLIC "-//kernelpanic.pl//DBMonster Database Schema DTD 1.1//EN" "http://dbmonster.kernelpanic.pl/dtd/dbmonster-schema-1.1.dtd">
<dbmonster-schema>
- <name>public</name>
+ <name>DBCOPYSRC</name>
<table name="bigint_type_table" rows="2">
<column name="bigint_column" databaseDefault="false">
<generator type="pl.kernelpanic.dbmonster.generator.NumberGenerator">
@@ -13,6 +13,23 @@
</generator>
</column>
</table>
+ <table name="binary_type_table" rows="2">
+ <column name="binary_column" databaseDefault="false">
+ <generator type="pl.kernelpanic.dbmonster.generator.BinaryGenerator">
+ <property name="file" value="src/test/resources/log4j.properties"/>
+ <property name="nulls" value="1"/>
+ </generator>
+ </column>
+ </table>
+ <table name="blob_type_table" rows="2">
+ <column name="blob_column" databaseDefault="false">
+ <generator type="pl.kernelpanic.dbmonster.generator.BinaryGenerator">
+ <property name="file" value="src/test/resources/log4j.properties"/>
+ <property name="nulls" value="1"/>
+ </generator>
+ </column>
+ </table>
+
<table name="boolean_type_table" rows="2">
<column name="boolean_column">
<generator type="pl.kernelpanic.dbmonster.generator.BooleanGenerator">
@@ -139,7 +156,7 @@
<column name="time_column">
<generator type="pl.kernelpanic.dbmonster.generator.DateTimeGenerator">
<property name="nulls" value="1"/>
- <property name="returnedType" value="time"/>
+ <property name="returnedType" value="timestamp"/>
<property name="startDate" value="1970-02-01 03:30:59.0 GMT"/>
<property name="endDate" value="2005-02-01 03:30:59.0 GMT"/>
</generator>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2011-07-30 17:20:22
|
Revision: 6334
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6334&view=rev
Author: manningr
Date: 2011-07-30 17:20:16 +0000 (Sat, 30 Jul 2011)
Log Message:
-----------
relocated sql scripts to integration environment
Added Paths:
-----------
trunk/sql12/squirrelsql-integration-environment/src/test/resources/dbmonster/
Removed Paths:
-------------
trunk/sql12/plugins/dbcopy/test/dbmonster/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2011-07-30 17:18:49
|
Revision: 6333
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6333&view=rev
Author: manningr
Date: 2011-07-30 17:18:42 +0000 (Sat, 30 Jul 2011)
Log Message:
-----------
relocated sql scripts to integration environment
Added Paths:
-----------
trunk/sql12/squirrelsql-integration-environment/src/test/resources/sql/
Removed Paths:
-------------
trunk/sql12/plugins/dbcopy/test/sql/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2011-07-30 16:44:01
|
Revision: 6332
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6332&view=rev
Author: manningr
Date: 2011-07-30 16:43:54 +0000 (Sat, 30 Jul 2011)
Log Message:
-----------
updated svn:ignore
Property Changed:
----------------
trunk/sql12/cli/dbcopy/
Property changes on: trunk/sql12/cli/dbcopy
___________________________________________________________________
Modified: svn:ignore
- target
+ target
.project
.classpath
.settings
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2011-07-30 14:14:03
|
Revision: 6331
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6331&view=rev
Author: manningr
Date: 2011-07-30 14:13:57 +0000 (Sat, 30 Jul 2011)
Log Message:
-----------
updated svn:ignore
Property Changed:
----------------
trunk/sql12/plugins/greenplum/
Property changes on: trunk/sql12/plugins/greenplum
___________________________________________________________________
Added: svn:ignore
+ target
.settings
.classpath
.project
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2011-07-30 13:56:06
|
Revision: 6330
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6330&view=rev
Author: manningr
Date: 2011-07-30 13:55:59 +0000 (Sat, 30 Jul 2011)
Log Message:
-----------
New CLI project to build a jar that can be used to run DBCopy from the command-line.
Added Paths:
-----------
trunk/sql12/cli/
trunk/sql12/cli/dbcopy/
trunk/sql12/cli/dbcopy/pom.xml
Property changes on: trunk/sql12/cli/dbcopy
___________________________________________________________________
Added: svn:ignore
+ target
Added: trunk/sql12/cli/dbcopy/pom.xml
===================================================================
--- trunk/sql12/cli/dbcopy/pom.xml (rev 0)
+++ trunk/sql12/cli/dbcopy/pom.xml 2011-07-30 13:55:59 UTC (rev 6330)
@@ -0,0 +1,115 @@
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>net.sf.squirrel-sql</groupId>
+ <artifactId>squirrel-root-pom</artifactId>
+ <version>3.3.0-SNAPSHOT</version>
+ </parent>
+ <groupId>net.sf.squirrel-sql.cli</groupId>
+ <artifactId>dbcopy-cli</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <name>DBCopy Command-Line Interface</name>
+ <description>
+ Project that builds a super-jar whose main class is the DBCopy command-line interface.
+ </description>
+ <inceptionYear>2001</inceptionYear>
+ <developers>
+ <developer>
+ <name>Gerd Wagner</name>
+ <roles>
+ <role>Administrator</role>
+ <role>Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Rob Manning</name>
+ <roles>
+ <role>Developer</role>
+ <role>Release Manager</role>
+ </roles>
+ </developer>
+ </developers>
+ <licenses>
+ <license>
+ <name>GNU Lesser General Public License</name>
+ <url>http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <url>http://www.squirrelsql.org/</url>
+ <scm>
+ <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/dbcopy</connection>
+ <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/dbcopy</developerConnection>
+ <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/dbcopy</url>
+ </scm>
+ <issueManagement>
+ <system>SourceForge Tracker</system>
+ <url>http://sourceforge.net/tracker/?group_id=28383%26atid=393414</url>
+ </issueManagement>
+ <ciManagement>
+ <system>Hudson</system>
+ <url>https://www.squirrel-sql.org/hudson/</url>
+ </ciManagement>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack-deps</id>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <phase>prepare-package</phase>
+ <configuration>
+
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>default-jar</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <archive>
+ <manifest>
+ <mainClass>net.sourceforge.squirrel_sql.plugins.dbcopy.cli.DBCopyCLI</mainClass>
+ </manifest>
+ </archive>
+ <classesDirectory>${project.build.directory}/dependency</classesDirectory>
+ </configuration>
+ </execution>
+ </executions>
+
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>net.sf.squirrel-sql.plugins</groupId>
+ <artifactId>dbcopy</artifactId>
+ <version>3.3.0-SNAPSHOT</version>
+ </dependency>
+ <!-- <dependency>-->
+ <!-- <groupId>net.sf.squirrel-sql</groupId>-->
+ <!-- <artifactId>fw</artifactId>-->
+ <!-- <version>3.3.0-SNAPSHOT</version>-->
+ <!-- <type>pom</type>-->
+ <!-- </dependency>-->
+ <!-- <dependency>-->
+ <!-- <groupId>net.sf.squirrel-sql</groupId>-->
+ <!-- <artifactId>squirrel-sql</artifactId>-->
+ <!-- <version>3.3.0-SNAPSHOT</version>-->
+ <!-- </dependency>-->
+ </dependencies>
+</project>
\ 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-07-30 13:41:28
|
Revision: 6329
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6329&view=rev
Author: manningr
Date: 2011-07-30 13:41:22 +0000 (Sat, 30 Jul 2011)
Log Message:
-----------
New external test for DBCopyCLI. Not complete.
Added Paths:
-----------
trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/
trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/dbcopy/
trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/dbcopy/cli/
trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/dbcopy/cli/DbCopyCliExternalIntegrationTest.java
Added: trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/dbcopy/cli/DbCopyCliExternalIntegrationTest.java
===================================================================
--- trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/dbcopy/cli/DbCopyCliExternalIntegrationTest.java (rev 0)
+++ trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/dbcopy/cli/DbCopyCliExternalIntegrationTest.java 2011-07-30 13:41:22 UTC (rev 6329)
@@ -0,0 +1,214 @@
+package net.sourceforge.squirrel_sql.plugins.dbcopy.cli;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Tests copying tables from one type of database to another. The ALIAS_NAME constants below must be defined
+ * in ~/.squirrel-sql/SQLAliases23.xml for this test to work properly.
+ */
+public class DbCopyCliExternalIntegrationTest
+{
+ private static String DB2_DEST_ALIAS_NAME = "DB2 (DBCPDST)";
+
+ private static String DB2_SOURCE_ALIAS_NAME = "DB2 (DBCPSRC)";
+
+ private static String DERBY_DEST_ALIAS_NAME = "Derby (dbcopydest)";
+
+ private static String DERBY_SOURCE_ALIAS_NAME = "Derby (dbcopysrc)";
+
+ private static String FIREBIRD_DEST_ALIAS_NAME = "Firebird (dbcopydest)";
+
+ private static String FRONTBASE_DEST_ALIAS_NAME = "Frontbase (dbcopydest)";
+
+ private static String H2_SOURCE_ALIAS_NAME = "H2 (dbcopysrc)";
+
+ private static String H2_DEST_ALIAS_NAME = "H2 (dbcopydest)";
+
+ private static String INFORMIX_DEST_ALIAS_NAME = "Informix (demo_on)";
+
+ private static String HSQLDB_DEST_ALIAS_NAME = "HSQLDB (dbcopydest)";
+
+ private static String MYSQL4_DEST_ALIAS_NAME = "MySQL 4 (dbcopydest)";
+
+ private static String MYSQL4_SOURCE_ALIAS_NAME = "MySQL 4 (dbcopysrc)";
+
+ private static String MYSQL5_DEST_ALIAS_NAME = "MySQL 5 (dbcopydest)";
+
+ private static String MYSQL5_SOURCE_ALIAS_NAME = "MySQL 5 (dbcopysrc)";
+
+ private static String ORACLE_SOURCE_ALIAS_NAME = "Oracle (dbcopysrc)";
+
+ private static String ORACLE_DEST_ALIAS_NAME = "Oracle (dbcopydest)";
+
+ private static String POSTGRES_DEST_ALIAS_NAME = "PostgreSQL";
+
+ private static String TABLE_LIST_UPPER =
+ "BIGINT_TYPE_TABLE,BINARY_TYPE_TABLE,BIT_TYPE_TABLE,BLOB_TYPE_TABLE,BOOLEAN_TYPE_TABLE,"+
+ "CHAR_TYPE_TABLE,CLOB_TYPE_TABLE,DATE_TYPE_TABLE,DECIMAL_TYPE_TABLE,DOUBLE_TYPE_TABLE," +
+ "FLOAT_TYPE_TABLE,INTEGER_TYPE_TABLE,LONGVARBINARY_TYPE_TABLE,LONGVARCHAR_TYPE_TABLE," +
+ "NUMERIC_TYPE_TABLE,REAL_TYPE_TABLE,SMALLINT_TYPE_TABLE,TIME_TYPE_TABLE,TIMESTAMP_TYPE_TABLE," +
+ "TINYINT_TYPE_TABLE,VARBINARY_TYPE_TABLE,VARCHAR_TYPE_TABLE";
+
+ private static String TABLE_LIST_LOWER = TABLE_LIST_UPPER.toLowerCase();
+
+
+ @Test
+ public void testH2ToDb2() throws Exception
+ {
+ String[] args =
+ new String[] {
+ "--source-alias", H2_SOURCE_ALIAS_NAME,
+ "--dest-alias", DB2_DEST_ALIAS_NAME,
+ "--table-list", TABLE_LIST_UPPER,
+ "--dest-schema", "DBCPDST",
+ "--source-schema", "PUBLIC" };
+ DBCopyCLI.main(args);
+ }
+
+ @Test
+ public void testOracleToDb2() throws Exception
+ {
+ String[] args =
+ new String[] {
+ "--source-alias", ORACLE_SOURCE_ALIAS_NAME,
+ "--dest-alias", DB2_DEST_ALIAS_NAME,
+ "--table-list", TABLE_LIST_UPPER,
+ "--dest-schema", "DBCPDST",
+ "--source-schema", "DBCOPYSRC" };
+ DBCopyCLI.main(args);
+ }
+
+ @Test
+ public void testOracleToDerby() throws Exception
+ {
+ String[] args =
+ new String[] {
+ "--source-alias", ORACLE_SOURCE_ALIAS_NAME,
+ "--dest-alias", DERBY_DEST_ALIAS_NAME,
+ "--table-list", TABLE_LIST_UPPER,
+ "--dest-schema", "APP",
+ "--source-schema", "DBCOPYSRC" };
+ DBCopyCLI.main(args);
+ }
+
+ @Test
+ public void testOracleToFirebird() throws Exception
+ {
+ String[] args =
+ new String[] {
+ "--source-alias", ORACLE_SOURCE_ALIAS_NAME,
+ "--dest-alias", FIREBIRD_DEST_ALIAS_NAME,
+ "--table-list", TABLE_LIST_UPPER,
+ "--dest-schema", "",
+ "--source-schema", "DBCOPYSRC" };
+ DBCopyCLI.main(args);
+ }
+
+ @Test
+ public void testOracleToFrontbase() throws Exception
+ {
+ String[] args =
+ new String[] {
+ "--source-alias", ORACLE_SOURCE_ALIAS_NAME,
+ "--dest-alias", FRONTBASE_DEST_ALIAS_NAME,
+ "--table-list", TABLE_LIST_UPPER,
+ "--dest-schema", "DBCOPY",
+ "--source-schema", "DBCOPYSRC" };
+ DBCopyCLI.main(args);
+ }
+
+ @Test
+ public void testOracleToH2() throws Exception
+ {
+ String[] args =
+ new String[] {
+ "--source-alias", ORACLE_SOURCE_ALIAS_NAME,
+ "--dest-alias", H2_DEST_ALIAS_NAME,
+ "--table-list", TABLE_LIST_UPPER,
+ "--dest-schema", "PUBLIC",
+ "--source-schema", "DBCOPYSRC" };
+ DBCopyCLI.main(args);
+ }
+
+ @Test
+ public void testOracleToHSQLDB() throws Exception
+ {
+ String[] args =
+ new String[] {
+ "--source-alias", ORACLE_SOURCE_ALIAS_NAME,
+ "--dest-alias", HSQLDB_DEST_ALIAS_NAME,
+ "--table-list", TABLE_LIST_UPPER,
+ "--dest-schema", "PUBLIC",
+ "--source-schema", "DBCOPYSRC" };
+ DBCopyCLI.main(args);
+ }
+
+ @Test
+ public void testOracleToInformix() throws Exception
+ {
+ String[] args =
+ new String[] {
+ "--source-alias", ORACLE_SOURCE_ALIAS_NAME,
+ "--dest-alias", INFORMIX_DEST_ALIAS_NAME,
+ "--table-list", TABLE_LIST_UPPER,
+ "--dest-schema", "informix",
+ "--source-schema", "DBCOPYSRC" };
+ DBCopyCLI.main(args);
+ }
+
+ @Test
+ public void testOracleToMySQL4() throws Exception
+ {
+ String[] args =
+ new String[] {
+ "--source-alias", ORACLE_SOURCE_ALIAS_NAME,
+ "--dest-alias", MYSQL4_DEST_ALIAS_NAME,
+ "--table-list", TABLE_LIST_UPPER,
+ "--dest-catalog", "dbcopydest",
+ "--source-schema", "DBCOPYSRC" };
+ DBCopyCLI.main(args);
+ }
+
+ @Test
+ public void testOracleToMySQL5() throws Exception
+ {
+ String[] args =
+ new String[] {
+ "--source-alias", ORACLE_SOURCE_ALIAS_NAME,
+ "--dest-alias", MYSQL5_DEST_ALIAS_NAME,
+ "--table-list", TABLE_LIST_UPPER,
+ "--dest-catalog", "dbcopydest",
+ "--source-schema", "DBCOPYSRC" };
+ DBCopyCLI.main(args);
+ }
+
+ @Test
+ public void testOracleToOracle() throws Exception
+ {
+ String[] args =
+ new String[] {
+ "--source-alias", ORACLE_SOURCE_ALIAS_NAME,
+ "--dest-alias", ORACLE_DEST_ALIAS_NAME,
+ "--table-list", TABLE_LIST_UPPER,
+ "--dest-schema", "DBCOPYDEST",
+ "--source-schema", "DBCOPYSRC" };
+ DBCopyCLI.main(args);
+ }
+
+ @Test
+ public void testOracleToPostgreSQL() throws Exception
+ {
+ String[] args =
+ new String[] {
+ "--source-alias", ORACLE_SOURCE_ALIAS_NAME,
+ "--dest-alias", POSTGRES_DEST_ALIAS_NAME,
+ "--table-list", TABLE_LIST_UPPER,
+ "--dest-schema", "public",
+ "--source-schema", "DBCOPYSRC" };
+ DBCopyCLI.main(args);
+ }
+
+
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2011-07-30 13:40:03
|
Revision: 6328
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6328&view=rev
Author: manningr
Date: 2011-07-30 13:39:55 +0000 (Sat, 30 Jul 2011)
Log Message:
-----------
Added dbcopy dependency for testing use of DBCopyCLI and dbcopy against real databases.
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-07-30 13:37:38 UTC (rev 6327)
+++ trunk/sql12/squirrelsql-integration-environment/pom.xml 2011-07-30 13:39:55 UTC (rev 6328)
@@ -122,6 +122,11 @@
<version>${squirrel-sql-version}</version>
</dependency>
<dependency>
+ <groupId>net.sf.squirrel-sql.plugins</groupId>
+ <artifactId>dbcopy</artifactId>
+ <version>${squirrel-sql-version}</version>
+ </dependency>
+ <dependency>
<groupId>gsbase</groupId>
<artifactId>gsbase</artifactId>
<version>2.0.1</version>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2011-07-30 13:37:44
|
Revision: 6327
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6327&view=rev
Author: manningr
Date: 2011-07-30 13:37:38 +0000 (Sat, 30 Jul 2011)
Log Message:
-----------
toString methods for event logging.
Modified Paths:
--------------
trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/event/RecordEvent.java
trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/event/StatementEvent.java
Modified: trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/event/RecordEvent.java
===================================================================
--- trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/event/RecordEvent.java 2011-07-30 13:37:08 UTC (rev 6326)
+++ trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/event/RecordEvent.java 2011-07-30 13:37:38 UTC (rev 6327)
@@ -75,5 +75,16 @@
return recordCount;
}
-
+ /**
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public String toString() {
+ StringBuilder result = new StringBuilder("Record ");
+ result.append(recordNumber);
+ result.append(" of ");
+ result.append(recordCount);
+ result.append(" total records");
+ return result.toString();
+ }
}
Modified: trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/event/StatementEvent.java
===================================================================
--- trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/event/StatementEvent.java 2011-07-30 13:37:08 UTC (rev 6326)
+++ trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/event/StatementEvent.java 2011-07-30 13:37:38 UTC (rev 6327)
@@ -18,6 +18,9 @@
*/
package net.sourceforge.squirrel_sql.plugins.dbcopy.event;
+import net.sourceforge.squirrel_sql.fw.util.StringUtilities;
+import net.sourceforge.squirrel_sql.fw.util.Utilities;
+
/**
* Contains information about an SQL statement that was executed.
*/
@@ -37,7 +40,7 @@
private String statement = null;
/** any bind variable values. only used when type = INSERT_RECORD_TYPE */
- private String[] bindValues;
+ private String[] bindValues = null;
/** the type of the statement */
private int statementType = -1;
@@ -93,4 +96,28 @@
public String[] getBindValues() {
return bindValues;
}
+
+ @Override
+ public String toString() {
+ StringBuilder result = new StringBuilder();
+ result.append("Statement (");
+ result.append(statement);
+ result.append(")");
+ if (bindValues != null) {
+ result.append(", bind values = \n");
+ int count = 1;
+ for (String value : bindValues) {
+ result.append("(");
+ result.append("length=");
+ result.append(value.length());
+ result.append(") ");
+ result.append(":");
+ result.append(count++);
+ result.append("=");
+ result.append(value);
+ result.append("\n");
+ }
+ }
+ return result.toString();
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2011-07-30 13:37:14
|
Revision: 6326
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6326&view=rev
Author: manningr
Date: 2011-07-30 13:37:08 +0000 (Sat, 30 Jul 2011)
Log Message:
-----------
log certain events to STDOUT.
Modified Paths:
--------------
trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/cli/CLCopyListener.java
Modified: trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/cli/CLCopyListener.java
===================================================================
--- trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/cli/CLCopyListener.java 2011-07-30 13:36:13 UTC (rev 6325)
+++ trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/cli/CLCopyListener.java 2011-07-30 13:37:08 UTC (rev 6326)
@@ -64,11 +64,13 @@
@Override
public void recordCopied(RecordEvent e)
{
+ System.out.println("Copied " + e.toString());
}
@Override
public void statementExecuted(StatementEvent e)
{
+ System.out.println("Executed " + e.toString());
}
@Override
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2011-07-30 13:36:20
|
Revision: 6325
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6325&view=rev
Author: manningr
Date: 2011-07-30 13:36:13 +0000 (Sat, 30 Jul 2011)
Log Message:
-----------
Removed no longer needed/supported testing code. This functionality is being replaced in the integration environment using new DBCopyCLI.
Removed Paths:
-------------
trunk/sql12/plugins/dbcopy/test/cp.bat
trunk/sql12/plugins/dbcopy/test/cp.conf
trunk/sql12/plugins/dbcopy/test/cp.conf.unix
trunk/sql12/plugins/dbcopy/test/log4j.properties
trunk/sql12/plugins/dbcopy/test/net/
trunk/sql12/plugins/dbcopy/test/prefs.xml
trunk/sql12/plugins/dbcopy/test/run_all.pl
Deleted: trunk/sql12/plugins/dbcopy/test/cp.bat
===================================================================
(Binary files differ)
Deleted: trunk/sql12/plugins/dbcopy/test/cp.conf
===================================================================
--- trunk/sql12/plugins/dbcopy/test/cp.conf 2011-07-30 13:31:58 UTC (rev 6324)
+++ trunk/sql12/plugins/dbcopy/test/cp.conf 2011-07-30 13:36:13 UTC (rev 6325)
@@ -1,70 +0,0 @@
-
-# DBCopy plugin
-C:\tools\squirrel\plugins\dbcopy.jar
-C:\home\projects\squirrel-sql\sql12\plugins\dbcopy\lib\hibernate3.jar
-C:\home\projects\squirrel-sql\sql12\plugins\dbcopy\lib\antlr-2.7.5H3.jar
-
-# SQuirreL
-C:\home\projects\squirrel-sql\sql12\eclipse-bin
-C:\tools\squirrel\squirrel-sql.jar
-C:\tools\squirrel\lib\fw.jar
-C:\tools\squirrel\lib\commons-cli.jar
-C:\tools\squirrel\lib\log4j.jar
-C:\tools\squirrel\lib\nanoxml-2.2.3.jar
-
-# Axion
-C:\home\projects\axion\bin\axion-1.0-M3-dev.jar
-C:\home\projects\axion\lib\commons-collections.jar
-C:\home\projects\axion\lib\commons-primitives.jar
-C:\home\CVS\collabraspace\software\commons-logging-1.0.4\lib\commons-logging.jar
-C:\home\CVS\collabraspace\software\commons-logging-1.0.4\lib\commons-logging-api.jar
-
-# Daffodil
-C:\tools\OneDollarDB4_0\lib\DaffodilDB_Client.jar
-
-# DB2
-C:\tools\db-derby-snapshot-10.1.1.1-292855\lib\derbyclient.jar
-C:\tools\DB2_PE\java\db2jcc.jar;C:\tools\DB2_PE\java\db2jcc_license_cu.jar
-
-# Firebird
-C:\tools\firebird-jdbc-2.0.1\jaybird-full-2.0.1.jar;C:\tools\firebird-jdbc-2.0.1\mini-j2ee.jar
-
-# Frontbase
-C:\tools\FrontBaseJManager0_505\frontbasejdbc.jar
-C:\tools\FrontBaseJDBC-2.5.2\frontbasejdbc.jar
-
-# H2
-C:\tools\H2\bin\h2.jar
-
-# HSQL
-C:\tools\hsqldb-1_8_0_2\lib\hsqldb.jar
-
-# Ingres
-C:\tools\Ingres\ingres\lib\iijdbc.jar
-
-# MaxDB
-C:\tools\SAP_7.6_JDBC_Driver\sapdbc-7_6_00_16_4753.jar
-
-# McKoi
-C:\tools\mckoi1.0.3\mkjdbc.jar
-
-# MS - SQLServer
-C:\tools\Microsoft_SQL_Server_2005_JDBC_Driver\sqljdbc_1.0\enu\sqljdbc.jar
-
-# MySQL
-C:\tools\mysql-connector-java-3.1.8\mysql-connector-java-3.1.8-bin.jar
-
-# Oracle
-C:\tools\Oracle_10g_JDBC_Driver\ojdbc14.jar
-
-# Pointbase
-C:\bea\weblogic81\common\eval\pointbase\lib\pbclient44.jar
-
-# PostgreSQL
-C:\tools\PostgreSQL\8.0\jdbc\postgresql-8.0-311.jdbc3.jar
-
-# Sybase
-C:\tools\sybase\jConnect-6_0\classes\jconn3.jar;C:\tools\sybase\jConnect-6_0\classes\jTDS3.jar
-
-
-
Deleted: trunk/sql12/plugins/dbcopy/test/cp.conf.unix
===================================================================
--- trunk/sql12/plugins/dbcopy/test/cp.conf.unix 2011-07-30 13:31:58 UTC (rev 6324)
+++ trunk/sql12/plugins/dbcopy/test/cp.conf.unix 2011-07-30 13:36:13 UTC (rev 6325)
@@ -1,98 +0,0 @@
-# log4j.properties
-/home/manningr/projects/squirrel_snapshots/sql12/plugins/dbcopy/test
-
-
-/home/manningr/projects/squirrel_snapshots/sql12/eclipse-classes
-/home/manningr/projects/squirrel_snapshots/sql12/test/lib/mockobjects-jdk1.4-0.09.jar
-/home/manningr/projects/squirrel_snapshots/sql12/test/lib/mockobjects-core-0.09.jar
-/home/manningr/projects/squirrel_snapshots/sql12/test/lib/junit.jar
-
-# DBCopy plugin
-#/usr/local/squirrel/plugins/dbcopy.jar
-/usr/local/squirrel/plugins/dbcopy/lib/antlr-2.7.5H3.jar
-/usr/local/squirrel/plugins/dbcopy/lib/commons-logging-1.0.4.jar
-/usr/local/squirrel/plugins/dbcopy/lib/hibernate3.jar
-
-# SQuirreL
-/usr/local/squirrel
-#/usr/local/squirrel/squirrel-sql.jar
-/usr/local/squirrel/lib/commons-cli.jar
-/usr/local/squirrel/lib/forms.jar
-#/usr/local/squirrel/lib/fw.jar
-/usr/local/squirrel/lib/nanoxml-2.1.jar
-
-# Generated properties files
-/home/manningr/projects/squirrel_snapshots/sql12/plugins/dbcopy/test/tmp
-
-# Axion
-/opt/axion/bin/axion-1.0-M3-dev.jar
-/opt/axion/lib/commons-collections.jar
-/opt/axion/lib/commons-primitives.jar
-/opt/axion/lib/commons-logging.jar
-/opt/axion/lib/commons-codec.jar
-/opt/axion/lib/log4j-client.jar
-/opt/axion/lib/log4j.jar
-
-# Daffodil
-/opt/OneDollarDB4_0/lib/DaffodilDB_Client.jar
-
-# Derby
-/opt/derby/lib/derbyclient.jar
-
-# DB2
-/opt/db2/java/db2jcc.jar
-/opt/db2/java/db2jcc_license_cu.jar
-
-# Firebird
-/opt/jdbc/Firebird_jaybird_2_1_1/jaybird-full-2.1.1.jar
-
-# Frontbase
-/opt/jdbc/Frontbase/frontbasejdbc.jar
-
-# H2
-/opt/h2/bin/h2.jar
-
-# HSQL
-/opt/hsqldb/lib/hsqldb.jar
-
-# Informix
-/opt/jdbc/informix_jdbc_3_0_0/lib/ifxjdbc.jar
-/opt/jdbc/informix_jdbc_3_0_0/lib/ifxjdbcx.jar
-/opt/jdbc/informix_jdbc_3_0_0/lib/ifxlang.jar
-/opt/jdbc/informix_jdbc_3_0_0/lib/ifxlsupp.jar
-/opt/jdbc/informix_jdbc_3_0_0/lib/ifxsqlj.jar
-/opt/jdbc/informix_jdbc_3_0_0/lib/ifxtools.jar
-
-# Ingres
-/opt/Ingres/IngresII/ingres/lib/iijdbc.jar
-
-# MaxDB
-#C:\tools\SAP_7.6_JDBC_Driver\sapdbc-7_6_00_16_4753.jar
-
-# McKoi
-/opt/mckoi/mkjdbc.jar
-
-# MS - SQLServer
-/opt/jdbc/MSSQL/sqljdbc.jar
-
-# MySQL
-/opt/jdbc/MySQL/mysql-connector-java-5.0.4/mysql-connector-java-5.0.4-bin.jar
-
-# Oracle
-/opt/jdbc/Oracle/ojdbc14.jar
-
-# Pointbase
-/opt/pointbase/lib/pbclient44.jar
-
-# PostgreSQL
-/opt/jdbc/PostgreSQL/postgresql-8.1-407.jdbc3.jar
-
-# Sybase
-/opt/jdbc/Sybase/jConnect-6_0/jconn3.jar
-
-# TimesTen
-/opt/TimesTen/csuite/lib/classes14.jar
-/opt/TimesTen/csuite/lib/libttJdbc.so
-/opt/TimesTen/csuite/lib/libttJdbcCS.so
-
-
Deleted: trunk/sql12/plugins/dbcopy/test/log4j.properties
===================================================================
--- trunk/sql12/plugins/dbcopy/test/log4j.properties 2011-07-30 13:31:58 UTC (rev 6324)
+++ trunk/sql12/plugins/dbcopy/test/log4j.properties 2011-07-30 13:36:13 UTC (rev 6325)
@@ -1,16 +0,0 @@
-log4j.appender.SquirrelAppender=net.sourceforge.squirrel_sql.client.SquirrelAppender
-log4j.appender.SquirrelAppender.layout=org.apache.log4j.PatternLayout
-log4j.appender.SquirrelAppender.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
-log4j.appender.SquirrelAppender.DatePattern='.'yyyy-ww
-
-log4j.rootLogger=debug, SquirrelAppender
-
-# Print only messages of level WARN or above in the package org.axiondb.
-log4j.logger.org.axiondb=WARN
-log4j.logger.org.hibernate.dialect.Dialect=WARN
-log4j.logger.net.sourceforge.squirrel_sql.client.session.mainpanel=WARN
-
-# Print only messages of level WARN or above in the package
-# net.sourceforge.squirrel_sql.fw.util.
-log4j.logger.net.sourceforge.squirrel_sql.fw.util=FATAL
-log4j.logger.net.sourceforge.squirrel_sql.client.session.schemainfo=FATAL
Deleted: trunk/sql12/plugins/dbcopy/test/prefs.xml
===================================================================
--- trunk/sql12/plugins/dbcopy/test/prefs.xml 2011-07-30 13:31:58 UTC (rev 6324)
+++ trunk/sql12/plugins/dbcopy/test/prefs.xml 2011-07-30 13:36:13 UTC (rev 6325)
@@ -1,16 +0,0 @@
-<Beans>
- <Bean Class="net.sourceforge.squirrel_sql.plugins.dbcopy.prefs.DBCopyPreferenceBean">
- <clientName>SQuirreL SQL Client/DBCopy Plugin</clientName>
- <clientVersion> @SNAPSHOT_VERSION@/0.13</clientVersion>
- <copyOnlyTableDefs>false</copyOnlyTableDefs>
- <copyPrimaryKeys>false</copyPrimaryKeys>
- <copyForeignKeys>false</copyForeignKeys>
- <fileCacheBufferSize>8192</fileCacheBufferSize>
- <useFileCaching>false</useFileCaching>
- <useTruncate>true</useTruncate>
- <tableDelayMillis>1000</tableDelayMillis>
- <testColumnNames>false</testColumnNames>
- <delayBetweenObjects>false</delayBetweenObjects>
- <recordDelayMillis>5</recordDelayMillis>
- </Bean>
-</Beans>
Deleted: trunk/sql12/plugins/dbcopy/test/run_all.pl
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2011-07-30 13:32:04
|
Revision: 6324
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6324&view=rev
Author: manningr
Date: 2011-07-30 13:31:58 +0000 (Sat, 30 Jul 2011)
Log Message:
-----------
Added setups prior to refactoring and relocating these test resources to the integration environment.
Modified Paths:
--------------
trunk/sql12/plugins/dbcopy/test/dbmonster/dbmonster.properties
trunk/sql12/plugins/dbcopy/test/dbmonster/test.xml
Modified: trunk/sql12/plugins/dbcopy/test/dbmonster/dbmonster.properties
===================================================================
--- trunk/sql12/plugins/dbcopy/test/dbmonster/dbmonster.properties 2011-07-30 13:23:56 UTC (rev 6323)
+++ trunk/sql12/plugins/dbcopy/test/dbmonster/dbmonster.properties 2011-07-30 13:31:58 UTC (rev 6324)
@@ -1,7 +1,28 @@
-dbmonster.jdbc.driver=org.postgresql.Driver
-dbmonster.jdbc.url=jdbc:postgresql://localhost:5432/dbcopytest
+#dbmonster.jdbc.driver=org.postgresql.Driver
+#dbmonster.jdbc.url=jdbc:postgresql://localhost:5432/dbcopytest
+#dbmonster.jdbc.username=dbcopy
+#dbmonster.jdbc.password=dbcopy
+
+#dbmonster.jdbc.driver=oracle.jdbc.OracleDriver
+#dbmonster.jdbc.url=jdbc:oracle:thin:@10.0.1.61:1521:orcl
+#dbmonster.jdbc.username=dbcopysrc
+#dbmonster.jdbc.password=password
+
+#dbmonster.jdbc.driver=com.ibm.db2.jcc.DB2Driver
+#dbmonster.jdbc.url=jdbc:db2://10.0.1.47:50000/DBCPSRC
+#dbmonster.jdbc.username=dbcopy
+#dbmonster.jdbc.password=password
+
+# No access to the dbcopysrc catalog for user dbcopy
+#dbmonster.jdbc.driver=com.mysql.jdbc.Driver
+#dbmonster.jdbc.url=jdbc:mysql://10.0.1.47:3306/dbcopysrc
+#dbmonster.jdbc.username=dbcopy
+#dbmonster.jdbc.password=password
+
+dbmonster.jdbc.driver=org.h2.Driver
+dbmonster.jdbc.url=jdbc:h2:tcp://10.0.1.30:9094/dbcopysrc
dbmonster.jdbc.username=dbcopy
-dbmonster.jdbc.password=dbcopy
+dbmonster.jdbc.password=password
# for Oracle and other schema enabled databases
#dbmonster.jdbc.schema=public
Modified: trunk/sql12/plugins/dbcopy/test/dbmonster/test.xml
===================================================================
--- trunk/sql12/plugins/dbcopy/test/dbmonster/test.xml 2011-07-30 13:23:56 UTC (rev 6323)
+++ trunk/sql12/plugins/dbcopy/test/dbmonster/test.xml 2011-07-30 13:31:58 UTC (rev 6324)
@@ -24,7 +24,7 @@
<column name="char_column">
<generator type="pl.kernelpanic.dbmonster.generator.StringGenerator">
<property name="minLength" value="100"/>
- <property name="maxLength" value="6000"/>
+ <property name="maxLength" value="4000"/>
<property name="nulls" value="1"/>
</generator>
</column>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2011-07-30 13:24:02
|
Revision: 6323
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6323&view=rev
Author: manningr
Date: 2011-07-30 13:23:56 +0000 (Sat, 30 Jul 2011)
Log Message:
-----------
Oracle's varchar_type_table uses varchar now instead of CLOB. I think I did this before due to Oracle's relatively limited varchar size in comparison to other databases, but it's probably a bad idea for testing.
Modified Paths:
--------------
trunk/sql12/plugins/dbcopy/test/sql/Oracle/all_types.sql
Modified: trunk/sql12/plugins/dbcopy/test/sql/Oracle/all_types.sql
===================================================================
--- trunk/sql12/plugins/dbcopy/test/sql/Oracle/all_types.sql 2011-07-27 22:27:06 UTC (rev 6322)
+++ trunk/sql12/plugins/dbcopy/test/sql/Oracle/all_types.sql 2011-07-30 13:23:56 UTC (rev 6323)
@@ -108,6 +108,6 @@
);
CREATE TABLE VARCHAR_TYPE_TABLE
(
- VARCHAR_COLUMN CLOB
+ VARCHAR_COLUMN VARCHAR2(4000)
);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2011-07-27 22:27:13
|
Revision: 6322
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6322&view=rev
Author: manningr
Date: 2011-07-27 22:27:06 +0000 (Wed, 27 Jul 2011)
Log Message:
-----------
Scale back the number of test records created to allow the external test to finish quicker.
Modified Paths:
--------------
trunk/sql12/plugins/dbcopy/test/dbmonster/test.xml
Modified: trunk/sql12/plugins/dbcopy/test/dbmonster/test.xml
===================================================================
--- trunk/sql12/plugins/dbcopy/test/dbmonster/test.xml 2011-07-27 22:25:49 UTC (rev 6321)
+++ trunk/sql12/plugins/dbcopy/test/dbmonster/test.xml 2011-07-27 22:27:06 UTC (rev 6322)
@@ -2,25 +2,25 @@
<!DOCTYPE dbmonster-schema PUBLIC "-//kernelpanic.pl//DBMonster Database Schema DTD 1.1//EN" "http://dbmonster.kernelpanic.pl/dtd/dbmonster-schema-1.1.dtd">
<dbmonster-schema>
<name>public</name>
- <table name="bigint_type_table" rows="100">
+ <table name="bigint_type_table" rows="2">
<column name="bigint_column" databaseDefault="false">
<generator type="pl.kernelpanic.dbmonster.generator.NumberGenerator">
<property name="maxValue" value="9999999999999999"/>
<property name="minValue" value="1111111111111111"/>
- <property name="nulls" value="10"/>
+ <property name="nulls" value="1"/>
<property name="returnedType" value="numeric"/>
<property name="scale" value="0"/>
</generator>
</column>
</table>
- <table name="boolean_type_table" rows="100">
+ <table name="boolean_type_table" rows="2">
<column name="boolean_column">
<generator type="pl.kernelpanic.dbmonster.generator.BooleanGenerator">
- <property name="nulls" value="10"/>
+ <property name="nulls" value="1"/>
</generator>
</column>
</table>
- <table name="char_type_table" rows="100">
+ <table name="char_type_table" rows="2">
<column name="char_column">
<generator type="pl.kernelpanic.dbmonster.generator.StringGenerator">
<property name="minLength" value="100"/>
@@ -29,116 +29,116 @@
</generator>
</column>
</table>
- <table name="clob_type_table" rows="100">
+ <table name="clob_type_table" rows="2">
<column name="clob_column">
<generator type="pl.kernelpanic.dbmonster.generator.StringGenerator">
<property name="minLength" value="100"/>
<property name="maxLength" value="2000"/>
- <property name="nulls" value="10"/>
+ <property name="nulls" value="1"/>
</generator>
</column>
</table>
- <table name="date_type_table" rows="100">
+ <table name="date_type_table" rows="2">
<column name="date_column">
<generator type="pl.kernelpanic.dbmonster.generator.DateTimeGenerator">
- <property name="nulls" value="10"/>
+ <property name="nulls" value="1"/>
<property name="returnedType" value="date"/>
<property name="startDate" value="1970-02-01 03:30:59.0 GMT"/>
<property name="endDate" value="2005-02-01 03:30:59.0 GMT"/>
</generator>
</column>
</table>
- <table name="decimal_type_table" rows="100">
+ <table name="decimal_type_table" rows="2">
<column name="decimal_column">
<generator type="pl.kernelpanic.dbmonster.generator.NumberGenerator">
<property name="minValue" value="0"/>
<property name="maxValue" value="1000000.99"/>
<property name="returnedType" value="numeric"/>
<property name="scale" value="2"/>
- <property name="nulls" value="10"/>
+ <property name="nulls" value="1"/>
</generator>
</column>
</table>
- <table name="double_type_table" rows="100">
+ <table name="double_type_table" rows="2">
<column name="double_column">
<generator type="pl.kernelpanic.dbmonster.generator.NumberGenerator">
<property name="minValue" value="0"/>
<property name="maxValue" value="1000000"/>
<property name="returnedType" value="double"/>
<property name="scale" value="5"/>
- <property name="nulls" value="10"/>
+ <property name="nulls" value="1"/>
</generator>
</column>
</table>
- <table name="float_type_table" rows="100">
+ <table name="float_type_table" rows="2">
<column name="float_column">
<generator type="pl.kernelpanic.dbmonster.generator.NumberGenerator">
<property name="minValue" value="0"/>
<property name="maxValue" value="1000000"/>
<property name="returnedType" value="float"/>
<property name="scale" value="5"/>
- <property name="nulls" value="10"/>
+ <property name="nulls" value="1"/>
</generator>
</column>
</table>
- <table name="integer_type_table" rows="100">
+ <table name="integer_type_table" rows="2">
<column name="integer_column">
<generator type="pl.kernelpanic.dbmonster.generator.NumberGenerator">
<property name="minValue" value="0"/>
<property name="maxValue" value="1000000"/>
<property name="returnedType" value="integer"/>
<property name="scale" value="0"/>
- <property name="nulls" value="10"/>
+ <property name="nulls" value="1"/>
</generator>
</column>
</table>
- <table name="longvarchar_type_table" rows="100">
+ <table name="longvarchar_type_table" rows="2">
<column name="longvarchar_column">
<generator type="pl.kernelpanic.dbmonster.generator.StringGenerator">
<property name="minLength" value="100"/>
<property name="maxLength" value="2000"/>
- <property name="nulls" value="10"/>
+ <property name="nulls" value="1"/>
</generator>
</column>
</table>
- <table name="numeric_type_table" rows="100">
+ <table name="numeric_type_table" rows="2">
<column name="numeric_column">
<generator type="pl.kernelpanic.dbmonster.generator.NumberGenerator">
<property name="minValue" value="0"/>
<property name="maxValue" value="1000000"/>
<property name="returnedType" value="numeric"/>
<property name="scale" value="0"/>
- <property name="nulls" value="10"/>
+ <property name="nulls" value="1"/>
</generator>
</column>
</table>
- <table name="real_type_table" rows="100">
+ <table name="real_type_table" rows="2">
<column name="real_column">
<generator type="pl.kernelpanic.dbmonster.generator.NumberGenerator">
<property name="minValue" value="0"/>
<property name="maxValue" value="1000000"/>
<property name="returnedType" value="float"/>
<property name="scale" value="5"/>
- <property name="nulls" value="10"/>
+ <property name="nulls" value="1"/>
</generator>
</column>
</table>
- <table name="smallint_type_table" rows="100">
+ <table name="smallint_type_table" rows="2">
<column name="smallint_column">
<generator type="pl.kernelpanic.dbmonster.generator.NumberGenerator">
<property name="minValue" value="0"/>
<property name="maxValue" value="32767"/>
<property name="returnedType" value="integer"/>
<property name="scale" value="0"/>
- <property name="nulls" value="10"/>
+ <property name="nulls" value="1"/>
</generator>
</column>
</table>
- <table name="time_type_table" rows="100">
+ <table name="time_type_table" rows="2">
<column name="time_column">
<generator type="pl.kernelpanic.dbmonster.generator.DateTimeGenerator">
- <property name="nulls" value="10"/>
+ <property name="nulls" value="1"/>
<property name="returnedType" value="time"/>
<property name="startDate" value="1970-02-01 03:30:59.0 GMT"/>
<property name="endDate" value="2005-02-01 03:30:59.0 GMT"/>
@@ -146,33 +146,33 @@
</column>
</table>
- <table name="timestamp_type_table" rows="100">
+ <table name="timestamp_type_table" rows="2">
<column name="timestamp_column">
<generator type="pl.kernelpanic.dbmonster.generator.DateTimeGenerator">
- <property name="nulls" value="10"/>
+ <property name="nulls" value="1"/>
<property name="returnedType" value="timestamp"/>
<property name="startDate" value="1970-02-01 03:30:59.0 GMT"/>
<property name="endDate" value="2005-02-01 03:30:59.0 GMT"/>
</generator>
</column>
</table>
- <table name="tinyint_type_table" rows="100">
+ <table name="tinyint_type_table" rows="2">
<column name="tinyint_column">
<generator type="pl.kernelpanic.dbmonster.generator.NumberGenerator">
<property name="minValue" value="0"/>
<property name="maxValue" value="255"/>
<property name="returnedType" value="integer"/>
<property name="scale" value="0"/>
- <property name="nulls" value="10"/>
+ <property name="nulls" value="1"/>
</generator>
</column>
</table>
- <table name="varchar_type_table" rows="100">
+ <table name="varchar_type_table" rows="2">
<column name="varchar_column">
<generator type="pl.kernelpanic.dbmonster.generator.StringGenerator">
<property name="minLength" value="100"/>
<property name="maxLength" value="2000"/>
- <property name="nulls" value="10"/>
+ <property name="nulls" value="1"/>
</generator>
</column>
</table>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2011-07-27 22:25:55
|
Revision: 6321
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6321&view=rev
Author: manningr
Date: 2011-07-27 22:25:49 +0000 (Wed, 27 Jul 2011)
Log Message:
-----------
Local setup change.
Modified Paths:
--------------
trunk/sql12/plugins/dbcopy/test/conf/oracle.properties
Modified: trunk/sql12/plugins/dbcopy/test/conf/oracle.properties
===================================================================
--- trunk/sql12/plugins/dbcopy/test/conf/oracle.properties 2011-07-27 22:25:13 UTC (rev 6320)
+++ trunk/sql12/plugins/dbcopy/test/conf/oracle.properties 2011-07-27 22:25:49 UTC (rev 6321)
@@ -1,5 +1,5 @@
sourceDriver=oracle.jdbc.OracleDriver
-sourceJdbcUrl=jdbc:oracle:thin:@localhost:1521:xe
+sourceJdbcUrl=jdbc:oracle:thin:@10.0.1.61:1521:orcl
sourceCatalog=
sourceSchema=dbcopysrc
sourceUser=dbcopysrc
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 6320
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6320&view=rev
Author: manningr
Date: 2011-07-27 22:25:13 +0000 (Wed, 27 Jul 2011)
Log Message:
-----------
Throws exception upon construction ... no need for validate method.
Modified Paths:
--------------
trunk/sql12/plugins/dbcopy/src/test/java/net/sourceforge/squirrel_sql/plugins/dbcopy/cli/CommandLineArgumentProcessorTest.java
Modified: trunk/sql12/plugins/dbcopy/src/test/java/net/sourceforge/squirrel_sql/plugins/dbcopy/cli/CommandLineArgumentProcessorTest.java
===================================================================
--- trunk/sql12/plugins/dbcopy/src/test/java/net/sourceforge/squirrel_sql/plugins/dbcopy/cli/CommandLineArgumentProcessorTest.java 2011-07-27 22:23:52 UTC (rev 6319)
+++ trunk/sql12/plugins/dbcopy/src/test/java/net/sourceforge/squirrel_sql/plugins/dbcopy/cli/CommandLineArgumentProcessorTest.java 2011-07-27 22:25:13 UTC (rev 6320)
@@ -1,7 +1,6 @@
package net.sourceforge.squirrel_sql.plugins.dbcopy.cli;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
import org.apache.commons.cli.ParseException;
import org.junit.After;
@@ -58,12 +57,6 @@
}
@Test
- public void testValidate()
- {
- assertTrue(classUnderTest.isValid());
- }
-
- @Test
public void testGetSourceAliasName() throws ParseException
{
assertEquals(SOURCE_SESSION_NAME, classUnderTest.getSourceAliasName());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2011-07-27 22:23:59
|
Revision: 6319
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6319&view=rev
Author: manningr
Date: 2011-07-27 22:23:52 +0000 (Wed, 27 Jul 2011)
Log Message:
-----------
License header and TODO cleanup.
Modified Paths:
--------------
trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/cli/ApplicationStub.java
trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/cli/CLCopyListener.java
trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/cli/CLCopyUICallback.java
trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/cli/CommandLineArgumentProcessor.java
trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/cli/DBCopyCLI.java
trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/cli/SessionInfoProviderImpl.java
Modified: trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/cli/ApplicationStub.java
===================================================================
--- trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/cli/ApplicationStub.java 2011-07-27 22:21:46 UTC (rev 6318)
+++ trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/cli/ApplicationStub.java 2011-07-27 22:23:52 UTC (rev 6319)
@@ -1,3 +1,22 @@
+/*
+ * 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.dbcopy.cli;
import javax.swing.Action;
@@ -248,7 +267,6 @@
@Override
public boolean shutdown(boolean updateLaunchScript)
{
-
return false;
}
Modified: trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/cli/CLCopyListener.java
===================================================================
--- trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/cli/CLCopyListener.java 2011-07-27 22:21:46 UTC (rev 6318)
+++ trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/cli/CLCopyListener.java 2011-07-27 22:23:52 UTC (rev 6319)
@@ -1,3 +1,22 @@
+/*
+ * 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.dbcopy.cli;
import net.sourceforge.squirrel_sql.plugins.dbcopy.event.AnalysisEvent;
@@ -12,16 +31,15 @@
{
private boolean copyFinished = false;
-
- public boolean isCopyFinished() {
+
+ public boolean isCopyFinished()
+ {
return copyFinished;
}
-
+
@Override
public void analyzingTable(TableEvent e)
{
- // TODO Auto-generated method stub
-
}
@Override
@@ -33,14 +51,12 @@
@Override
public void copyStarted(CopyEvent e)
{
- // TODO Auto-generated method stub
-
}
@Override
public void handleError(ErrorEvent e)
{
- System.err.println("Encountered the following exception: "+e.getException().getMessage());
+ System.err.println("Encountered the following exception: " + e.getException().getMessage());
e.getException().printStackTrace();
copyFinished = true;
}
@@ -48,36 +64,26 @@
@Override
public void recordCopied(RecordEvent e)
{
- // TODO Auto-generated method stub
-
}
@Override
public void statementExecuted(StatementEvent e)
{
- // TODO Auto-generated method stub
-
}
@Override
public void tableAnalysisStarted(AnalysisEvent e)
{
- // TODO Auto-generated method stub
-
}
@Override
public void tableCopyFinished(TableEvent e)
{
- // TODO Auto-generated method stub
-
}
@Override
public void tableCopyStarted(TableEvent e)
{
- // TODO Auto-generated method stub
-
}
}
Modified: trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/cli/CLCopyUICallback.java
===================================================================
--- trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/cli/CLCopyUICallback.java 2011-07-27 22:21:46 UTC (rev 6318)
+++ trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/cli/CLCopyUICallback.java 2011-07-27 22:23:52 UTC (rev 6319)
@@ -1,3 +1,22 @@
+/*
+ * 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.dbcopy.cli;
import net.sourceforge.squirrel_sql.fw.dialects.UserCancelledOperationException;
Modified: trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/cli/CommandLineArgumentProcessor.java
===================================================================
--- trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/cli/CommandLineArgumentProcessor.java 2011-07-27 22:21:46 UTC (rev 6318)
+++ trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/cli/CommandLineArgumentProcessor.java 2011-07-27 22:23:52 UTC (rev 6319)
@@ -1,3 +1,22 @@
+/*
+ * 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.dbcopy.cli;
import java.util.ArrayList;
@@ -37,8 +56,6 @@
private Options options = new Options();
private CommandLine cmd = null;
-
- private boolean valid = true;
public CommandLineArgumentProcessor(String[] args) throws ParseException
{
@@ -46,11 +63,11 @@
CommandLineParser parser = new GnuParser();
try {
cmd = parser.parse(options, args);
- } catch (Exception e) {
+ } catch (ParseException e) {
HelpFormatter formatter = new HelpFormatter();
- System.out.println(e.getMessage());
+ System.err.println(e.getMessage());
formatter.printHelp("DBCopyCLI", options, true);
- valid = false;
+ throw e;
}
}
@@ -114,41 +131,6 @@
}
- public boolean isValid() {
- return valid;
- }
-
- public void validate()
- {
- try
- {
- if (!cmd.hasOption(SOURCE_SESSION))
- {
- throw new ParseException("Missing " + SOURCE_SESSION);
- }
- if (!cmd.hasOption(DEST_SESSION))
- {
- throw new ParseException("Missing " + DEST_SESSION);
- }
- if (!cmd.hasOption(TABLE_LIST) && !cmd.hasOption(TABLE_PATTERN))
- {
- throw new ParseException("Must specify either " + TABLE_LIST + " or " + TABLE_PATTERN);
- }
- if (!cmd.hasOption(DEST_SCHEMA))
- {
- throw new ParseException("Missing " + DEST_SCHEMA);
- }
- }
- catch (ParseException e)
- {
- HelpFormatter formatter = new HelpFormatter();
- System.out.println(e.getMessage());
- formatter.printHelp("DBCopyCLI", options, true);
- System.exit(1);
-
- }
- }
-
public String getSourceAliasName() {
return cmd.getOptionValue(SOURCE_SESSION);
}
Modified: trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/cli/DBCopyCLI.java
===================================================================
--- trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/cli/DBCopyCLI.java 2011-07-27 22:21:46 UTC (rev 6318)
+++ trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/cli/DBCopyCLI.java 2011-07-27 22:23:52 UTC (rev 6319)
@@ -1,3 +1,22 @@
+/*
+ * 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.dbcopy.cli;
import java.sql.SQLException;
@@ -4,10 +23,6 @@
import java.util.ArrayList;
import java.util.Iterator;
-import org.apache.commons.cli.HelpFormatter;
-import org.apache.commons.cli.ParseException;
-import org.apache.commons.lang.StringUtils;
-
import net.sourceforge.squirrel_sql.client.IApplication;
import net.sourceforge.squirrel_sql.client.gui.db.DataCache;
import net.sourceforge.squirrel_sql.client.gui.db.SQLAlias;
@@ -24,16 +39,14 @@
import net.sourceforge.squirrel_sql.fw.sql.ITableInfo;
import net.sourceforge.squirrel_sql.fw.sql.SQLConnection;
import net.sourceforge.squirrel_sql.fw.sql.SQLDriverManager;
-import net.sourceforge.squirrel_sql.fw.sql.TableInfo;
-import net.sourceforge.squirrel_sql.fw.util.StringUtilities;
-import net.sourceforge.squirrel_sql.fw.util.Utilities;
import net.sourceforge.squirrel_sql.plugins.dbcopy.CopyExecutor;
import net.sourceforge.squirrel_sql.plugins.dbcopy.DBCopyPlugin;
import net.sourceforge.squirrel_sql.plugins.dbcopy.SessionInfoProvider;
-import net.sourceforge.squirrel_sql.plugins.dbcopy.event.CopyTableListener;
import net.sourceforge.squirrel_sql.plugins.dbcopy.prefs.PreferencesManager;
import net.sourceforge.squirrel_sql.plugins.dbcopy.util.DBUtil;
+import org.apache.commons.lang.StringUtils;
+
/*
* Copyright (C) 2011 Rob Manning
* man...@us...
@@ -66,16 +79,16 @@
private static DataCache dataCache = null;
- private static ISession sourceSession = null;
-
- // private static ISession destSession = null;
-
private static SessionInfoProvider sessionInfoProvider = new SessionInfoProviderImpl();
private static ArrayList<ITableInfo> tables = new ArrayList<ITableInfo>();
private static CLCopyListener listener = new CLCopyListener();
+ private static ISession sourceSession = null;
+
+ private static ISession destSession = null;
+
/**
* @param args
*/
@@ -93,10 +106,11 @@
applicationFiles.getDatabaseAliasesFile(), squirrelResources.getDefaultDriversUrl(),
applicationStub);
- ISession destSession = getSessionForAlias(argProcessor.getDestAliasName());
+ setDestSession(getSessionForAlias(argProcessor.getDestAliasName()));
+ setSourceSession(getSessionForAlias(argProcessor.getSourceAliasName()));
- sessionInfoProvider.setSourceSession(getSessionForAlias(argProcessor.getSourceAliasName()));
- sessionInfoProvider.setDestSession(destSession);
+ sessionInfoProvider.setSourceSession(getSourceSession());
+ sessionInfoProvider.setDestSession(getDestSession());
for (String tableStr : argProcessor.getTableList())
{
tables.add(getTableInfo(sessionInfoProvider.getSourceSession(), sourceSchemaName, sourceCatalogName,
@@ -107,7 +121,7 @@
DatabaseObjectInfo destObject =
new DatabaseObjectInfo(destCatalogName, destSchemaName, simpleName, DatabaseObjectType.SCHEMA,
- destSession.getMetaData());
+ getDestSession().getMetaData());
sessionInfoProvider.setDestDatabaseObject(destObject);
PreferencesManager.initialize(new DBCopyPlugin());
@@ -118,8 +132,9 @@
executor.addListener(listener);
executor.setPref(new CLCopyUICallback());
executor.execute();
-
- while (!listener.isCopyFinished()) {
+
+ while (!listener.isCopyFinished())
+ {
System.out.print(".");
Thread.sleep(2000);
}
@@ -131,6 +146,12 @@
{
ISQLDatabaseMetaData md = session.getMetaData();
ITableInfo[] result = md.getTables(catalogName, schemaName, tableName, new String[] { "TABLE" }, null);
+ if (result.length == 0)
+ {
+ throw new IllegalStateException("Source table to be copied (" + tableName
+ + ") could not be located in schema (" + schemaName + ") and/or catalog (" + catalogName +
+ ") for alias: " + session.getAlias().getName());
+ }
return result[0];
}
@@ -165,4 +186,24 @@
}
throw new RuntimeException("Alias (" + alias + ") was not found");
}
+
+ public static void setSourceSession(ISession sourceSession)
+ {
+ DBCopyCLI.sourceSession = sourceSession;
+ }
+
+ public static ISession getSourceSession()
+ {
+ return sourceSession;
+ }
+
+ public static void setDestSession(ISession destSession)
+ {
+ DBCopyCLI.destSession = destSession;
+ }
+
+ public static ISession getDestSession()
+ {
+ return destSession;
+ }
}
Modified: trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/cli/SessionInfoProviderImpl.java
===================================================================
--- trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/cli/SessionInfoProviderImpl.java 2011-07-27 22:21:46 UTC (rev 6318)
+++ trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/cli/SessionInfoProviderImpl.java 2011-07-27 22:23:52 UTC (rev 6319)
@@ -1,3 +1,22 @@
+/*
+ * 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.dbcopy.cli;
import java.util.List;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2011-07-27 22:21:54
|
Revision: 6318
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6318&view=rev
Author: manningr
Date: 2011-07-27 22:21:46 +0000 (Wed, 27 Jul 2011)
Log Message:
-----------
New documentation for cli. Not complete.
Modified Paths:
--------------
trunk/sql12/plugins/dbcopy/src/main/resources/doc/readme.html
Added Paths:
-----------
trunk/sql12/plugins/dbcopy/src/main/resources/doc/command-line.html
Added: trunk/sql12/plugins/dbcopy/src/main/resources/doc/command-line.html
===================================================================
--- trunk/sql12/plugins/dbcopy/src/main/resources/doc/command-line.html (rev 0)
+++ trunk/sql12/plugins/dbcopy/src/main/resources/doc/command-line.html 2011-07-27 22:21:46 UTC (rev 6318)
@@ -0,0 +1,16 @@
+<html>
+<head>
+<title>Command-line Usage</title>
+</head>
+
+<body>
+As of version 1.15 of the DBCopy Plugin, a new command-line interface is available for
+copying tables. This can be useful for scripts in cases where copying is to be done
+in an automated way without a user present.
+
+
+
+</body>
+
+
+</html>
\ No newline at end of file
Modified: trunk/sql12/plugins/dbcopy/src/main/resources/doc/readme.html
===================================================================
--- trunk/sql12/plugins/dbcopy/src/main/resources/doc/readme.html 2011-07-27 22:21:11 UTC (rev 6317)
+++ trunk/sql12/plugins/dbcopy/src/main/resources/doc/readme.html 2011-07-27 22:21:46 UTC (rev 6318)
@@ -9,8 +9,15 @@
</HEAD>
<BODY LANG="en-US" DIR="LTR">
<P><B>DB Copy Plugin Help</B></P>
-<a href="./usage.html">Usage</a>
<p>
-<a href="./preferences.html">Configuration</a>
+ <a href="./preferences.html">Configuration</a>
+</p>
+<p>
+ <a href="./usage.html">Usage in SQuirreL</a>
+</p>
+<p>
+ <a href="./commandline.html">Command-line Usage</a>
+</p>
+
</BODY>
</HTML>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2011-07-27 22:21:17
|
Revision: 6317
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6317&view=rev
Author: manningr
Date: 2011-07-27 22:21:11 +0000 (Wed, 27 Jul 2011)
Log Message:
-----------
Fix warnings.
Modified Paths:
--------------
trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/actions/CopyTableAction.java
trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/actions/PasteTableAction.java
trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/commands/CopyTableCommand.java
trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/gui/PreferencesPanel.java
Modified: trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/actions/CopyTableAction.java
===================================================================
--- trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/actions/CopyTableAction.java 2011-07-23 00:22:26 UTC (rev 6316)
+++ trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/actions/CopyTableAction.java 2011-07-27 22:21:11 UTC (rev 6317)
@@ -30,6 +30,8 @@
public class CopyTableAction extends SquirrelAction
implements ISessionAction {
+ private static final long serialVersionUID = 1L;
+
/** Current session. */
private ISession _session;
Modified: trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/actions/PasteTableAction.java
===================================================================
--- trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/actions/PasteTableAction.java 2011-07-23 00:22:26 UTC (rev 6316)
+++ trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/actions/PasteTableAction.java 2011-07-27 22:21:11 UTC (rev 6317)
@@ -45,6 +45,8 @@
public class PasteTableAction extends SquirrelAction
implements ISessionAction {
+ private static final long serialVersionUID = 1L;
+
/** Current plugin. */
private final SessionInfoProvider sessionInfoProv;
Modified: trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/commands/CopyTableCommand.java
===================================================================
--- trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/commands/CopyTableCommand.java 2011-07-23 00:22:26 UTC (rev 6316)
+++ trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/commands/CopyTableCommand.java 2011-07-27 22:21:11 UTC (rev 6317)
@@ -20,12 +20,8 @@
*/
import java.sql.SQLException;
-import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.collections.CollectionUtils;
-import org.jboss.util.collection.CollectionsUtil;
-
import net.sourceforge.squirrel_sql.client.gui.IProgressCallBackFactory;
import net.sourceforge.squirrel_sql.client.gui.ProgressCallBackFactory;
import net.sourceforge.squirrel_sql.client.session.IObjectTreeAPI;
Modified: trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/gui/PreferencesPanel.java
===================================================================
--- trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/gui/PreferencesPanel.java 2011-07-23 00:22:26 UTC (rev 6316)
+++ trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/gui/PreferencesPanel.java 2011-07-27 22:21:11 UTC (rev 6317)
@@ -36,14 +36,14 @@
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.dbcopy.prefs.DBCopyPreferenceBean;
import net.sourceforge.squirrel_sql.plugins.dbcopy.prefs.PreferencesManager;
public class PreferencesPanel extends JPanel {
- DBCopyPreferenceBean _prefs = null;
+ private static final long serialVersionUID = 1L;
+
+ DBCopyPreferenceBean _prefs = null;
JCheckBox truncateCheckBox = null;
@@ -94,11 +94,7 @@
JLabel delayRecordsLabel = null;
JTextField delayRecordsTextField = null;
-
- /** Logger for this class. */
- private final static ILogger log =
- LoggerController.createLogger(PreferencesPanel.class);
-
+
/** Internationalized strings for this class. */
private static final StringManager s_stringMgr =
StringManagerFactory.getStringManager(PreferencesPanel.class);
@@ -694,14 +690,14 @@
PreferencesManager.savePrefs();
}
- /* (non-Javadoc)
+ /**
* @see net.sourceforge.squirrel_sql.client.util.IOptionPanel#applyChanges()
*/
public void applyChanges() {
save();
}
- /* (non-Javadoc)
+ /**
* @see net.sourceforge.squirrel_sql.client.util.IOptionPanel#getPanelComponent()
*/
public Component getPanelComponent() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2011-07-23 00:22:32
|
Revision: 6316
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6316&view=rev
Author: manningr
Date: 2011-07-23 00:22:26 +0000 (Sat, 23 Jul 2011)
Log Message:
-----------
Bug 3172465: (Error connecting to DB after 3.2.1 upgrade) A couple more missing dependencies that prevented the SQL Validator from connecting to the mimer site.
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-07-23 00:15:14 UTC (rev 6315)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2011-07-23 00:22:26 UTC (rev 6316)
@@ -75,7 +75,6 @@
Hibernate Plugin: Improved display of mapped objects in table cells:
Class name, primary key and toString() ist displayed instead of toString() only.
-
DB-Diff-Plugin:
Allowed to compare tables within one Session the same way as with different Sessions using select and
compare of the Object tree's right mouse menu. It is still possible to compare tables inside the
@@ -97,41 +96,44 @@
When displaying the content of a table, the dialog "Please wait while the query is executed" may not dispose.
This may occurs only for tables of a "In Memory Database" with only a few rows of data.
+When editing table cells in a text area, the input field for the file name will be shown in an appropriate size
+ instead of being very small. If the user change the size of the dialog, the input field for the file name will use the extra space.
+
+Now, "Press to open logs" shows the current log file by default instead of a random one.
+
+SQL Scripts Plugin: Increased multi table script configuration dialog's size.
+
+Fixed NullPointerException in Hibernate Plugin when executing HQL with 'view objects' switched on.
+
+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
+
3309565: Not possible to translate SQL connection error messages, because they are hard coded.
3303174: Installer hangs on linux. Updated version of IzPack compiler to 4.3.4.
-3137852: DB2 Plugin - The source code is not visible, if a char column contains a default value.
-
3293737: A exception occurs if the value of a SMALLINT column is edited in a result table.
-When editing table cells in a text area, the input field for the file name will be shown in an appropriate size
- instead of being very small. If the user change the size of the dialog, the input field for the file name will use the extra space.
-
3238037: It's impossible to create a foreign key in oracle 10g, if some tables contains a / in their name eg. recycle bins
-Now, "Press to open logs" shows the current log file by default instead of a random one.
-
3222350: Cannot enter negative values for numeric fields when editing the result table.
3196153: When typing using shift, you must release shift to type space
-3088572: Squirrel fails when user tries to edit DB fields which have particular characters.
-
3175871: On export to Excel, some numeric values are not exported correctly.
-SQL Scripts Plugin: Increased multi table script configuration dialog's size.
+3172465: Error connecting to DB after 3.2.1 upgrade
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.
+3137852: DB2 Plugin - The source code is not visible, if a char column contains a default value.
-Hibernate Plugin: Made HQL code completion work more exact.
+3088572: Squirrel fails when user tries to edit DB fields which have particular characters.
-Hibernate Plugin: Removed unused imports to regain compile independence from Hibernate API changes, see patch ID 3168381
-
3.2.1 (12/29/2010)
==================
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2011-07-23 00:15:20
|
Revision: 6315
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6315&view=rev
Author: manningr
Date: 2011-07-23 00:15:14 +0000 (Sat, 23 Jul 2011)
Log Message:
-----------
Bug 3172465: (Error connecting to DB after 3.2.1 upgrade) A couple more missing dependencies that prevented the SQL Validator from connecting to the mimer site.
Modified Paths:
--------------
trunk/sql12/installer/pom.xml
trunk/sql12/plugins/sqlval/pom.xml
Modified: trunk/sql12/installer/pom.xml
===================================================================
--- trunk/sql12/installer/pom.xml 2011-07-17 00:31:32 UTC (rev 6314)
+++ trunk/sql12/installer/pom.xml 2011-07-23 00:15:14 UTC (rev 6315)
@@ -102,6 +102,7 @@
<includedArtifact>commons-cli:commons-cli</includedArtifact>
<includedArtifact>commons-codec:commons-codec</includedArtifact>
<includedArtifact>commons-collections:commons-collections</includedArtifact>
+ <includedArtifact>commons-discovery:commons-discovery</includedArtifact>
<includedArtifact>commons-httpclient:commons-httpclient</includedArtifact>
<includedArtifact>commons-lang:commons-lang</includedArtifact>
<includedArtifact>commons-logging:commons-logging</includedArtifact>
Modified: trunk/sql12/plugins/sqlval/pom.xml
===================================================================
--- trunk/sql12/plugins/sqlval/pom.xml 2011-07-17 00:31:32 UTC (rev 6314)
+++ trunk/sql12/plugins/sqlval/pom.xml 2011-07-23 00:15:14 UTC (rev 6315)
@@ -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>
@@ -109,6 +110,12 @@
<artifactId>axis-wsdl4j</artifactId>
<version>1.2</version>
</dependency>
+ <dependency>
+ <groupId>commons-discovery</groupId>
+ <artifactId>commons-discovery</artifactId>
+ <version>0.2</version>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
<properties>
<pluginClassName>net.sourceforge.squirrel_sql.plugins.sqlval.SQLValidatorPlugin</pluginClassName>
@@ -118,7 +125,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>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2011-07-17 00:31:38
|
Revision: 6314
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6314&view=rev
Author: manningr
Date: 2011-07-17 00:31:32 +0000 (Sun, 17 Jul 2011)
Log Message:
-----------
Feature request # 3291501 (Scriptable command-line execution of the DBCopy plugin)
Modified Paths:
--------------
trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/DBCopyPlugin.java
trunk/sql12/plugins/dbcopy/src/main/resources/doc/changes.txt
Modified: trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/DBCopyPlugin.java
===================================================================
--- trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/DBCopyPlugin.java 2011-07-17 00:29:09 UTC (rev 6313)
+++ trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/DBCopyPlugin.java 2011-07-17 00:31:32 UTC (rev 6314)
@@ -124,7 +124,7 @@
*/
public String getVersion()
{
- return "1.14";
+ return "1.15";
}
/**
Modified: trunk/sql12/plugins/dbcopy/src/main/resources/doc/changes.txt
===================================================================
--- trunk/sql12/plugins/dbcopy/src/main/resources/doc/changes.txt 2011-07-17 00:29:09 UTC (rev 6313)
+++ trunk/sql12/plugins/dbcopy/src/main/resources/doc/changes.txt 2011-07-17 00:31:32 UTC (rev 6314)
@@ -1,6 +1,11 @@
DBCopy Change Log
=================
+1.15
+====
+ - (Feature request #3291501) This plugin now has a command-line interface (via DBCopyCLI). See
+ DBCopy plugin documentation for usage details.
+
1.14
====
- Added support for mapping the DISTINCT source column type for copying data from PostgreSQL
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2011-07-17 00:29:15
|
Revision: 6313
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6313&view=rev
Author: manningr
Date: 2011-07-17 00:29:09 +0000 (Sun, 17 Jul 2011)
Log Message:
-----------
Feature request # 3291501 (Scriptable command-line execution of the DBCopy plugin)
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-07-17 00:24:47 UTC (rev 6312)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2011-07-17 00:29:09 UTC (rev 6313)
@@ -7,11 +7,13 @@
Enhancements:
+DBCopy Plugin: (Feature request #3291501) This plugin now has a command-line interface (via DBCopyCLI). See
+ DBCopy plugin documentation for usage details.
+
Syntax Plugin:
Ostermiller and Netbeans editors were removed. Users that still used these editors are automatically
switched to the RSyntax editor.
-
MSSQL Plugin:
- Added display of triggers source code.
- If two views with same name in different schemas exist now the views' source code is
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2011-07-17 00:24:55
|
Revision: 6312
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6312&view=rev
Author: manningr
Date: 2011-07-17 00:24:47 +0000 (Sun, 17 Jul 2011)
Log Message:
-----------
Feature request # 3291501 (Scriptable command-line execution of the DBCopy plugin)
Modified Paths:
--------------
trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/CopyExecutor.java
trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/CopyProgressMonitor.java
trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/CopyScripter.java
trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/DBCopyPlugin.java
trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/SessionInfoProvider.java
trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/actions/PasteTableAction.java
trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/commands/CopyTableCommand.java
trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/util/DBUtil.java
trunk/sql12/plugins/dbcopy/src/test/java/net/sourceforge/squirrel_sql/plugins/dbcopy/DBCopyPluginTest.java
Added Paths:
-----------
trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/cli/
trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/cli/ApplicationStub.java
trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/cli/CLCopyListener.java
trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/cli/CLCopyUICallback.java
trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/cli/CommandLineArgumentProcessor.java
trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/cli/DBCopyCLI.java
trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/cli/SessionInfoProviderImpl.java
trunk/sql12/plugins/dbcopy/src/test/java/net/sourceforge/squirrel_sql/plugins/dbcopy/cli/
trunk/sql12/plugins/dbcopy/src/test/java/net/sourceforge/squirrel_sql/plugins/dbcopy/cli/CommandLineArgumentProcessorTest.java
Modified: trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/CopyExecutor.java
===================================================================
--- trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/CopyExecutor.java 2011-07-10 18:38:03 UTC (rev 6311)
+++ trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/CopyExecutor.java 2011-07-17 00:24:47 UTC (rev 6312)
@@ -30,10 +30,10 @@
import java.util.Set;
import net.sourceforge.squirrel_sql.client.session.ISession;
+import net.sourceforge.squirrel_sql.fw.dialects.CreateScriptPreferences;
import net.sourceforge.squirrel_sql.fw.dialects.DialectFactory;
import net.sourceforge.squirrel_sql.fw.dialects.DialectUtils;
import net.sourceforge.squirrel_sql.fw.dialects.UserCancelledOperationException;
-import net.sourceforge.squirrel_sql.fw.dialects.CreateScriptPreferences;
import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo;
import net.sourceforge.squirrel_sql.fw.sql.ISQLConnection;
import net.sourceforge.squirrel_sql.fw.sql.ISQLDatabaseMetaData;
@@ -42,8 +42,6 @@
import net.sourceforge.squirrel_sql.fw.sql.SQLDatabaseMetaData;
import net.sourceforge.squirrel_sql.fw.sql.SQLUtilities;
import net.sourceforge.squirrel_sql.fw.sql.TableColumnInfo;
-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.dbcopy.event.AnalysisEvent;
@@ -90,11 +88,7 @@
/** Logger for this class. */
private final static ILogger log =
LoggerController.createLogger(CopyExecutor.class);
-
- /** Internationalized strings for this class. */
- private static final StringManager s_stringMgr =
- StringManagerFactory.getStringManager(CopyExecutor.class);
-
+
/** the list of ITableInfos that represent the user's last selection. */
private ArrayList<ITableInfo> selectedTableInfos = null;
@@ -121,8 +115,8 @@
*/
public CopyExecutor(SessionInfoProvider p) {
prov = p;
- sourceSession = prov.getCopySourceSession();
- destSession = prov.getCopyDestSession();
+ sourceSession = prov.getSourceSession();
+ destSession = prov.getDestSession();
}
/**
@@ -158,17 +152,19 @@
return;
}
setupAutoCommit(destConn);
- IDatabaseObjectInfo[] sourceObjs = prov.getSourceSelectedDatabaseObjects();
+ List<IDatabaseObjectInfo> sourceObjs = prov.getSourceDatabaseObjects();
int[] counts = getTableCounts();
sendCopyStarted(counts);
- String destSchema = prov.getDestSelectedDatabaseObject().getSimpleName();
- String destCatalog = prov.getDestSelectedDatabaseObject().getCatalogName();
- for (int i = 0; i < sourceObjs.length; i++) {
- if (false == sourceObjs[i] instanceof ITableInfo) {
+ String destSchema = prov.getDestDatabaseObject().getSimpleName();
+ String destCatalog = prov.getDestDatabaseObject().getCatalogName();
+
+ int sourceObjectCount = 0;
+ for (IDatabaseObjectInfo info : sourceObjs) {
+ if (! (info instanceof ITableInfo)) {
continue;
}
- ITableInfo sourceTI = (ITableInfo)sourceObjs[i];
- sendTableCopyStarted(sourceTI, i+1);
+ ITableInfo sourceTI = (ITableInfo)info;
+ sendTableCopyStarted(sourceTI, sourceObjectCount+1);
try {
int destTableCount = DBUtil.getTableCount(destSession,
destCatalog,
@@ -199,9 +195,9 @@
}
}
- copyTable(sourceTI, counts[i]);
+ copyTable(sourceTI, counts[sourceObjectCount]);
- if (i == sourceObjs.length - 1 && !cancelled) {
+ if (sourceObjectCount == sourceObjs.size() - 1 && !cancelled) {
// We just copied the last table. Now it is safe to copy the
// constraints.(Well, that is, if all FK dependencies are met
// in the group of tables being copied.
@@ -211,7 +207,7 @@
copyConstraints(sourceObjs);
}
if (!cancelled) {
- sendTableCopyFinished(sourceTI, i+1);
+ sendTableCopyFinished(sourceTI, sourceObjectCount+1);
sleep(prefs.getTableDelayMillis());
}
} catch (SQLException e) {
@@ -230,6 +226,7 @@
sendErrorEvent(ErrorEvent.GENERIC_EXCEPTION, e);
break;
}
+ sourceObjectCount++;
}
restoreAutoCommit(destConn);
if (cancelled) {
@@ -241,9 +238,11 @@
}
end = System.currentTimeMillis();
- ISession session = prov.getCopyDestSession();
- session.getSchemaInfo().reload(prov.getDestSelectedDatabaseObject());
- session.getSchemaInfo().fireSchemaInfoUpdate();
+ ISession session = prov.getDestSession();
+ if (session.getSessionSheet() != null) {
+ session.getSchemaInfo().reload(prov.getDestDatabaseObject());
+ session.getSchemaInfo().fireSchemaInfoUpdate();
+ }
notifyCopyFinished();
}
@@ -293,8 +292,8 @@
if (!prefs.isTestColumnNames()) {
return true;
}
- if (DBUtil.sameDatabaseType(prov.getCopySourceSession(),
- prov.getCopyDestSession()))
+ if (DBUtil.sameDatabaseType(prov.getSourceSession(),
+ prov.getDestSession()))
{
// No need to check column name validity when source and dest are
// of the same type of database.
@@ -302,11 +301,13 @@
}
sendAnalysisStarted();
try {
- IDatabaseObjectInfo[] dbObjs = prov.getSourceSelectedDatabaseObjects();
- for (int tableIdx = 0; tableIdx < dbObjs.length; tableIdx++) {
- ITableInfo ti = (ITableInfo)dbObjs[tableIdx];
- sendAnalyzingTable(ti, tableIdx);
+ List<IDatabaseObjectInfo> dbObjs = prov.getSourceDatabaseObjects();
+ int sourceObjectCount = 0;
+ for (IDatabaseObjectInfo info : dbObjs) {
+ ITableInfo ti = (ITableInfo) info;
+ sendAnalyzingTable(ti, sourceObjectCount+1);
DBUtil.validateColumnNames(ti, prov);
+ sourceObjectCount++;
}
} catch (MappingException e) {
sendErrorEvent(ErrorEvent.MAPPING_EXCEPTION_TYPE, e);
@@ -362,21 +363,22 @@
private int[] getTableCounts() {
int[] result = null;
- ISession sourceSession = prov.getCopySourceSession();
- IDatabaseObjectInfo[] dbObjs = prov.getSourceSelectedDatabaseObjects();
+ ISession sourceSession = prov.getSourceSession();
+ List<IDatabaseObjectInfo> dbObjs = prov.getSourceDatabaseObjects();
if (dbObjs != null) {
- result = new int[dbObjs.length];
+ result = new int[dbObjs.size()];
selectedTableInfos = new ArrayList<ITableInfo>();
- for (int i = 0; i < dbObjs.length; i++) {
- if (false == dbObjs[i] instanceof ITableInfo) {
+ int sourceObjectCount = 0;
+ for (IDatabaseObjectInfo info : dbObjs) {
+ if (! (info instanceof ITableInfo)) {
continue;
}
try {
- ITableInfo ti = (ITableInfo) dbObjs[i];
+ ITableInfo ti = (ITableInfo) info;
selectedTableInfos.add(ti);
// This doesn't appear to work for PROGRESS RDBMS
//result[i] = DBUtil.getTableCount(con, ti.getSimpleName());
- result[i] =
+ result[sourceObjectCount] =
DBUtil.getTableCount(sourceSession,
ti.getCatalogName(),
ti.getSchemaName(),
@@ -384,8 +386,9 @@
DialectFactory.SOURCE_TYPE);
} catch (Exception e) {
log.error("",e);
- result[i] = 0;
+ result[sourceObjectCount] = 0;
}
+ sourceObjectCount++;
}
}
return result;
@@ -402,7 +405,7 @@
private void sendAnalyzingTable(ITableInfo ti, int number) {
TableEvent event = new TableEvent(prov);
- event.setTableCount(prov.getSourceSelectedDatabaseObjects().length);
+ event.setTableCount(prov.getSourceDatabaseObjects().size());
event.setTableNumber(number);
Iterator<CopyTableListener> i = listeners.iterator();
event.setTableName(ti.getSimpleName());
@@ -425,7 +428,7 @@
private void sendTableCopyStarted(ITableInfo ti, int number) {
TableEvent event = new TableEvent(prov);
event.setTableNumber(number);
- event.setTableCount(prov.getSourceSelectedDatabaseObjects().length);
+ event.setTableCount(prov.getSourceDatabaseObjects().size());
event.setTableName(ti.getSimpleName());
Iterator<CopyTableListener> i = listeners.iterator();
while (i.hasNext()) {
@@ -437,7 +440,7 @@
private void sendTableCopyFinished(ITableInfo ti, int number) {
TableEvent event = new TableEvent(prov);
event.setTableNumber(number);
- event.setTableCount(prov.getSourceSelectedDatabaseObjects().length);
+ event.setTableCount(prov.getSourceDatabaseObjects().size());
event.setTableName(ti.getSimpleName());
Iterator<CopyTableListener> i = listeners.iterator();
while (i.hasNext()) {
@@ -529,15 +532,15 @@
if (!PreferencesManager.getPreferences().isCopyData()) {
return;
}
- ISQLConnection sourceConn = prov.getCopySourceSession().getSQLConnection();
- ISQLConnection destConn = prov.getCopyDestSession().getSQLConnection();
+ ISQLConnection sourceConn = prov.getSourceSession().getSQLConnection();
+ ISQLConnection destConn = prov.getDestSession().getSQLConnection();
SQLDatabaseMetaData sourceMetaData = sourceConn.getSQLMetaData();
SQLDatabaseMetaData destMetaData = destConn.getSQLMetaData();
try {
String destSchema =
- prov.getDestSelectedDatabaseObject().getSimpleName();
+ prov.getDestDatabaseObject().getSimpleName();
ITableInfo destTableInfo =
- DBUtil.getTableInfo(prov.getCopyDestSession(),
+ DBUtil.getTableInfo(prov.getDestSession(),
destSchema,
sourceTableInfo.getSimpleName());
@@ -568,7 +571,7 @@
boolean foundLOBType = false;
// Loop through source records...
DBUtil.setLastStatement(selectSQL);
- rs = DBUtil.executeQuery(prov.getCopySourceSession(), selectSQL);
+ rs = DBUtil.executeQuery(prov.getSourceSession(), selectSQL);
DBUtil.setLastStatement(insertSQL);
boolean isMysql = DialectFactory.isMySQL(destSession.getMetaData());
boolean isSourceOracle =
@@ -589,14 +592,14 @@
int sourceColType = sourceInfos[i].getDataType();
// If source column is type 1111 (OTHER), try to use the
// column type name to find a type that isn't 1111.
- sourceColType = DBUtil.replaceOtherDataType(sourceInfos[i], prov.getCopySourceSession());
+ sourceColType = DBUtil.replaceOtherDataType(sourceInfos[i], prov.getSourceSession());
sourceColType = getDateReplacement(sourceColType,
isSourceOracle);
int destColType = destInfos[i].getDataType();
// If source column is type 1111 (OTHER), try to use the
// column type name to find a type that isn't 1111.
- destColType = DBUtil.replaceOtherDataType(destInfos[i], prov.getCopyDestSession());
+ destColType = DBUtil.replaceOtherDataType(destInfos[i], prov.getDestSession());
destColType = getDateReplacement(destColType, isDestOracle);
@@ -696,7 +699,7 @@
//source database is {1}, but column count for table {2} in
//destination database is {3}
String msg =
- s_stringMgr.getString("CopyExecutor.tablecolmismatch",
+ getMessage("CopyExecutor.tablecolmismatch",
new Object[] {
sourceTableName,
Integer.valueOf(sourceInfos.length),
@@ -756,16 +759,16 @@
* @param ti
* @throws SQLException
*/
- private void copyConstraints(IDatabaseObjectInfo[] dbObjs)
+ private void copyConstraints(List<IDatabaseObjectInfo> dbObjs)
throws SQLException, UserCancelledOperationException
{
if (!prefs.isCopyForeignKeys()
- || DialectFactory.isAxion(prov.getCopySourceSession().getMetaData())) {
+ || DialectFactory.isAxion(prov.getSourceSession().getMetaData())) {
return;
}
- ISQLConnection destConn = prov.getCopyDestSession().getSQLConnection();
- for (int i = 0; i < dbObjs.length; i++) {
- ITableInfo ti = (ITableInfo) dbObjs[i];
+ ISQLConnection destConn = prov.getDestSession().getSQLConnection();
+ for (IDatabaseObjectInfo info : dbObjs) {
+ ITableInfo ti = (ITableInfo) info;
Set<String> fkStmts =
DBUtil.getForeignKeySQL(prov, ti, selectedTableInfos);
Iterator<String> it = fkStmts.iterator();
@@ -788,7 +791,7 @@
if (cancelled) {
return;
}
- ISQLConnection destCon = prov.getCopyDestSession().getSQLConnection();
+ ISQLConnection destCon = prov.getDestSession().getSQLConnection();
String createTableSql = DBUtil.getCreateTableSql(prov, ti);
DBUtil.executeUpdate(destCon, createTableSql, true);
Modified: trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/CopyProgressMonitor.java
===================================================================
--- trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/CopyProgressMonitor.java 2011-07-10 18:38:03 UTC (rev 6311)
+++ trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/CopyProgressMonitor.java 2011-07-17 00:24:47 UTC (rev 6312)
@@ -82,7 +82,7 @@
public CopyProgressMonitor(SessionInfoProvider provider) {
prov = provider;
- parent = prov.getCopyDestSession().getApplication().getMainFrame();
+ parent = prov.getDestSession().getApplication().getMainFrame();
}
// CopyTableListener interface methods
@@ -95,7 +95,7 @@
pm.setProgress(pm.getMaximum());
}
prov = e.getSessionInfoProvider();
- int numTables = prov.getSourceSelectedDatabaseObjects().length;
+ int numTables = prov.getSourceDatabaseObjects().size();
int[] tableCounts = e.getTableCounts();
createProgressDialog();
@@ -459,7 +459,7 @@
pm.setProgress(e.getTableNumber());
}
- /* (non-Javadoc)
+ /**
* @see net.sourceforge.squirrel_sql.plugins.dbcopy.event.CopyTableListener#tableAnalysisStarted(net.sourceforge.squirrel_sql.plugins.dbcopy.event.AnalysisEvent)
*/
public void tableAnalysisStarted(AnalysisEvent e) {
@@ -469,7 +469,7 @@
"Analyzing column names in tables to be copied",
"",
0,
- prov.getSourceSelectedDatabaseObjects().length);
+ prov.getSourceDatabaseObjects().size());
}
Modified: trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/CopyScripter.java
===================================================================
--- trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/CopyScripter.java 2011-07-10 18:38:03 UTC (rev 6311)
+++ trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/CopyScripter.java 2011-07-17 00:24:47 UTC (rev 6312)
@@ -63,8 +63,8 @@
* @param prov
*/
private void initializeScript(SessionInfoProvider prov) {
- ISession source = prov.getCopySourceSession();
- ISession dest = prov.getCopyDestSession();
+ ISession source = prov.getSourceSession();
+ ISession dest = prov.getDestSession();
ScriptWriter.open(source,dest);
}
Modified: trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/DBCopyPlugin.java
===================================================================
--- trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/DBCopyPlugin.java 2011-07-10 18:38:03 UTC (rev 6311)
+++ trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/DBCopyPlugin.java 2011-07-17 00:24:47 UTC (rev 6312)
@@ -19,6 +19,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+import java.util.List;
+
import javax.swing.SwingUtilities;
import net.sourceforge.squirrel_sql.client.IApplication;
@@ -58,7 +60,7 @@
private ISession copyDestSession = null;
- private IDatabaseObjectInfo[] selectedDatabaseObjects = null;
+ private List<IDatabaseObjectInfo> selectedDatabaseObjects = null;
private IDatabaseObjectInfo selectedDestDatabaseObject = null;
@@ -172,9 +174,9 @@
IApplication app = getApplication();
ActionCollection coll = app.getActionCollection();
-
+
PasteTableAction pasteTableAction = new PasteTableAction(app, _resources, this);
-
+
coll.add(new CopyTableAction(app, _resources, this));
coll.add(pasteTableAction);
@@ -226,16 +228,18 @@
* @param selectedDatabaseObjects
* The selectedDatabaseObjects to set.
*/
- public void setSelectedDatabaseObjects(IDatabaseObjectInfo[] dbObjArr)
+ public void setSourceDatabaseObjects(List<IDatabaseObjectInfo> dbObjList)
{
- if (dbObjArr != null)
+ if (dbObjList != null)
{
- selectedDatabaseObjects = dbObjArr;
- for (int i = 0; i < dbObjArr.length; i++)
+ selectedDatabaseObjects = dbObjList;
+ int sourceObjectCount = 0;
+ if (s_log.isDebugEnabled())
{
- if (s_log.isDebugEnabled())
+ for (IDatabaseObjectInfo info : dbObjList)
{
- s_log.debug("setSelectedDatabaseObjects: IDatabaseObjectInfo[" + i + "]=" + dbObjArr[i]);
+ s_log.debug("setSelectedDatabaseObjects: IDatabaseObjectInfo[" + (sourceObjectCount++) + "]="
+ + info);
}
}
}
@@ -304,17 +308,17 @@
}
/**
- * @see net.sourceforge.squirrel_sql.plugins.dbcopy.SessionInfoProvider#getCopySourceSession()
+ * @see net.sourceforge.squirrel_sql.plugins.dbcopy.SessionInfoProvider#getSourceSession()
*/
- public ISession getCopySourceSession()
+ public ISession getSourceSession()
{
return copySourceSession;
}
/**
- * @see net.sourceforge.squirrel_sql.plugins.dbcopy.SessionInfoProvider#setCopySourceSession(net.sourceforge.squirrel_sql.client.session.ISession)
+ * @see net.sourceforge.squirrel_sql.plugins.dbcopy.SessionInfoProvider#setSourceSession(net.sourceforge.squirrel_sql.client.session.ISession)
*/
- public void setCopySourceSession(ISession session)
+ public void setSourceSession(ISession session)
{
if (session != null)
{
@@ -323,41 +327,41 @@
}
/**
- * @see net.sourceforge.squirrel_sql.plugins.dbcopy.SessionInfoProvider#getSourceSelectedDatabaseObjects()
+ * @see net.sourceforge.squirrel_sql.plugins.dbcopy.SessionInfoProvider#getSourceDatabaseObjects()
*/
- public IDatabaseObjectInfo[] getSourceSelectedDatabaseObjects()
+ public List<IDatabaseObjectInfo> getSourceDatabaseObjects()
{
return selectedDatabaseObjects;
}
/**
- * @see net.sourceforge.squirrel_sql.plugins.dbcopy.SessionInfoProvider#getCopyDestSession()
+ * @see net.sourceforge.squirrel_sql.plugins.dbcopy.SessionInfoProvider#getDestSession()
*/
- public ISession getCopyDestSession()
+ public ISession getDestSession()
{
return copyDestSession;
}
/**
- * @see net.sourceforge.squirrel_sql.plugins.dbcopy.SessionInfoProvider#setDestCopySession(net.sourceforge.squirrel_sql.client.session.ISession)
+ * @see net.sourceforge.squirrel_sql.plugins.dbcopy.SessionInfoProvider#setDestSession(net.sourceforge.squirrel_sql.client.session.ISession)
*/
- public void setDestCopySession(ISession session)
+ public void setDestSession(ISession session)
{
copyDestSession = session;
}
/**
- * @see net.sourceforge.squirrel_sql.plugins.dbcopy.SessionInfoProvider#getDestSelectedDatabaseObject()
+ * @see net.sourceforge.squirrel_sql.plugins.dbcopy.SessionInfoProvider#getDestDatabaseObject()
*/
- public IDatabaseObjectInfo getDestSelectedDatabaseObject()
+ public IDatabaseObjectInfo getDestDatabaseObject()
{
return selectedDestDatabaseObject;
}
/**
- * @see net.sourceforge.squirrel_sql.plugins.dbcopy.SessionInfoProvider#setDestSelectedDatabaseObject(net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo)
+ * @see net.sourceforge.squirrel_sql.plugins.dbcopy.SessionInfoProvider#setDestDatabaseObject(net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo)
*/
- public void setDestSelectedDatabaseObject(IDatabaseObjectInfo info)
+ public void setDestDatabaseObject(IDatabaseObjectInfo info)
{
selectedDestDatabaseObject = info;
}
Modified: trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/SessionInfoProvider.java
===================================================================
--- trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/SessionInfoProvider.java 2011-07-10 18:38:03 UTC (rev 6311)
+++ trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/SessionInfoProvider.java 2011-07-17 00:24:47 UTC (rev 6312)
@@ -18,6 +18,8 @@
*/
package net.sourceforge.squirrel_sql.plugins.dbcopy;
+import java.util.List;
+
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo;
@@ -27,17 +29,19 @@
*/
public interface SessionInfoProvider {
- public void setCopySourceSession(ISession session);
+ public void setSourceSession(ISession session);
- public ISession getCopySourceSession();
+ public ISession getSourceSession();
- public IDatabaseObjectInfo[] getSourceSelectedDatabaseObjects();
+ public void setSourceDatabaseObjects(List<IDatabaseObjectInfo> dbObjList);
- public IDatabaseObjectInfo getDestSelectedDatabaseObject();
+ public List<IDatabaseObjectInfo> getSourceDatabaseObjects();
- public void setDestSelectedDatabaseObject(IDatabaseObjectInfo info);
+ public IDatabaseObjectInfo getDestDatabaseObject();
- public void setDestCopySession(ISession session);
+ public void setDestDatabaseObject(IDatabaseObjectInfo info);
- public ISession getCopyDestSession();
+ public void setDestSession(ISession session);
+
+ public ISession getDestSession();
}
Modified: trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/actions/PasteTableAction.java
===================================================================
--- trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/actions/PasteTableAction.java 2011-07-10 18:38:03 UTC (rev 6311)
+++ trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/actions/PasteTableAction.java 2011-07-17 00:24:47 UTC (rev 6312)
@@ -78,7 +78,7 @@
* @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
*/
public void actionPerformed(ActionEvent evt) {
- ISession destSession = sessionInfoProv.getCopyDestSession();
+ ISession destSession = sessionInfoProv.getDestSession();
IObjectTreeAPI api =
destSession.getObjectTreeAPIOfActiveSessionWindow();
if (api == null) {
@@ -86,7 +86,7 @@
}
IDatabaseObjectInfo[] dbObjs = api.getSelectedDatabaseObjects();
if (dbObjs.length > 1) {
- sessionInfoProv.setDestSelectedDatabaseObject(null);
+ sessionInfoProv.setDestDatabaseObject(null);
//i18n[PasteTableAction.error.multischemapaste=The paste
//operation may only be applied to one schema at a time]
String msg =
@@ -110,16 +110,16 @@
tableLabelInfo.getSchemaName(),
DatabaseObjectType.SCHEMA,
md);
- sessionInfoProv.setDestSelectedDatabaseObject(schema);
+ sessionInfoProv.setDestDatabaseObject(schema);
} else {
- sessionInfoProv.setDestSelectedDatabaseObject(dbObjs[0]);
+ sessionInfoProv.setDestDatabaseObject(dbObjs[0]);
}
}
try {
IDatabaseObjectInfo info
- = sessionInfoProv.getDestSelectedDatabaseObject();
+ = sessionInfoProv.getDestDatabaseObject();
if (info == null || destSession == null) {
return;
}
@@ -129,7 +129,7 @@
} catch (UserCancelledOperationException e) {
return;
}
- if (sessionInfoProv.getCopySourceSession() == null) {
+ if (sessionInfoProv.getSourceSession() == null) {
return;
}
if (!sourceDestSchemasDiffer()) {
@@ -147,7 +147,7 @@
* @param session The current session.
*/
public void setSession(ISession session) {
- sessionInfoProv.setDestCopySession(session);
+ sessionInfoProv.setDestSession(session);
}
/**
Added: trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/cli/ApplicationStub.java
===================================================================
--- trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/cli/ApplicationStub.java (rev 0)
+++ trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/cli/ApplicationStub.java 2011-07-17 00:24:47 UTC (rev 6312)
@@ -0,0 +1,262 @@
+package net.sourceforge.squirrel_sql.plugins.dbcopy.cli;
+
+import javax.swing.Action;
+import javax.swing.JComponent;
+import javax.swing.JMenu;
+
+import net.sourceforge.squirrel_sql.client.ApplicationListener;
+import net.sourceforge.squirrel_sql.client.FontInfoStore;
+import net.sourceforge.squirrel_sql.client.IApplication;
+import net.sourceforge.squirrel_sql.client.action.ActionCollection;
+import net.sourceforge.squirrel_sql.client.gui.WindowManager;
+import net.sourceforge.squirrel_sql.client.gui.db.DataCache;
+import net.sourceforge.squirrel_sql.client.gui.desktopcontainer.DesktopStyle;
+import net.sourceforge.squirrel_sql.client.gui.mainframe.MainFrame;
+import net.sourceforge.squirrel_sql.client.plugin.IPlugin;
+import net.sourceforge.squirrel_sql.client.plugin.IPluginManager;
+import net.sourceforge.squirrel_sql.client.preferences.PreferenceType;
+import net.sourceforge.squirrel_sql.client.preferences.SquirrelPreferences;
+import net.sourceforge.squirrel_sql.client.resources.SquirrelResources;
+import net.sourceforge.squirrel_sql.client.session.ISQLEntryPanelFactory;
+import net.sourceforge.squirrel_sql.client.session.SessionManager;
+import net.sourceforge.squirrel_sql.client.session.mainpanel.SQLHistory;
+import net.sourceforge.squirrel_sql.fw.gui.action.wikiTable.IWikiTableConfigurationFactory;
+import net.sourceforge.squirrel_sql.fw.sql.SQLDriverManager;
+import net.sourceforge.squirrel_sql.fw.util.IMessageHandler;
+import net.sourceforge.squirrel_sql.fw.util.TaskThreadPool;
+
+public class ApplicationStub implements IApplication
+{
+
+ private SessionManager sessionManager = null;
+
+ private SquirrelPreferences squirrelPreferences = new SquirrelPreferences();
+
+ private TaskThreadPool threadPool = new TaskThreadPool();
+
+ public ApplicationStub()
+ {
+ sessionManager = new SessionManager(this);
+ }
+
+ @Override
+ public void addApplicationListener(ApplicationListener l)
+ {
+ throw new UnsupportedOperationException();
+
+ }
+
+ @Override
+ public void addToMenu(int menuId, JMenu menu)
+ {
+ throw new UnsupportedOperationException();
+
+ }
+
+ @Override
+ public void addToMenu(int menuId, Action action)
+ {
+ throw new UnsupportedOperationException();
+
+ }
+
+ @Override
+ public void addToStatusBar(JComponent comp)
+ {
+ throw new UnsupportedOperationException();
+
+ }
+
+ @Override
+ public ActionCollection getActionCollection()
+ {
+
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public DataCache getDataCache()
+ {
+
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public DesktopStyle getDesktopStyle()
+ {
+
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public IPlugin getDummyAppPlugin()
+ {
+
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public FontInfoStore getFontInfoStore()
+ {
+
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public MainFrame getMainFrame()
+ {
+ return null;
+ }
+
+ @Override
+ public IMessageHandler getMessageHandler()
+ {
+
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public IPluginManager getPluginManager()
+ {
+
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public SquirrelResources getResources()
+ {
+
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public SQLDriverManager getSQLDriverManager()
+ {
+
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public ISQLEntryPanelFactory getSQLEntryPanelFactory()
+ {
+
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public SQLHistory getSQLHistory()
+ {
+
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public SessionManager getSessionManager()
+ {
+ return sessionManager;
+ }
+
+ @Override
+ public SquirrelPreferences getSquirrelPreferences()
+ {
+ return squirrelPreferences;
+ }
+
+ @Override
+ public TaskThreadPool getThreadPool()
+ {
+ return threadPool;
+ }
+
+ @Override
+ public IWikiTableConfigurationFactory getWikiTableConfigFactory()
+ {
+
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public WindowManager getWindowManager()
+ {
+
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public void openURL(String url)
+ {
+ throw new UnsupportedOperationException();
+
+ }
+
+ @Override
+ public void removeApplicationListener(ApplicationListener l)
+ {
+ throw new UnsupportedOperationException();
+
+ }
+
+ @Override
+ public void removeFromStatusBar(JComponent comp)
+ {
+ throw new UnsupportedOperationException();
+
+ }
+
+ @Override
+ public void saveApplicationState()
+ {
+ throw new UnsupportedOperationException();
+
+ }
+
+ @Override
+ public void savePreferences(PreferenceType preferenceType)
+ {
+ throw new UnsupportedOperationException();
+
+ }
+
+ @Override
+ public void setSQLEntryPanelFactory(ISQLEntryPanelFactory factory)
+ {
+ throw new UnsupportedOperationException();
+
+ }
+
+ @Override
+ public void showErrorDialog(String msg)
+ {
+ throw new UnsupportedOperationException();
+
+ }
+
+ @Override
+ public void showErrorDialog(Throwable th)
+ {
+ throw new UnsupportedOperationException();
+
+ }
+
+ @Override
+ public void showErrorDialog(String msg, Throwable th)
+ {
+ throw new UnsupportedOperationException();
+
+ }
+
+ @Override
+ public boolean shutdown(boolean updateLaunchScript)
+ {
+
+ return false;
+ }
+
+ @Override
+ public void startup()
+ {
+ throw new UnsupportedOperationException();
+
+ }
+
+}
Added: trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/cli/CLCopyListener.java
===================================================================
--- trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/cli/CLCopyListener.java (rev 0)
+++ trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/cli/CLCopyListener.java 2011-07-17 00:24:47 UTC (rev 6312)
@@ -0,0 +1,83 @@
+package net.sourceforge.squirrel_sql.plugins.dbcopy.cli;
+
+import net.sourceforge.squirrel_sql.plugins.dbcopy.event.AnalysisEvent;
+import net.sourceforge.squirrel_sql.plugins.dbcopy.event.CopyEvent;
+import net.sourceforge.squirrel_sql.plugins.dbcopy.event.CopyTableListener;
+import net.sourceforge.squirrel_sql.plugins.dbcopy.event.ErrorEvent;
+import net.sourceforge.squirrel_sql.plugins.dbcopy.event.RecordEvent;
+import net.sourceforge.squirrel_sql.plugins.dbcopy.event.StatementEvent;
+import net.sourceforge.squirrel_sql.plugins.dbcopy.event.TableEvent;
+
+public class CLCopyListener implements CopyTableListener
+{
+
+ private boolean copyFinished = false;
+
+ public boolean isCopyFinished() {
+ return copyFinished;
+ }
+
+ @Override
+ public void analyzingTable(TableEvent e)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void copyFinished(int seconds)
+ {
+ copyFinished = true;
+ }
+
+ @Override
+ public void copyStarted(CopyEvent e)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void handleError(ErrorEvent e)
+ {
+ System.err.println("Encountered the following exception: "+e.getException().getMessage());
+ e.getException().printStackTrace();
+ copyFinished = true;
+ }
+
+ @Override
+ public void recordCopied(RecordEvent e)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void statementExecuted(StatementEvent e)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void tableAnalysisStarted(AnalysisEvent e)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void tableCopyFinished(TableEvent e)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void tableCopyStarted(TableEvent e)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+}
Added: trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/cli/CLCopyUICallback.java
===================================================================
--- trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/cli/CLCopyUICallback.java (rev 0)
+++ trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/cli/CLCopyUICallback.java 2011-07-17 00:24:47 UTC (rev 6312)
@@ -0,0 +1,21 @@
+package net.sourceforge.squirrel_sql.plugins.dbcopy.cli;
+
+import net.sourceforge.squirrel_sql.fw.dialects.UserCancelledOperationException;
+import net.sourceforge.squirrel_sql.plugins.dbcopy.UICallbacks;
+
+public class CLCopyUICallback implements UICallbacks
+{
+
+ @Override
+ public boolean appendRecordsToExisting(String tableName) throws UserCancelledOperationException
+ {
+ return false;
+ }
+
+ @Override
+ public boolean deleteTableData(String tableName) throws UserCancelledOperationException
+ {
+ return true;
+ }
+
+}
Added: trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/cli/CommandLineArgumentProcessor.java
===================================================================
--- trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/cli/CommandLineArgumentProcessor.java (rev 0)
+++ trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/cli/CommandLineArgumentProcessor.java 2011-07-17 00:24:47 UTC (rev 6312)
@@ -0,0 +1,192 @@
+package net.sourceforge.squirrel_sql.plugins.dbcopy.cli;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.CommandLineParser;
+import org.apache.commons.cli.GnuParser;
+import org.apache.commons.cli.HelpFormatter;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.OptionBuilder;
+import org.apache.commons.cli.OptionGroup;
+import org.apache.commons.cli.Options;
+import org.apache.commons.cli.ParseException;
+
+/**
+ * Class that processes arguments that are specific to the DBCopy command-line.
+ */
+public class CommandLineArgumentProcessor
+{
+ public static final String SOURCE_CATALOG = "source-catalog";
+
+ public static final String SOURCE_SCHEMA = "source-schema";
+
+ public static final String DEST_CATALOG = "dest-catalog";
+
+ public static final String DEST_SCHEMA = "dest-schema";
+
+ public static final String TABLE_PATTERN = "table-pattern";
+
+ public static final String TABLE_LIST = "table-list";
+
+ public static final String DEST_SESSION = "dest-alias";
+
+ public static final String SOURCE_SESSION = "source-alias";
+
+ private Options options = new Options();
+
+ private CommandLine cmd = null;
+
+ private boolean valid = true;
+
+ public CommandLineArgumentProcessor(String[] args) throws ParseException
+ {
+ createOptions();
+ CommandLineParser parser = new GnuParser();
+ try {
+ cmd = parser.parse(options, args);
+ } catch (Exception e) {
+ HelpFormatter formatter = new HelpFormatter();
+ System.out.println(e.getMessage());
+ formatter.printHelp("DBCopyCLI", options, true);
+ valid = false;
+ }
+ }
+
+ @SuppressWarnings("static-access")
+ private void createOptions()
+ {
+ Option sourceOption =
+ OptionBuilder.hasArg().isRequired().withLongOpt(SOURCE_SESSION).withDescription(
+ "The name of the source alias to copy tables from").create();
+ options.addOption(sourceOption);
+
+ Option destOption =
+ OptionBuilder.hasArg().isRequired().withLongOpt(DEST_SESSION).withDescription(
+ "The name of the destination alias to copy tables to").create();
+ options.addOption(destOption);
+
+ Option sourceSchemaOption =
+ OptionBuilder.hasArg().withLongOpt(SOURCE_SCHEMA).withDescription(
+ "The source schema to copy tables from").create();
+
+ Option sourceCatalogOption =
+ OptionBuilder.hasArg().withLongOpt(SOURCE_CATALOG).withDescription(
+ "The source catalog to copy tables from").create();
+
+ OptionGroup sourceSchemaGroup = new OptionGroup();
+ sourceSchemaGroup.setRequired(true);
+ sourceSchemaGroup.addOption(sourceSchemaOption);
+ sourceSchemaGroup.addOption(sourceCatalogOption);
+
+ options.addOptionGroup(sourceSchemaGroup);
+
+ Option listOption =
+ OptionBuilder.hasArg().withLongOpt(TABLE_LIST).withDescription(
+ "A comma-delimited list of tables to copy").create();
+ Option patternOption =
+ OptionBuilder.hasArg().withLongOpt(TABLE_PATTERN).withDescription(
+ "A regexp pattern to match source table names").create();
+
+ OptionGroup tableGroup = new OptionGroup();
+ tableGroup.setRequired(true);
+ tableGroup.addOption(listOption);
+ tableGroup.addOption(patternOption);
+
+ options.addOptionGroup(tableGroup);
+
+ Option destSchemaOption =
+ OptionBuilder.hasArg().withLongOpt(DEST_SCHEMA).withDescription(
+ "The destination schema to copy tables into").create();
+
+ Option destCatalogOption =
+ OptionBuilder.hasArg().withLongOpt(DEST_CATALOG).withDescription(
+ "The destination catalog to copy tables into").create();
+
+ OptionGroup destSchemaGroup = new OptionGroup();
+ destSchemaGroup.setRequired(true);
+ destSchemaGroup.addOption(destSchemaOption);
+ destSchemaGroup.addOption(destCatalogOption);
+
+ options.addOptionGroup(destSchemaGroup);
+
+
+ }
+
+ public boolean isValid() {
+ return valid;
+ }
+
+ public void validate()
+ {
+ try
+ {
+ if (!cmd.hasOption(SOURCE_SESSION))
+ {
+ throw new ParseException("Missing " + SOURCE_SESSION);
+ }
+ if (!cmd.hasOption(DEST_SESSION))
+ {
+ throw new ParseException("Missing " + DEST_SESSION);
+ }
+ if (!cmd.hasOption(TABLE_LIST) && !cmd.hasOption(TABLE_PATTERN))
+ {
+ throw new ParseException("Must specify either " + TABLE_LIST + " or " + TABLE_PATTERN);
+ }
+ if (!cmd.hasOption(DEST_SCHEMA))
+ {
+ throw new ParseException("Missing " + DEST_SCHEMA);
+ }
+ }
+ catch (ParseException e)
+ {
+ HelpFormatter formatter = new HelpFormatter();
+ System.out.println(e.getMessage());
+ formatter.printHelp("DBCopyCLI", options, true);
+ System.exit(1);
+
+ }
+ }
+
+ public String getSourceAliasName() {
+ return cmd.getOptionValue(SOURCE_SESSION);
+ }
+
+ public String getDestAliasName() {
+ return cmd.getOptionValue(DEST_SESSION);
+ }
+
+ public String getDestSchemaName() {
+ return cmd.getOptionValue(DEST_SCHEMA);
+ }
+
+ public String getDestCatalogName() {
+ return cmd.getOptionValue(DEST_CATALOG);
+ }
+
+ public String getSourceCatalogName() {
+ return cmd.getOptionValue(SOURCE_CATALOG);
+ }
+
+ public String getSourceSchemaName() {
+ return cmd.getOptionValue(SOURCE_SCHEMA);
+ }
+
+ public List<String> getTableList() {
+ List<String> result = new ArrayList<String>();
+ if (cmd.hasOption(TABLE_LIST)) {
+ String tableListStr = cmd.getOptionValue(TABLE_LIST);
+ if (tableListStr.contains(",")) {
+ String[] parts = tableListStr.split(",");
+ for (String part : parts) {
+ result.add(part);
+ }
+ } else {
+ result.add(tableListStr);
+ }
+ }
+ // TODO: add support for regular expression.
+ return result;
+ }
+}
Added: trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/cli/DBCopyCLI.java
===================================================================
--- trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/cli/DBCopyCLI.java (rev 0)
+++ trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/cli/DBCopyCLI.java 2011-07-17 00:24:47 UTC (rev 6312)
@@ -0,0 +1,168 @@
+package net.sourceforge.squirrel_sql.plugins.dbcopy.cli;
+
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Iterator;
+
+import org.apache.commons.cli.HelpFormatter;
+import org.apache.commons.cli.ParseException;
+import org.apache.commons.lang.StringUtils;
+
+import net.sourceforge.squirrel_sql.client.IApplication;
+import net.sourceforge.squirrel_sql.client.gui.db.DataCache;
+import net.sourceforge.squirrel_sql.client.gui.db.SQLAlias;
+import net.sourceforge.squirrel_sql.client.resources.SquirrelResources;
+import net.sourceforge.squirrel_sql.client.session.ISession;
+import net.sourceforge.squirrel_sql.client.session.SessionManager;
+import net.sourceforge.squirrel_sql.client.util.ApplicationFiles;
+import net.sourceforge.squirrel_sql.fw.dialects.DialectFactory;
+import net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectInfo;
+import net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectType;
+import net.sourceforge.squirrel_sql.fw.sql.ISQLAlias;
+import net.sourceforge.squirrel_sql.fw.sql.ISQLDatabaseMetaData;
+import net.sourceforge.squirrel_sql.fw.sql.ISQLDriver;
+import net.sourceforge.squirrel_sql.fw.sql.ITableInfo;
+import net.sourceforge.squirrel_sql.fw.sql.SQLConnection;
+import net.sourceforge.squirrel_sql.fw.sql.SQLDriverManager;
+import net.sourceforge.squirrel_sql.fw.sql.TableInfo;
+import net.sourceforge.squirrel_sql.fw.util.StringUtilities;
+import net.sourceforge.squirrel_sql.fw.util.Utilities;
+import net.sourceforge.squirrel_sql.plugins.dbcopy.CopyExecutor;
+import net.sourceforge.squirrel_sql.plugins.dbcopy.DBCopyPlugin;
+import net.sourceforge.squirrel_sql.plugins.dbcopy.SessionInfoProvider;
+import net.sourceforge.squirrel_sql.plugins.dbcopy.event.CopyTableListener;
+import net.sourceforge.squirrel_sql.plugins.dbcopy.prefs.PreferencesManager;
+import net.sourceforge.squirrel_sql.plugins.dbcopy.util.DBUtil;
+
+/*
+ * 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
+ */
+
+public class DBCopyCLI
+{
+ private static IApplication applicationStub = new ApplicationStub();
+
+ private static ApplicationFiles applicationFiles = new ApplicationFiles();
+
+ private static SquirrelResources squirrelResources =
+ new SquirrelResources(SquirrelResources.BUNDLE_BASE_NAME);
+
+ private static SQLDriverManager sqlDriverManager = new SQLDriverManager();
+
+ private static DataCache dataCache = null;
+
+ private static ISession sourceSession = null;
+
+ // private static ISession destSession = null;
+
+ private static SessionInfoProvider sessionInfoProvider = new SessionInfoProviderImpl();
+
+ private static ArrayList<ITableInfo> tables = new ArrayList<ITableInfo>();
+
+ private static CLCopyListener listener = new CLCopyListener();
+
+ /**
+ * @param args
+ */
+ public static void main(String[] args) throws Exception
+ {
+ CommandLineArgumentProcessor argProcessor = new CommandLineArgumentProcessor(args);
+ String sourceSchemaName = argProcessor.getSourceSchemaName();
+ String sourceCatalogName = argProcessor.getSourceCatalogName();
+ String destSchemaName = argProcessor.getDestSchemaName();
+ String destCatalogName = argProcessor.getDestCatalogName();
+ String simpleName = StringUtils.isEmpty(destSchemaName) ? destCatalogName : destSchemaName;
+
+ dataCache =
+ new DataCache(sqlDriverManager, applicationFiles.getDatabaseDriversFile(),
+ applicationFiles.getDatabaseAliasesFile(), squirrelResources.getDefaultDriversUrl(),
+ applicationStub);
+
+ ISession destSession = getSessionForAlias(argProcessor.getDestAliasName());
+
+ sessionInfoProvider.setSourceSession(getSessionForAlias(argProcessor.getSourceAliasName()));
+ sessionInfoProvider.setDestSession(destSession);
+ for (String tableStr : argProcessor.getTableList())
+ {
+ tables.add(getTableInfo(sessionInfoProvider.getSourceSession(), sourceSchemaName, sourceCatalogName,
+ tableStr));
+ }
+
+ sessionInfoProvider.setSourceDatabaseObjects(DBUtil.convertTableToObjectList(tables));
+
+ DatabaseObjectInfo destObject =
+ new DatabaseObjectInfo(destCatalogName, destSchemaName, simpleName, DatabaseObjectType.SCHEMA,
+ destSession.getMetaData());
+ sessionInfoProvider.setDestDatabaseObject(destObject);
+
+ PreferencesManager.initialize(new DBCopyPlugin());
+ DBUtil.setPreferences(PreferencesManager.getPreferences());
+ DialectFactory.isPromptForDialect = false;
+
+ CopyExecutor executor = new CopyExecutor(sessionInfoProvider);
+ executor.addListener(listener);
+ executor.setPref(new CLCopyUICallback());
+ executor.execute();
+
+ while (!listener.isCopyFinished()) {
+ System.out.print(".");
+ Thread.sleep(2000);
+ }
+
+ }
+
+ private static ITableInfo getTableInfo(ISession session, String schemaName, String catalogName,
+ String tableName) throws SQLException
+ {
+ ISQLDatabaseMetaData md = session.getMetaData();
+ ITableInfo[] result = md.getTables(catalogName, schemaName, tableName, new String[] { "TABLE" }, null);
+ return result[0];
+ }
+
+ private static ISession getSessionForAlias(String alias) throws Exception
+ {
+ Iterator<ISQLAlias> i = dataCache.aliases();
+
+ while (i.hasNext())
+ {
+ ISQLAlias sqlAlias = i.next();
+ if (alias.equals(sqlAlias.getName()))
+ {
+
+ ISQLDriver sqlDriver = dataCache.getDriver(sqlAlias.getDriverIdentifier());
+ sqlDriverManager.registerSQLDriver(sqlDriver);
+ SQLConnection conn =
+ sqlDriverManager.getConnection(sqlDriver, sqlAlias, sqlAlias.getUserName(),
+ sqlAlias.getPassword(), sqlAlias.getDriverPropertiesClone());
+
+ // Class.forName(driver.getDriverClassName());
+
+ // Connection con =
+ // DriverManager.getConnection(sqlAlias.getUrl(), sqlAlias.getUserName(), sqlAlias.getPassword());
+
+ // SQLConnection conn = new SQLConnection(con, sqlAlias.getDriverPropertiesClone(), driver);
+ SessionManager sessionManager = applicationStub.getSessionManager();
+ ISession result =
+ sessionManager.createSession(applicationStub, sqlDriver, (SQLAlias) sqlAlias, conn,
+ sqlAlias.getUserName(), sqlAlias.getPassword());
+ return result;
+ }
+ }
+ throw new RuntimeException("Alias (" + alias + ") was not found");
+ }
+}
Added: trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/cli/SessionInfoProviderImpl.java
===================================================================
--- trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/cli/SessionInfoProviderImpl.java (rev 0)
+++ trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/cli/SessionInfoProviderImpl.java 2011-07-17 00:24:47 UTC (rev 6312)
@@ -0,0 +1,67 @@
+package net.sourceforge.squirrel_sql.plugins.dbcopy.cli;
+
+import java.util.List;
+
+import net.sourceforge.squirrel_sql.client.session.ISession;
+import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo;
+import net.sourceforge.squirrel_sql.plugins.dbcopy.SessionInfoProvider;
+
+public class SessionInfoProviderImpl implements SessionInfoProvider
+{
+
+ private ISession sourceSession = null;
+ private ISession destSession = null;
+ private IDatabaseObjectInfo destSelectedDatabaseObject = null;
+ private List<IDatabaseObjectInfo> sourceSelectedDatabaseObjects = null;
+
+
+
+ @Override
+ public ISession getDestSession()
+ {
+ return destSession;
+ }
+
+ @Override
+ public ISession getSourceSession()
+ {
+ return sourceSession;
+ }
+
+ @Override
+ public IDatabaseObjectInfo getDestDatabaseObject()
+ {
+ return destSelectedDatabaseObject;
+ }
+
+ @Override
+ public List<IDatabaseObjectInfo> getSourceDatabaseObjects()
+ {
+ return sourceSelectedDatabaseObjects;
+ }
+
+ @Override
+ public void setSourceSession(ISession session)
+ {
+ this.sourceSession = session;
+ }
+
+ @Override
+ public void setDestSession(ISession session)
+ {
+ this.destSession = session;
+ }
+
+ @Override
+ public void setDestDatabaseObject(IDatabaseObjectInfo info)
+ {
+ this.destSelectedDatabaseObject = info;
+ }
+
+ @Override
+ public void setSourceDatabaseObjects(List<IDatabaseObjectInfo> dbObjList)
+ {
+ this.sourceSelectedDatabaseObjects = dbObjList;
+ }
+
+}
Modified: trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/commands/CopyTableCommand.java
===================================================================
--- trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/commands/CopyTableCommand.java 2011-07-10 18:38:03 UTC (rev 6311)
+++ trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/commands/CopyTableCommand.java 2011-07-17 00:24:47 UTC (rev 6312)
@@ -23,6 +23,9 @@
import java.util.ArrayList;
import java.util.List;
+import org.apache.commons.collections.CollectionUtils;
+import org.jboss.util.collection.CollectionsUtil;
+
import net.sourceforge.squirrel_sql.client.gui.IProgressCallBackFactory;
import net.sourceforge.squirrel_sql.client.gui.ProgressCallBackFactory;
import net.sourceforge.squirrel_sql.client.session.IObjectTreeAPI;
@@ -117,7 +120,7 @@
}
}
- _plugin.setCopySourceSession(_session);
+ _plugin.setSourceSession(_session);
final IDatabaseObjectInfo[] fdbObjs = dbObjs;
final SQLDatabaseMetaData md = _session.getSQLConnection().getSQLMetaData();
_session.getApplication().getThreadPool().addTask(new Runnable()
@@ -141,16 +144,11 @@
private void getInsertionOrder(IDatabaseObjectInfo[] dbObjs, SQLDatabaseMetaData md) throws SQLException
{
-
+ List<ITableInfo> selectedTables = DBUtil.convertObjectArrayToTableList(dbObjs);
+
// Only concerned about order when more than one table.
- if (dbObjs.length > 1)
+ if (selectedTables.size() > 1)
{
- List<ITableInfo> selectedTables = new ArrayList<ITableInfo>();
- for (int i = 0; i < dbObjs.length; i++)
- {
- selectedTables.add((ITableInfo) dbObjs[i]);
- }
-
ProgressCallBack cb =
progressCallBackFactory.create(_session.getApplication().getMainFrame(),
i18n.PROGRESS_DIALOG_TITLE, dbObjs.length);
@@ -159,15 +157,13 @@
selectedTables = SQLUtilities.getInsertionOrder(selectedTables, md, cb);
cb.setVisible(false);
cb.dispose();
+ _plugin.setSourceDatabaseObjects(DBUtil.convertTableToObjectList(selectedTables));
- _plugin.setSelectedDatabaseObjects(selectedTables.toArray(new IDatabaseObjectInfo[dbObjs.length]));
-
}
else
{
- _plugin.setSelectedDatabaseObjects(dbObjs);
+ _plugin.setSourceDatabaseObjects(DBUtil.convertTableToObjectList(selectedTables));
}
}
-
}
\ No newline at end of file
Modified: trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/util/DBUtil.java
===================================================================
--- trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/util/DBUtil.java 2011-07-10 18:38:03 UTC (rev 6311)
+++ trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/util/DBUtil.java 2011-07-17 00:24:47 UTC (rev 6312)
@@ -223,9 +223,9 @@
continue;
}
- ISession destSession = prov.getCopyDestSession();
- String destSchema = prov.getDestSelectedDatabaseObject().getSimpleName();
- String destCatalog = prov.getDestSelectedDatabaseObject().getCatalogName();
+ ISession destSession = prov.getDestSession();
+ String destSchema = prov.getDestDatabaseObject().getSimpleName();
+ String destCatalog = prov.getDestDatabaseObject().getCatalogName();
if (tableHasForeignKey(destCatalog, destSchema, ti.getSimpleName(), fkInfo, prov))
{
if (log.isInfoEnabled())
@@ -261,7 +261,7 @@
boolean result = false;
try
{
- SQLDatabaseMetaData md = prov.getCopyDestSession().getSQLConnection().getSQLMetaData();
+ SQLDatabaseMetaData md = prov.getDestSession().getSQLConnection().getSQLMetaData();
ITableInfo[] tables = md.getTables(destCatalog, destSchema, destTableName, new String[]
{ "TABLE" }, null);
@@ -1415,14 +1415,14 @@
MappingException, UserCancelledOperationException
{
- ISession sourceSession = prov.getCopySourceSession();
- String sourceSchema = prov.getSourceSelectedDatabaseObjects()[0].getSchemaName();
- String sourceCatalog = prov.getSourceSelectedDatabaseObjects()[0].getCatalogName();
+ ISession sourceSession = prov.getSourceSession();
+ String sourceSchema = prov.getSourceDatabaseObjects().get(0).getSchemaName();
+ String sourceCatalog = prov.getSourceDatabaseObjects().get(0).getCatalogName();
String sourceTableName = getQualifiedObjectName(
sourceSession, sourceCatalog, sourceSchema, ti.getSimpleName(), DialectFactory.SOURCE_TYPE);
- ISession destSession = prov.getCopyDestSession();
- String destSchema = prov.getDestSelectedDatabaseObject().getSimpleName();
- String destCatalog = prov.getDestSelectedDatabaseObject().getCatalogName();
+ ISession destSession = prov.getDestSession();
+ String destSchema = prov.getDestDatabaseObject().getSimpleName();
+ String destCatalog = prov.getDestDatabaseObject().getCatalogName();
String destinationTableName = getQualifiedObjectName(
destSession, destCatalog, destSchema, ti.getSimpleName(), DialectFactory.DEST_TYPE);
StringBuilder result = new StringBuilder("CREATE TABLE ");
@@ -1432,7 +1432,7 @@
TableColumnInfo colInfo = null;
try
{
- ISQLConnection sourceCon = prov.getCopySourceSession().getSQLConnection();
+ ISQLConnection sourceCon = prov.getSourceSession().getSQLConnection();
TableColumnInfo[] colInfoArr = sourceCon.getSQLMetaData().getColumnInfo(ti);
if (colInfoArr.length == 0)
{
@@ -1526,12 +1526,12 @@
String columnName = colInfo.getColumnName();
if (_prefs.isCheckKeywords())
{
- checkKeyword(prov.getCopyDestSession(), destTableName, columnName);
+ checkKeyword(prov.getDestSession(), destTableName, columnName);
}
StringBuilder result = new StringBuilder(columnName);
boolean notNullable = colInfo.isNullable().equalsIgnoreCase("NO");
String typeName = ColTypeMapper.mapColType(
- prov.getCopySourceSession(), prov.getCopyDestSession(), colInfo, sourceTableName, destTableName);
+ prov.getSourceSession(), prov.getDestSession(), colInfo, sourceTableName, destTableName);
result.append(" ");
result.append(typeName);
if (notNullable)
@@ -1539,7 +1539,7 @@
result.append(" NOT NULL");
} else
{
- ISession destSession = prov.getCopyDestSession();
+ ISession destSession = prov.getDestSession();
HibernateDialect d = DialectFactory.getDialect(
DialectFactory.DEST_TYPE, destSession.getApplication().getMainFrame(), destSession.getMetaData());
String nullString = d...
[truncated message content] |
|
From: <man...@us...> - 2011-07-10 18:38:09
|
Revision: 6311
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6311&view=rev
Author: manningr
Date: 2011-07-10 18:38:03 +0000 (Sun, 10 Jul 2011)
Log Message:
-----------
Add dependency on commons-cli for command-line parsing.
Modified Paths:
--------------
trunk/sql12/plugins/dbcopy/pom.xml
Modified: trunk/sql12/plugins/dbcopy/pom.xml
===================================================================
--- trunk/sql12/plugins/dbcopy/pom.xml 2011-07-10 18:37:00 UTC (rev 6310)
+++ trunk/sql12/plugins/dbcopy/pom.xml 2011-07-10 18:38:03 UTC (rev 6311)
@@ -89,6 +89,11 @@
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
</dependency>
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ <version>${commons-cli-version}</version>
+ </dependency>
</dependencies>
<properties>
<pluginClassName>net.sourceforge.squirrel_sql.plugins.dbcopy.DBCopyPlugin</pluginClassName>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
