diff --git a/dbswitch-common/pom.xml b/dbswitch-common/pom.xml index f0ceb46705a1a322e053284c2c90f464659ecd33..a970a7fe70a261445ebc7513b63acd20c1eb90f6 100644 --- a/dbswitch-common/pom.xml +++ b/dbswitch-common/pom.xml @@ -5,7 +5,7 @@ com.gitee dbswitch - 1.5.1 + 1.5.2 dbswitch-common diff --git a/dbswitch-core/pom.xml b/dbswitch-core/pom.xml index 02deaedbab9fbf772b565a57d6df8987532bd194..7f238b886df8d6e8842aa6d54d7942f7ae47f871 100644 --- a/dbswitch-core/pom.xml +++ b/dbswitch-core/pom.xml @@ -5,7 +5,7 @@ com.gitee dbswitch - 1.5.1 + 1.5.2 dbswitch-core diff --git a/dbswitch-core/src/main/java/com/gitee/dbswitch/core/database/AbstractDatabase.java b/dbswitch-core/src/main/java/com/gitee/dbswitch/core/database/AbstractDatabase.java index 89cd82d9fdc6d73a68808d033262e9cc91bf86b6..2ebdd54d160c0eb786e476588a34805d8b641857 100644 --- a/dbswitch-core/src/main/java/com/gitee/dbswitch/core/database/AbstractDatabase.java +++ b/dbswitch-core/src/main/java/com/gitee/dbswitch/core/database/AbstractDatabase.java @@ -18,6 +18,7 @@ import java.util.HashSet; import java.sql.Connection; import java.sql.DatabaseMetaData; import java.sql.DriverManager; +import java.sql.Statement; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.ResultSetMetaData; @@ -217,8 +218,8 @@ public abstract class AbstractDatabase implements IDatabaseInterface { @Override public void testQuerySQL(String sql) { String wrapperSql = this.getTestQuerySQL(sql); - try(PreparedStatement pstmt = this.connection.prepareStatement(wrapperSql);) { - pstmt.executeQuery(); + try (Statement statement = this.connection.createStatement();) { + statement.execute(wrapperSql); } catch (SQLException e) { throw new RuntimeException(e); } diff --git a/dbswitch-core/src/main/java/com/gitee/dbswitch/core/database/impl/DatabaseGreenplumImpl.java b/dbswitch-core/src/main/java/com/gitee/dbswitch/core/database/impl/DatabaseGreenplumImpl.java index a436238d2cc048979136b3413d503ff79bfd4671..109958317f5d25a0e958cff73d330f09b5b33022 100644 --- a/dbswitch-core/src/main/java/com/gitee/dbswitch/core/database/impl/DatabaseGreenplumImpl.java +++ b/dbswitch-core/src/main/java/com/gitee/dbswitch/core/database/impl/DatabaseGreenplumImpl.java @@ -112,7 +112,11 @@ public class DatabaseGreenplumImpl extends AbstractDatabase implements IDatabase if (length < 1 || length >= AbstractDatabase.CLOB_LENGTH) { retval += "TEXT"; } else { - retval += "VARCHAR(" + length + ")"; + if (null != pks && pks.contains(fieldname)) { + retval += "VARCHAR(" + length + ")"; + } else { + retval += "TEXT"; + } } break; case ColumnMetaData.TYPE_BINARY: diff --git a/dbswitch-core/src/main/java/com/gitee/dbswitch/core/database/impl/DatabasePostgresImpl.java b/dbswitch-core/src/main/java/com/gitee/dbswitch/core/database/impl/DatabasePostgresImpl.java index 891a405d26996e5736ed8e86c32fa9b2d6b85b9a..6582d7f8d05119a2030d6d1527f1c484b7397930 100644 --- a/dbswitch-core/src/main/java/com/gitee/dbswitch/core/database/impl/DatabasePostgresImpl.java +++ b/dbswitch-core/src/main/java/com/gitee/dbswitch/core/database/impl/DatabasePostgresImpl.java @@ -112,7 +112,11 @@ public class DatabasePostgresImpl extends AbstractDatabase implements IDatabaseI if (length < 1 || length >= AbstractDatabase.CLOB_LENGTH) { retval += "TEXT"; } else { - retval += "VARCHAR(" + length + ")"; + if (null != pks && pks.contains(fieldname)) { + retval += "VARCHAR(" + length + ")"; + } else { + retval += "TEXT"; + } } break; case ColumnMetaData.TYPE_BINARY: diff --git a/dbswitch-data/pom.xml b/dbswitch-data/pom.xml index 36dd9348b16ed4aa2ae60f7db33996abdaf88dbe..d15d4af517baf540d1c240812a77e68475a58a80 100644 --- a/dbswitch-data/pom.xml +++ b/dbswitch-data/pom.xml @@ -5,7 +5,7 @@ com.gitee dbswitch - 1.5.1 + 1.5.2 dbswitch-data diff --git a/dbswitch-dbchange/pom.xml b/dbswitch-dbchange/pom.xml index 2c4bc2655d8e29678a5bf174221f26a755b78f01..fba428922e4dc69acf078b0a73f9868e9530c04b 100644 --- a/dbswitch-dbchange/pom.xml +++ b/dbswitch-dbchange/pom.xml @@ -5,7 +5,7 @@ com.gitee dbswitch - 1.5.1 + 1.5.2 dbswitch-dbchange diff --git a/dbswitch-dbcommon/pom.xml b/dbswitch-dbcommon/pom.xml index 3936a1da87d83a2f7271591df1a5b5656fadc54a..23759be99ccd3c092cfdc0c021b5987db0568d79 100644 --- a/dbswitch-dbcommon/pom.xml +++ b/dbswitch-dbcommon/pom.xml @@ -3,7 +3,7 @@ com.gitee dbswitch - 1.5.1 + 1.5.2 dbswitch-dbcommon diff --git a/dbswitch-dbsynch/pom.xml b/dbswitch-dbsynch/pom.xml index 66ecd11414310f1528d41ea54b8ba5dffb7209b7..a3b8f74780e419e375125d93e98414383360122b 100644 --- a/dbswitch-dbsynch/pom.xml +++ b/dbswitch-dbsynch/pom.xml @@ -3,7 +3,7 @@ com.gitee dbswitch - 1.5.1 + 1.5.2 dbswitch-dbsynch diff --git a/dbswitch-dbwriter/pom.xml b/dbswitch-dbwriter/pom.xml index 5b65d9edb14433378ac735794a878387e0701352..9beee526b2ac6aa52e8a94dd8aa38bcdbc25ca2c 100644 --- a/dbswitch-dbwriter/pom.xml +++ b/dbswitch-dbwriter/pom.xml @@ -5,7 +5,7 @@ com.gitee dbswitch - 1.5.1 + 1.5.2 dbswitch-dbwriter diff --git a/dbswitch-pgwriter/pom.xml b/dbswitch-pgwriter/pom.xml index 00f99a31f1c5c6f1f26bc67ca91b4ca2de33b89c..093e225cb9d9b4b512908bcf2f2476ffd4561a57 100644 --- a/dbswitch-pgwriter/pom.xml +++ b/dbswitch-pgwriter/pom.xml @@ -5,7 +5,7 @@ com.gitee dbswitch - 1.5.1 + 1.5.2 dbswitch-pgwriter diff --git a/dbswitch-sql/pom.xml b/dbswitch-sql/pom.xml index 9103616cafa30235d7eb2fd8571b47be8f5420f3..625aa4efca871c9e2786e87f457f38bfdef1336f 100644 --- a/dbswitch-sql/pom.xml +++ b/dbswitch-sql/pom.xml @@ -5,7 +5,7 @@ com.gitee dbswitch - 1.5.1 + 1.5.2 dbswitch-sql diff --git a/dbswitch-webapi/pom.xml b/dbswitch-webapi/pom.xml index 77d2c66bc437baee12a445fadbf019c8ab2d3e3f..9138d34a80125ded4c35e4e91d57899963a81308 100644 --- a/dbswitch-webapi/pom.xml +++ b/dbswitch-webapi/pom.xml @@ -5,7 +5,7 @@ com.gitee dbswitch - 1.5.1 + 1.5.2 dbswitch-webapi diff --git a/package-tool/pom.xml b/package-tool/pom.xml index 85cb8815497708bbd7e422b86c5dcd43c1e5edf2..930b4f8d96e1a5f5aa6e8c1dde13ccacaa8f0138 100644 --- a/package-tool/pom.xml +++ b/package-tool/pom.xml @@ -5,7 +5,7 @@ com.gitee dbswitch - 1.5.1 + 1.5.2 package-tool diff --git a/package-tool/src/main/assembly/bin/datasync.sh b/package-tool/src/main/assembly/bin/datasync.sh index 3d370ff0e69e04221321d2e96b0a51fbd51941a8..46bb506ea8cbcf6df429255b9760c084ae71951a 100644 --- a/package-tool/src/main/assembly/bin/datasync.sh +++ b/package-tool/src/main/assembly/bin/datasync.sh @@ -21,7 +21,7 @@ APP_LIB_PATH=$APP_HOME/lib APP_CONF_PATH=$APP_HOME/conf # JVMFLAGS JVM参数可以在这里设置 -JVMFLAGS="-Xms1024m -Xmx1024m -Xmn512m -XX:+DisableExplicitGC -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -Dfile.encoding=UTF-8 -Doracle.jdbc.J2EE13Compliant=true" +JVMFLAGS="-Xms2g -Xmx2g -Xmn1g -XX:+DisableExplicitGC -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -Dfile.encoding=UTF-8 -Doracle.jdbc.J2EE13Compliant=true" if [ "$JAVA_HOME" != "" ]; then JAVA="$JAVA_HOME/bin/java" diff --git a/pom.xml b/pom.xml index d0ebc5009cb76d9bda4e866184dcf816161b6994..2d0a1e3e57b48ac4de5008ae3d30b068d1401547 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ com.gitee dbswitch - 1.5.1 + 1.5.2 pom dbswitch database switch project diff --git a/version.cmd b/version.cmd index a3325f930bc314b7860bc79f9adebac1243aa655..3271f5abd8185909a3319e6f23bc1a6bfbba3ba7 100644 --- a/version.cmd +++ b/version.cmd @@ -1,6 +1,6 @@ @echo off -set APP_VERSION=1.5.1 +set APP_VERSION=1.5.2 echo "Clean Project ..." call mvn clean -f pom.xml