Compare commits

..

No commits in common. "4d0074e6a65757a4d6c21b50da5e46f2fb17e907" and "60b80340fc184586bc02a79930c9c7e98fdd8b78" have entirely different histories.

11 changed files with 5 additions and 34 deletions

View File

@ -24,7 +24,6 @@ import cn.hutool.v7.db.dialect.DialectName;
import cn.hutool.v7.db.sql.SqlBuilder;
import cn.hutool.v7.db.sql.StatementUtil;
import java.io.Serial;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.util.Arrays;
@ -36,7 +35,6 @@ import java.util.List;
* @author wb04307201
*/
public class DmDialect extends AnsiSqlDialect {
@Serial
private static final long serialVersionUID = 3415348435502927423L;
/**
@ -80,7 +78,7 @@ public class DmDialect extends AnsiSqlDialect {
// 构建字段部分和参数占位符部分
entity.forEach((field, value) -> {
if (StrUtil.isNotBlank(field) && keyList.contains(field)) {
if (!keyFieldsPart.isEmpty()) {
if (keyFieldsPart.length() > 0) {
keyFieldsPart.append(" and ");
}
keyFieldsPart.append(field).append("= ?");
@ -90,7 +88,7 @@ public class DmDialect extends AnsiSqlDialect {
entity.forEach((field, value) -> {
if (StrUtil.isNotBlank(field) && !keyList.contains(field)) {
if (!updateFieldsPart.isEmpty()) {
if (updateFieldsPart.length() > 0) {
// 非第一个参数追加逗号
updateFieldsPart.append(", ");
}
@ -101,7 +99,7 @@ public class DmDialect extends AnsiSqlDialect {
entity.forEach((field, value) -> {
if (StrUtil.isNotBlank(field)) {
if (!insertFieldsPart.isEmpty()) {
if (insertFieldsPart.length() > 0) {
// 非第一个参数追加逗号
insertFieldsPart.append(", ");
insertPlaceHolder.append(", ");

View File

@ -26,7 +26,6 @@ import cn.hutool.v7.db.config.DbConfig;
import cn.hutool.v7.db.dialect.DialectName;
import cn.hutool.v7.db.sql.SqlBuilder;
import java.io.Serial;
import java.sql.Connection;
import java.sql.PreparedStatement;
@ -36,7 +35,6 @@ import java.sql.PreparedStatement;
* @author loolly
*/
public class H2Dialect extends AnsiSqlDialect {
@Serial
private static final long serialVersionUID = 1490520247974768214L;
/**
@ -72,7 +70,7 @@ public class H2Dialect extends AnsiSqlDialect {
// 构建字段部分和参数占位符部分
entity.forEach((field, value) -> {
if (StrUtil.isNotBlank(field)) {
if (!fieldsPart.isEmpty()) {
if (fieldsPart.length() > 0) {
// 非第一个参数追加逗号
fieldsPart.append(", ");
placeHolder.append(", ");

View File

@ -25,7 +25,6 @@ import cn.hutool.v7.db.sql.QuoteWrapper;
import cn.hutool.v7.db.sql.SqlBuilder;
import cn.hutool.v7.db.sql.StatementUtil;
import java.io.Serial;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.util.ArrayList;
@ -38,7 +37,6 @@ import java.util.List;
* @author daoyou.dev
*/
public class HanaDialect extends AnsiSqlDialect {
@Serial
private static final long serialVersionUID = 1L;
/**

View File

@ -23,15 +23,12 @@ import cn.hutool.v7.db.config.DbConfig;
import cn.hutool.v7.db.dialect.DialectName;
import cn.hutool.v7.db.sql.SqlBuilder;
import java.io.Serial;
/**
* Oracle 方言
*
* @author loolly
*/
public class OracleDialect extends AnsiSqlDialect {
@Serial
private static final long serialVersionUID = 6122761762247483015L;
private static final String DEFAULT_TABLE_ALIAS = "table_alias_";

View File

@ -22,7 +22,6 @@ import cn.hutool.v7.db.config.DbConfig;
import cn.hutool.v7.db.dialect.DialectName;
import cn.hutool.v7.db.sql.Query;
import java.io.Serial;
import java.sql.Connection;
import java.sql.PreparedStatement;
@ -33,7 +32,6 @@ import java.sql.PreparedStatement;
* @since 5.7.2
*/
public class PhoenixDialect extends AnsiSqlDialect {
@Serial
private static final long serialVersionUID = 1L;
/**

View File

@ -27,7 +27,6 @@ import cn.hutool.v7.db.dialect.DialectName;
import cn.hutool.v7.db.sql.QuoteWrapper;
import cn.hutool.v7.db.sql.SqlBuilder;
import java.io.Serial;
import java.sql.Connection;
import java.sql.PreparedStatement;
@ -38,7 +37,6 @@ import java.sql.PreparedStatement;
* @author loolly
*/
public class PostgresqlDialect extends AnsiSqlDialect {
@Serial
private static final long serialVersionUID = 3889210427543389642L;
/**
@ -68,7 +66,7 @@ public class PostgresqlDialect extends AnsiSqlDialect {
// 构建字段部分和参数占位符部分
entity.forEach((field, value) -> {
if (StrUtil.isNotBlank(field)) {
if (!fieldsPart.isEmpty()) {
if (fieldsPart.length() > 0) {
// 非第一个参数追加逗号
fieldsPart.append(", ");
placeHolder.append(", ");

View File

@ -24,8 +24,6 @@ import cn.hutool.v7.db.dialect.DialectName;
import cn.hutool.v7.db.sql.QuoteWrapper;
import cn.hutool.v7.db.sql.SqlBuilder;
import java.io.Serial;
/**
* SQLServer2005-2008方言实现<br>
* 参考jdbc-plus
@ -33,7 +31,6 @@ import java.io.Serial;
* @author niliwei, Looly
*/
public class SqlServer2005Dialect extends AnsiSqlDialect {
@Serial
private static final long serialVersionUID = 1L;
private static final String DEFAULT_TABLE_ALIAS = "table_alias_";

View File

@ -23,15 +23,12 @@ import cn.hutool.v7.db.dialect.DialectName;
import cn.hutool.v7.db.sql.SqlBuilder;
import cn.hutool.v7.db.sql.QuoteWrapper;
import java.io.Serial;
/**
* SQLServer2012 方言
*
* @author Looly
*/
public class SqlServer2012Dialect extends AnsiSqlDialect {
@Serial
private static final long serialVersionUID = -37598166015777797L;
/**

View File

@ -20,15 +20,12 @@ import cn.hutool.v7.db.config.DbConfig;
import cn.hutool.v7.db.dialect.DialectName;
import cn.hutool.v7.db.sql.QuoteWrapper;
import java.io.Serial;
/**
* SqlLite3方言
*
* @author Looly
*/
public class Sqlite3Dialect extends AnsiSqlDialect {
@Serial
private static final long serialVersionUID = -3527642408849291634L;
/**

View File

@ -108,8 +108,6 @@ public class DriverIdentifier implements DriverNames {
new StartsWithDriverMatcher(DRIVER_KINGBASE8, "jdbc:kingbase8:"),
// 南大通用
new StartsWithDriverMatcher(DRIVER_GBASE, "jdbc:gbase:"),
// 南大通用8s
new StartsWithDriverMatcher(DRIVER_GBASE8S, "jdbc:gbasedbt-sqli:"),
// 虚谷
new StartsWithDriverMatcher(DRIVER_XUGU, "jdbc:xugu:"),
// 神通

View File

@ -128,11 +128,6 @@ public interface DriverNames {
* JDBC 驱动 南大通用
*/
String DRIVER_GBASE = "com.gbase.jdbc.Driver";
/**
* JDBC 驱动 南大通用8S<br>
* https://www.gbase.cn/community/post/4029
*/
String DRIVER_GBASE8S = "com.gbasedbt.jdbc.Driver";
/**
* JDBC 驱动 神州数据库
*/