dromara/dbswitch
1
0
Fork 0
mirror of https://gitee.com/dromara/dbswitch.git synced 2025-09-02 02:24:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

代码测试修改

Browse Source
This commit is contained in:
inrgihc
2020-11-30 16:16:17 +08:00
parent a68b434ab5
commit a16393561e
4 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
dbswitch-core/src/main/java/com/weishao/dbswitch/core/database/impl/DatabaseDB2Impl.java
View File

@@ -10,8 +10,6 @@
package com.weishao.dbswitch.core.database.impl;
import java.util.List;
import com.alibaba.druid.sql.SQLUtils;
import com.alibaba.druid.util.JdbcConstants;
import com.weishao.dbswitch.common.constant.DatabaseTypeEnum;
import com.weishao.dbswitch.core.constant.Const;
import com.weishao.dbswitch.core.database.AbstractDatabase;
@@ -49,7 +47,7 @@ public class DatabaseDB2Impl extends AbstractDatabase implements IDatabaseInterf
@Override
public String formatSQL(String sql) {
return SQLUtils.format(sql, JdbcConstants.DB2);
return sql;
}
@Override
@@ -80,7 +78,7 @@ public class DatabaseDB2Impl extends AbstractDatabase implements IDatabaseInterf
if (useAutoInc) {
retval += "BIGINT NOT NULL GENERATED ALWAYS AS IDENTITY (START WITH 0, INCREMENT BY 1, NOCACHE)";
} else {
retval += "BIGINT";
retval += "BIGINT NOT NULL";
}
} else {
if (length > 0) {
@@ -96,18 +94,22 @@ public class DatabaseDB2Impl extends AbstractDatabase implements IDatabaseInterf
break;
case ColumnMetaData.TYPE_INTEGER:
if (null != pks && pks.contains(fieldname)) {
retval += "INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY (START WITH 0, INCREMENT BY 1, NOCACHE)";
if (useAutoInc) {
retval += "INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY (START WITH 0, INCREMENT BY 1, NOCACHE)";
} else {
retval += "INTEGER NOT NULL";
}
} else {
retval += "INTEGER";
}
break;
case ColumnMetaData.TYPE_STRING:
if (length > 32672 || length >= AbstractDatabase.CLOB_LENGTH) {
if (length*3 > 32672) {
retval += "CLOB";
} else {
retval += "VARCHAR";
if (length > 0) {
retval += "(" + length;
retval += "(" + length*3;
} else {
retval += "(";
}
@@ -121,7 +123,7 @@ public class DatabaseDB2Impl extends AbstractDatabase implements IDatabaseInterf
break;
case ColumnMetaData.TYPE_BINARY:
if (length > 32672 || length >= AbstractDatabase.CLOB_LENGTH) {
if (length > 32672) {
retval += "BLOB(" + length + ")";
} else {
if (length > 0) {

2
dbswitch-core/src/main/java/com/weishao/dbswitch/core/database/impl/DatabaseMysqlImpl.java
View File

@@ -16,8 +16,8 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import org.apache.commons.lang3.StringUtils;
import com.alibaba.druid.sql.SQLUtils;
import com.weishao.dbswitch.core.constant.Const;
import com.alibaba.druid.sql.SQLUtils;
import com.weishao.dbswitch.common.constant.DatabaseTypeEnum;
import com.weishao.dbswitch.core.database.AbstractDatabase;
import com.weishao.dbswitch.core.database.IDatabaseInterface;

1
dbswitch-core/src/main/java/com/weishao/dbswitch/core/database/impl/DatabaseOracleImpl.java
View File

@@ -16,7 +16,6 @@ import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import com.alibaba.druid.sql.SQLUtils;
import com.weishao.dbswitch.core.constant.Const;
import com.weishao.dbswitch.common.constant.DatabaseTypeEnum;

1
dbswitch-core/src/main/java/com/weishao/dbswitch/core/util/JdbcUrlUtils.java
View File

@@ -148,6 +148,7 @@ public class JdbcUrlUtils {
"jdbc:mariadb://%s:%d/%s?useSSL=false&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=%s&nullCatalogMeansCurrent=true&connectTimeout=%d",
db.getHost(), db.getPort(), db.getDbname(), charsets, connectTimeout * 1000);
case DB2:
System.setProperty("db2.jcc.charsetdecoderencoder", "3");
return String.format("jdbc:db2://%s:%d/%s", db.getHost(), db.getPort(), db.getDbname());
default:
throw new RuntimeException(String.format("Unkown database type (%s)", db.getType().name()));