diff --git a/config/src/main/java/com/alibaba/nacos/config/server/auth/EmbeddedPermissionPersistServiceImpl.java b/config/src/main/java/com/alibaba/nacos/config/server/auth/EmbeddedPermissionPersistServiceImpl.java index 1970cef1856..301195999a6 100644 --- a/config/src/main/java/com/alibaba/nacos/config/server/auth/EmbeddedPermissionPersistServiceImpl.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/auth/EmbeddedPermissionPersistServiceImpl.java @@ -52,7 +52,8 @@ public class EmbeddedPermissionPersistServiceImpl implements PermissionPersistSe public Page getPermissions(String role, int pageNo, int pageSize) { PaginationHelper helper = persistService.createPaginationHelper(); - String sqlCountRows = "SELECT COUNT(*) FROM permissions WHERE "; + String sqlCountRows = "SELECT count(*) FROM permissions WHERE "; + String sqlFetchRows = "SELECT role,resource,action FROM permissions WHERE "; String where = " role= ? "; @@ -84,7 +85,7 @@ public Page getPermissions(String role, int pageNo, int pageSize */ @Override public void addPermission(String role, String resource, String action) { - String sql = "INSERT into permissions (role, resource, action) VALUES (?, ?, ?)"; + String sql = "INSERT INTO permissions (role, resource, action) VALUES (?, ?, ?)"; EmbeddedStorageContextUtils.addSqlContext(sql, role, resource, action); databaseOperate.blockUpdate(); } @@ -98,7 +99,7 @@ public void addPermission(String role, String resource, String action) { */ @Override public void deletePermission(String role, String resource, String action) { - String sql = "DELETE from permissions WHERE role=? and resource=? and action=?"; + String sql = "DELETE FROM permissions WHERE role=? AND resource=? AND action=?"; EmbeddedStorageContextUtils.addSqlContext(sql, role, resource, action); databaseOperate.blockUpdate(); } diff --git a/config/src/main/java/com/alibaba/nacos/config/server/auth/EmbeddedRolePersistServiceImpl.java b/config/src/main/java/com/alibaba/nacos/config/server/auth/EmbeddedRolePersistServiceImpl.java index 9b2d917bf25..1660710bb88 100644 --- a/config/src/main/java/com/alibaba/nacos/config/server/auth/EmbeddedRolePersistServiceImpl.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/auth/EmbeddedRolePersistServiceImpl.java @@ -52,8 +52,9 @@ public class EmbeddedRolePersistServiceImpl implements RolePersistService { public Page getRoles(int pageNo, int pageSize) { PaginationHelper helper = persistService.createPaginationHelper(); - - String sqlCountRows = "SELECT COUNT(*) FROM (SELECT DISTINCT role FROM roles) roles WHERE "; + + String sqlCountRows = "SELECT count(*) FROM (SELECT DISTINCT role FROM roles) roles WHERE "; + String sqlFetchRows = "SELECT role,username FROM roles WHERE "; String where = " 1=1 "; @@ -75,7 +76,8 @@ public Page getRolesByUserName(String username, int pageNo, int pageSi PaginationHelper helper = persistService.createPaginationHelper(); - String sqlCountRows = "SELECT COUNT(*) FROM roles WHERE "; + String sqlCountRows = "SELECT count(*) FROM roles WHERE "; + String sqlFetchRows = "SELECT role,username FROM roles WHERE "; String where = " username= ? "; @@ -100,7 +102,7 @@ public Page getRolesByUserName(String username, int pageNo, int pageSi @Override public void addRole(String role, String userName) { - String sql = "INSERT into roles (role, username) VALUES (?, ?)"; + String sql = "INSERT INTO roles (role, username) VALUES (?, ?)"; try { EmbeddedStorageContextUtils.addSqlContext(sql, role, userName); @@ -117,7 +119,7 @@ public void addRole(String role, String userName) { */ @Override public void deleteRole(String role) { - String sql = "DELETE from roles WHERE role=?"; + String sql = "DELETE FROM roles WHERE role=?"; try { EmbeddedStorageContextUtils.addSqlContext(sql, role); databaseOperate.update(EmbeddedStorageContextUtils.getCurrentSqlContext()); @@ -134,7 +136,7 @@ public void deleteRole(String role) { */ @Override public void deleteRole(String role, String username) { - String sql = "DELETE from roles WHERE role=? and username=?"; + String sql = "DELETE FROM roles WHERE role=? AND username=?"; try { EmbeddedStorageContextUtils.addSqlContext(sql, role, username); databaseOperate.update(EmbeddedStorageContextUtils.getCurrentSqlContext()); diff --git a/config/src/main/java/com/alibaba/nacos/config/server/auth/EmbeddedUserPersistServiceImpl.java b/config/src/main/java/com/alibaba/nacos/config/server/auth/EmbeddedUserPersistServiceImpl.java index 16b0adf8a03..c13bb043f5f 100644 --- a/config/src/main/java/com/alibaba/nacos/config/server/auth/EmbeddedUserPersistServiceImpl.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/auth/EmbeddedUserPersistServiceImpl.java @@ -72,7 +72,7 @@ public void createUser(String username, String password) { */ @Override public void deleteUser(String username) { - String sql = "DELETE from users WHERE username=?"; + String sql = "DELETE FROM users WHERE username=?"; try { EmbeddedStorageContextUtils.addSqlContext(sql, username); databaseOperate.blockUpdate(); @@ -109,7 +109,8 @@ public Page getUsers(int pageNo, int pageSize) { PaginationHelper helper = persistService.createPaginationHelper(); - String sqlCountRows = "SELECT COUNT(*) FROM users WHERE "; + String sqlCountRows = "SELECT count(*) FROM users WHERE "; + String sqlFetchRows = "SELECT username,password FROM users WHERE "; String where = " 1=1 "; diff --git a/config/src/main/java/com/alibaba/nacos/config/server/auth/ExternalPermissionPersistServiceImpl.java b/config/src/main/java/com/alibaba/nacos/config/server/auth/ExternalPermissionPersistServiceImpl.java index aa7eabf3918..283df29e007 100644 --- a/config/src/main/java/com/alibaba/nacos/config/server/auth/ExternalPermissionPersistServiceImpl.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/auth/ExternalPermissionPersistServiceImpl.java @@ -98,7 +98,7 @@ public Page getPermissions(String role, int pageNo, int pageSize @Override public void addPermission(String role, String resource, String action) { - String sql = "INSERT into permissions (role, resource, action) VALUES (?, ?, ?)"; + String sql = "INSERT INTO permissions (role, resource, action) VALUES (?, ?, ?)"; try { jt.update(sql, role, resource, action); @@ -118,7 +118,7 @@ public void addPermission(String role, String resource, String action) { @Override public void deletePermission(String role, String resource, String action) { - String sql = "DELETE from permissions WHERE role=? and resource=? and action=?"; + String sql = "DELETE FROM permissions WHERE role=? AND resource=? AND action=?"; try { jt.update(sql, role, resource, action); } catch (CannotGetJdbcConnectionException e) { diff --git a/config/src/main/java/com/alibaba/nacos/config/server/auth/ExternalRolePersistServiceImpl.java b/config/src/main/java/com/alibaba/nacos/config/server/auth/ExternalRolePersistServiceImpl.java index 8735f8ec106..a8337db2b4a 100644 --- a/config/src/main/java/com/alibaba/nacos/config/server/auth/ExternalRolePersistServiceImpl.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/auth/ExternalRolePersistServiceImpl.java @@ -62,7 +62,8 @@ public Page getRoles(int pageNo, int pageSize) { PaginationHelper helper = persistService.createPaginationHelper(); - String sqlCountRows = "SELECT COUNT(*) from (SELECT DISTINCT role FROM roles) roles WHERE "; + String sqlCountRows = "SELECT count(*) FROM (SELECT DISTINCT role FROM roles) roles WHERE "; + String sqlFetchRows = "SELECT role,username FROM roles WHERE "; String where = " 1=1 "; @@ -87,8 +88,9 @@ public Page getRoles(int pageNo, int pageSize) { public Page getRolesByUserName(String username, int pageNo, int pageSize) { PaginationHelper helper = persistService.createPaginationHelper(); - - String sqlCountRows = "SELECT COUNT(*) FROM roles WHERE "; + + String sqlCountRows = "SELECT count(*) FROM roles WHERE "; + String sqlFetchRows = "SELECT role,username FROM roles WHERE "; String where = " username= ? "; @@ -117,7 +119,7 @@ public Page getRolesByUserName(String username, int pageNo, int pageSi @Override public void addRole(String role, String userName) { - String sql = "INSERT into roles (role, username) VALUES (?, ?)"; + String sql = "INSERT INTO roles (role, username) VALUES (?, ?)"; try { jt.update(sql, role, userName); @@ -134,7 +136,7 @@ public void addRole(String role, String userName) { */ @Override public void deleteRole(String role) { - String sql = "DELETE from roles WHERE role=?"; + String sql = "DELETE FROM roles WHERE role=?"; try { jt.update(sql, role); } catch (CannotGetJdbcConnectionException e) { @@ -151,7 +153,7 @@ public void deleteRole(String role) { */ @Override public void deleteRole(String role, String username) { - String sql = "DELETE from roles WHERE role=? and username=?"; + String sql = "DELETE FROM roles WHERE role=? AND username=?"; try { jt.update(sql, role, username); } catch (CannotGetJdbcConnectionException e) { diff --git a/config/src/main/java/com/alibaba/nacos/config/server/auth/ExternalUserPersistServiceImpl.java b/config/src/main/java/com/alibaba/nacos/config/server/auth/ExternalUserPersistServiceImpl.java index 4c8dcc7601a..c5b5e55ad82 100644 --- a/config/src/main/java/com/alibaba/nacos/config/server/auth/ExternalUserPersistServiceImpl.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/auth/ExternalUserPersistServiceImpl.java @@ -62,7 +62,7 @@ protected void init() { */ @Override public void createUser(String username, String password) { - String sql = "INSERT into users (username, password, enabled) VALUES (?, ?, ?)"; + String sql = "INSERT INTO users (username, password, enabled) VALUES (?, ?, ?)"; try { jt.update(sql, username, password, true); @@ -79,7 +79,7 @@ public void createUser(String username, String password) { */ @Override public void deleteUser(String username) { - String sql = "DELETE from users WHERE username=?"; + String sql = "DELETE FROM users WHERE username=?"; try { jt.update(sql, username); } catch (CannotGetJdbcConnectionException e) { @@ -131,7 +131,8 @@ public Page getUsers(int pageNo, int pageSize) { PaginationHelper helper = persistService.createPaginationHelper(); - String sqlCountRows = "SELECT COUNT(*) FROM users WHERE "; + String sqlCountRows = "SELECT count(*) FROM users WHERE "; + String sqlFetchRows = "SELECT username,password FROM users WHERE "; String where = " 1=1 "; diff --git a/config/src/main/java/com/alibaba/nacos/config/server/service/capacity/GroupCapacityPersistService.java b/config/src/main/java/com/alibaba/nacos/config/server/service/capacity/GroupCapacityPersistService.java index 55385e037eb..c78f0efe70a 100644 --- a/config/src/main/java/com/alibaba/nacos/config/server/service/capacity/GroupCapacityPersistService.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/service/capacity/GroupCapacityPersistService.java @@ -105,11 +105,11 @@ public boolean insertGroupCapacity(final GroupCapacity capacity) { String sql; if (CLUSTER.equals(capacity.getGroup())) { sql = "INSERT INTO group_capacity (group_id, quota, `usage`, `max_size`, max_aggr_count, max_aggr_size, " - + "gmt_create, gmt_modified) SELECT ?, ?, COUNT(*), ?, ?, ?, ?, ? FROM config_info;"; + + "gmt_create, gmt_modified) SELECT ?, ?, count(*), ?, ?, ?, ?, ? FROM config_info;"; } else { // Note: add "tenant_id = ''" condition. sql = "INSERT INTO group_capacity (group_id, quota, `usage`, `max_size`, max_aggr_count, max_aggr_size, " - + "gmt_create, gmt_modified) SELECT ?, ?, COUNT(*), ?, ?, ?, ?, ? FROM config_info WHERE " + + "gmt_create, gmt_modified) SELECT ?, ?, count(*), ?, ?, ?, ?, ? FROM config_info WHERE " + "group_id=? AND tenant_id = '';"; } return insertGroupCapacity(sql, capacity); @@ -262,7 +262,7 @@ public boolean updateGroupCapacity(String group, Integer quota, Integer maxSize, sql.append(" gmt_modified = ?"); argList.add(TimeUtils.getCurrentTime()); - sql.append(" where group_id = ?"); + sql.append(" WHERE group_id = ?"); argList.add(group); try { return jdbcTemplate.update(sql.toString(), argList.toArray()) == 1; diff --git a/config/src/main/java/com/alibaba/nacos/config/server/service/capacity/TenantCapacityPersistService.java b/config/src/main/java/com/alibaba/nacos/config/server/service/capacity/TenantCapacityPersistService.java index ecbe495fd8a..337c761bb35 100644 --- a/config/src/main/java/com/alibaba/nacos/config/server/service/capacity/TenantCapacityPersistService.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/service/capacity/TenantCapacityPersistService.java @@ -210,7 +210,7 @@ public boolean decrementUsage(TenantCapacity tenantCapacity) { public boolean updateTenantCapacity(String tenant, Integer quota, Integer maxSize, Integer maxAggrCount, Integer maxAggrSize) { List argList = Lists.newArrayList(); - StringBuilder sql = new StringBuilder("update tenant_capacity set"); + StringBuilder sql = new StringBuilder("UPDATE tenant_capacity SET"); if (quota != null) { sql.append(" quota = ?,"); argList.add(quota); @@ -230,7 +230,7 @@ public boolean updateTenantCapacity(String tenant, Integer quota, Integer maxSiz sql.append(" gmt_modified = ?"); argList.add(TimeUtils.getCurrentTime()); - sql.append(" where tenant_id = ?"); + sql.append(" WHERE tenant_id = ?"); argList.add(tenant); try { return jdbcTemplate.update(sql.toString(), argList.toArray()) == 1; diff --git a/config/src/main/java/com/alibaba/nacos/config/server/service/repository/PersistService.java b/config/src/main/java/com/alibaba/nacos/config/server/service/repository/PersistService.java index b323407db72..1d531b17138 100644 --- a/config/src/main/java/com/alibaba/nacos/config/server/service/repository/PersistService.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/service/repository/PersistService.java @@ -59,8 +59,10 @@ public interface PersistService { Object[] EMPTY_ARRAY = new Object[] {}; @SuppressWarnings("checkstyle:linelength") String SQL_FIND_ALL_CONFIG_INFO = "SELECT id,data_id,group_id,tenant_id,app_name,content,type,md5,gmt_create,gmt_modified,src_user,src_ip,c_desc,c_use,effect,c_schema FROM config_info"; - String SQL_TENANT_INFO_COUNT_BY_TENANT_ID = "SELECT COUNT(1) WHERE tenant_info WHERE tenant_id = ?"; - String SQL_FIND_CONFIG_INFO_BY_IDS = "SELECT ID,data_id,group_id,tenant_id,app_name,content,md5 FROM config_info WHERE "; + + String SQL_TENANT_INFO_COUNT_BY_TENANT_ID = "SELECT count(1) FROM tenant_info WHERE tenant_id = ?"; + String SQL_FIND_CONFIG_INFO_BY_IDS = "SELECT id,data_id,group_id,tenant_id,app_name,content,md5 FROM config_info WHERE "; + String SQL_DELETE_CONFIG_INFO_BY_IDS = "DELETE FROM config_info WHERE "; int QUERY_LIMIT_SIZE = 50; String PATTERN_STR = "*"; diff --git a/config/src/main/java/com/alibaba/nacos/config/server/service/repository/RowMapperManager.java b/config/src/main/java/com/alibaba/nacos/config/server/service/repository/RowMapperManager.java index 5b3c9c302a6..17fe9da125a 100644 --- a/config/src/main/java/com/alibaba/nacos/config/server/service/repository/RowMapperManager.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/service/repository/RowMapperManager.java @@ -206,7 +206,7 @@ public ConfigInfoWrapper mapRow(ResultSet rs, int rowNum) throws SQLException { } catch (SQLException ignore) { } try { - info.setId(rs.getLong("ID")); + info.setId(rs.getLong("id")); } catch (SQLException ignore) { } try { @@ -238,7 +238,7 @@ public ConfigInfoBetaWrapper mapRow(ResultSet rs, int rowNum) throws SQLExceptio } catch (SQLException ignore) { } try { - info.setId(rs.getLong("ID")); + info.setId(rs.getLong("id")); } catch (SQLException ignore) { } try { @@ -270,7 +270,7 @@ public ConfigInfoTagWrapper mapRow(ResultSet rs, int rowNum) throws SQLException } catch (SQLException ignore) { } try { - info.setId(rs.getLong("ID")); + info.setId(rs.getLong("id")); } catch (SQLException ignore) { } try { @@ -305,7 +305,7 @@ public ConfigInfo mapRow(ResultSet rs, int rowNum) throws SQLException { } catch (SQLException ignore) { } try { - info.setId(rs.getLong("ID")); + info.setId(rs.getLong("id")); } catch (SQLException ignore) { } try { @@ -366,7 +366,7 @@ public ConfigAllInfo mapRow(ResultSet rs, int rowNum) throws SQLException { } catch (SQLException ignore) { } try { - info.setId(rs.getLong("ID")); + info.setId(rs.getLong("id")); } catch (SQLException ignore) { } info.setCreateTime(rs.getTimestamp("gmt_modified").getTime()); @@ -399,7 +399,7 @@ public ConfigInfo4Beta mapRow(ResultSet rs, int rowNum) throws SQLException { } catch (SQLException ignore) { } try { - info.setId(rs.getLong("ID")); + info.setId(rs.getLong("id")); } catch (SQLException ignore) { } try { @@ -427,7 +427,7 @@ public ConfigInfo4Tag mapRow(ResultSet rs, int rowNum) throws SQLException { } catch (SQLException ignore) { } try { - info.setId(rs.getLong("ID")); + info.setId(rs.getLong("id")); } catch (SQLException ignore) { } try { @@ -452,7 +452,7 @@ public ConfigInfoBase mapRow(ResultSet rs, int rowNum) throws SQLException { } catch (SQLException ignore) { } try { - info.setId(rs.getLong("ID")); + info.setId(rs.getLong("id")); } catch (SQLException ignore) { } return info; diff --git a/config/src/main/java/com/alibaba/nacos/config/server/service/repository/embedded/EmbeddedPaginationHelperImpl.java b/config/src/main/java/com/alibaba/nacos/config/server/service/repository/embedded/EmbeddedPaginationHelperImpl.java index aaef3bcbc9e..ea0281056e4 100644 --- a/config/src/main/java/com/alibaba/nacos/config/server/service/repository/embedded/EmbeddedPaginationHelperImpl.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/service/repository/embedded/EmbeddedPaginationHelperImpl.java @@ -188,7 +188,7 @@ public Page fetchPageLimit(final String sqlFetchRows, final Object[] args, fi @Override public void updateLimit(final String sql, final Object[] args) { - String sqlUpdate = sql.replaceAll("limit \\?", "OFFSET 0 ROWS FETCH NEXT ? ROWS ONLY"); + String sqlUpdate = sql.replaceAll("LIMIT \\?", "OFFSET 0 ROWS FETCH NEXT ? ROWS ONLY"); EmbeddedStorageContextUtils.addSqlContext(sqlUpdate, args); try { diff --git a/config/src/main/java/com/alibaba/nacos/config/server/service/repository/embedded/EmbeddedStoragePersistServiceImpl.java b/config/src/main/java/com/alibaba/nacos/config/server/service/repository/embedded/EmbeddedStoragePersistServiceImpl.java index bd16a31356b..a7f54d7a8d0 100755 --- a/config/src/main/java/com/alibaba/nacos/config/server/service/repository/embedded/EmbeddedStoragePersistServiceImpl.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/service/repository/embedded/EmbeddedStoragePersistServiceImpl.java @@ -379,7 +379,7 @@ public boolean updateConfigInfo4BetaCas(ConfigInfo configInfo, String betaIps, S try { String md5 = MD5Utils.md5Hex(configInfo.getContent(), Constants.ENCODE); - final String sql = "UPDATE config_info_beta SET content=?,md5=?,src_ip=?,src_user=?,gmt_modified=?,app_name=? WHERE data_id=? AND group_id=? AND tenant_id=? AND (md5=? or md5 is null or md5='')"; + final String sql = "UPDATE config_info_beta SET content=?,md5=?,src_ip=?,src_user=?,gmt_modified=?,app_name=? WHERE data_id=? AND group_id=? AND tenant_id=? AND (md5=? OR md5 IS NULL OR md5='')"; final Object[] args = new Object[] {configInfo.getContent(), md5, srcIp, srcUser, time, appNameTmp, configInfo.getDataId(), configInfo.getGroup(), tenantTmp, configInfo.getMd5()}; @@ -430,7 +430,7 @@ public boolean updateConfigInfo4TagCas(ConfigInfo configInfo, String tag, String try { String md5 = MD5Utils.md5Hex(configInfo.getContent(), Constants.ENCODE); - final String sql = "UPDATE config_info_tag SET content=?, md5 = ?, src_ip=?,src_user=?,gmt_modified=?,app_name=? WHERE data_id=? AND group_id=? AND tenant_id=? AND tag_id=? AND (md5=? or md5 is null or md5='')"; + final String sql = "UPDATE config_info_tag SET content=?, md5 = ?, src_ip=?,src_user=?,gmt_modified=?,app_name=? WHERE data_id=? AND group_id=? AND tenant_id=? AND tag_id=? AND (md5=? OR md5 IS NULL OR md5='')"; final Object[] args = new Object[] {configInfo.getContent(), md5, srcIp, srcUser, time, appNameTmp, configInfo.getDataId(), configInfo.getGroup(), tenantTmp, tagTmp, configInfo.getMd5()}; @@ -548,7 +548,7 @@ public void insertOrUpdateSub(SubInfo subInfo) { } private boolean isAlreadyExist(SubInfo subInfo) { - final String sql = "SELECT * from app_configdata_relation_subs WHERE dara_id=? and group_id=? and app_name=?"; + final String sql = "SELECT * FROM app_configdata_relation_subs WHERE dara_id=? AND group_id=? AND app_name=?"; Map obj = databaseOperate .queryOne(sql, new Object[] {subInfo.getDataId(), subInfo.getGroup(), subInfo.getAppName()}, Map.class); return obj != null; @@ -714,7 +714,7 @@ public boolean batchRemoveAggr(final String dataId, final String group, final St } datumString.deleteCharAt(datumString.length() - 1); final String sql = - "delete from config_info_aggr where data_id=? and group_id=? and tenant_id=? and datum_id in (" + "DELETE FROM config_info_aggr WHERE data_id=? AND group_id=? AND tenant_id=? AND datum_id IN (" + datumString.toString() + ")"; final Object[] args = new Object[] {dataId, group, tenantTmp}; EmbeddedStorageContextUtils.addSqlContext(sql, args); @@ -732,14 +732,14 @@ public boolean batchRemoveAggr(final String dataId, final String group, final St @Override public void removeConfigHistory(final Timestamp startTime, final int limitSize) { - String sql = "delete from his_config_info where gmt_modified < ? limit ?"; + String sql = "DELETE FROM his_config_info WHERE gmt_modified < ? LIMIT ?"; PaginationHelper helper = createPaginationHelper(); helper.updateLimit(sql, new Object[] {startTime, limitSize}); } @Override public int findConfigHistoryCountByTime(final Timestamp startTime) { - String sql = "SELECT COUNT(*) FROM his_config_info WHERE gmt_modified < ?"; + String sql = "SELECT count(*) FROM his_config_info WHERE gmt_modified < ?"; Integer result = databaseOperate.queryOne(sql, new Object[] {startTime}, Integer.class); if (result == null) { throw new IllegalArgumentException("configInfoBetaCount error"); @@ -811,7 +811,7 @@ public List findAllDataIdAndGroup() { @Override public ConfigInfoBetaWrapper findConfigInfo4Beta(final String dataId, final String group, final String tenant) { String tenantTmp = StringUtils.isBlank(tenant) ? StringUtils.EMPTY : tenant; - final String sql = "SELECT ID,data_id,group_id,tenant_id,app_name,content,beta_ips FROM config_info_beta WHERE data_id=? AND group_id=? AND tenant_id=?"; + final String sql = "SELECT id,data_id,group_id,tenant_id,app_name,content,beta_ips FROM config_info_beta WHERE data_id=? AND group_id=? AND tenant_id=?"; return databaseOperate.queryOne(sql, new Object[] {dataId, group, tenantTmp}, CONFIG_INFO_BETA_WRAPPER_ROW_MAPPER); @@ -823,7 +823,7 @@ public ConfigInfoTagWrapper findConfigInfo4Tag(final String dataId, final String String tenantTmp = StringUtils.isBlank(tenant) ? StringUtils.EMPTY : tenant; String tagTmp = StringUtils.isBlank(tag) ? StringUtils.EMPTY : tag.trim(); - final String sql = "SELECT ID,data_id,group_id,tenant_id,tag_id,app_name,content FROM config_info_tag WHERE data_id=? AND group_id=? AND tenant_id=? AND tag_id=?"; + final String sql = "SELECT id,data_id,group_id,tenant_id,tag_id,app_name,content FROM config_info_tag WHERE data_id=? AND group_id=? AND tenant_id=? AND tag_id=?"; return databaseOperate .queryOne(sql, new Object[] {dataId, group, tenantTmp, tagTmp}, CONFIG_INFO_TAG_WRAPPER_ROW_MAPPER); @@ -833,7 +833,7 @@ public ConfigInfoTagWrapper findConfigInfo4Tag(final String dataId, final String public ConfigInfo findConfigInfoApp(final String dataId, final String group, final String tenant, final String appName) { String tenantTmp = StringUtils.isBlank(tenant) ? StringUtils.EMPTY : tenant; - final String sql = "SELECT ID,data_id,group_id,tenant_id,app_name,content FROM config_info WHERE data_id=? AND group_id=? AND tenant_id=? AND app_name=?"; + final String sql = "SELECT id,data_id,group_id,tenant_id,app_name,content FROM config_info WHERE data_id=? AND group_id=? AND tenant_id=? AND app_name=?"; return databaseOperate.queryOne(sql, new Object[] {dataId, group, tenantTmp, appName}, CONFIG_INFO_ROW_MAPPER); @@ -851,12 +851,12 @@ public ConfigInfo findConfigInfoAdvanceInfo(final String dataId, final String gr paramList.add(tenantTmp); StringBuilder sql = new StringBuilder( - "select ID,data_id,group_id,tenant_id,app_name,content from config_info where data_id=? and group_id=? and tenant_id=? "); + "SELECT id,data_id,group_id,tenant_id,app_name,content FROM config_info WHERE data_id=? AND group_id=? AND tenant_id=? "); if (StringUtils.isNotBlank(configTags)) { sql = new StringBuilder( - "select a.ID,a.data_id,a.group_id,a.tenant_id,a.app_name,a.content from config_info a left join " - + "config_tags_relation b on a.id=b.id where a.data_id=? and a.group_id=? and a.tenant_id=? "); - sql.append(" and b.tag_name in ("); + "SELECT a.id,a.data_id,a.group_id,a.tenant_id,a.app_name,a.content FROM config_info a LEFT JOIN " + + "config_tags_relation b ON a.id=b.id WHERE a.data_id=? AND a.group_id=? AND a.tenant_id=? "); + sql.append(" AND b.tag_name IN ("); String[] tagArr = configTags.split(","); for (int i = 0; i < tagArr.length; i++) { if (i != 0) { @@ -868,12 +868,12 @@ public ConfigInfo findConfigInfoAdvanceInfo(final String dataId, final String gr sql.append(") "); if (StringUtils.isNotBlank(appName)) { - sql.append(" and a.app_name=? "); + sql.append(" AND a.app_name=? "); paramList.add(appName); } } else { if (StringUtils.isNotBlank(appName)) { - sql.append(" and app_name=? "); + sql.append(" AND app_name=? "); paramList.add(appName); } } @@ -883,7 +883,7 @@ public ConfigInfo findConfigInfoAdvanceInfo(final String dataId, final String gr @Override public ConfigInfoBase findConfigInfoBase(final String dataId, final String group) { - final String sql = "SELECT ID,data_id,group_id,content FROM config_info WHERE data_id=? AND group_id=? AND tenant_id=?"; + final String sql = "SELECT id,data_id,group_id,content FROM config_info WHERE data_id=? AND group_id=? AND tenant_id=?"; return databaseOperate .queryOne(sql, new Object[] {dataId, group, StringUtils.EMPTY}, CONFIG_INFO_BASE_ROW_MAPPER); @@ -891,14 +891,14 @@ public ConfigInfoBase findConfigInfoBase(final String dataId, final String group @Override public ConfigInfo findConfigInfo(long id) { - final String sql = "SELECT ID,data_id,group_id,tenant_id,app_name,content FROM config_info WHERE ID=?"; + final String sql = "SELECT id,data_id,group_id,tenant_id,app_name,content FROM config_info WHERE id=?"; return databaseOperate.queryOne(sql, new Object[] {id}, CONFIG_INFO_ROW_MAPPER); } @Override public ConfigInfoWrapper findConfigInfo(final String dataId, final String group, final String tenant) { final String tenantTmp = StringUtils.isBlank(tenant) ? StringUtils.EMPTY : tenant; - final String sql = "SELECT ID,data_id,group_id,tenant_id,app_name,content,md5,type FROM config_info " + final String sql = "SELECT id,data_id,group_id,tenant_id,app_name,content,md5,type FROM config_info " + " WHERE data_id=? AND group_id=? AND tenant_id=?"; final Object[] args = new Object[] {dataId, group, tenantTmp}; return databaseOperate.queryOne(sql, args, CONFIG_INFO_WRAPPER_ROW_MAPPER); @@ -910,8 +910,8 @@ public Page findConfigInfoByDataId(final int pageNo, final int pageS final String tenant) { String tenantTmp = StringUtils.isBlank(tenant) ? StringUtils.EMPTY : tenant; PaginationHelper helper = createPaginationHelper(); - return helper.fetchPage("select count(*) from config_info where data_id=? and tenant_id=?", - "select ID,data_id,group_id,tenant_id,app_name,content from config_info where data_id=? and " + return helper.fetchPage("SELECT count(*) FROM config_info WHERE data_id=? AND tenant_id=?", + "SELECT id,data_id,group_id,tenant_id,app_name,content FROM config_info WHERE data_id=? AND " + "tenant_id=?", new Object[] {dataId, tenantTmp}, pageNo, pageSize, CONFIG_INFO_ROW_MAPPER); } @@ -920,9 +920,9 @@ public Page findConfigInfoByDataIdAndApp(final int pageNo, final int final String tenant, final String appName) { String tenantTmp = StringUtils.isBlank(tenant) ? StringUtils.EMPTY : tenant; PaginationHelper helper = createPaginationHelper(); - return helper.fetchPage("select count(*) from config_info where data_id=? and tenant_id=? and app_name=?", - "select ID,data_id,group_id,tenant_id,app_name,content from config_info where data_id=? and " - + "tenant_id=? and app_name=?", new Object[] {dataId, tenantTmp, appName}, pageNo, pageSize, + return helper.fetchPage("SELECT count(*) FROM config_info WHERE data_id=? AND tenant_id=? AND app_name=?", + "SELECT id,data_id,group_id,tenant_id,app_name,content FROM config_info WHERE data_id=? AND " + + "tenant_id=? AND app_name=?", new Object[] {dataId, tenantTmp, appName}, pageNo, pageSize, CONFIG_INFO_ROW_MAPPER); } @@ -932,22 +932,22 @@ public Page findConfigInfoByDataIdAndAdvance(final int pageNo, final String tenantTmp = StringUtils.isBlank(tenant) ? StringUtils.EMPTY : tenant; final String appName = configAdvanceInfo == null ? null : (String) configAdvanceInfo.get("appName"); final String configTags = configAdvanceInfo == null ? null : (String) configAdvanceInfo.get("config_tags"); - StringBuilder sqlCount = new StringBuilder("select count(*) from config_info where data_id=? and tenant_id=? "); + StringBuilder sqlCount = new StringBuilder("SELECT count(*) FROM config_info WHERE data_id=? AND tenant_id=? "); StringBuilder sql = new StringBuilder( - "select ID,data_id,group_id,tenant_id,app_name,content from config_info where data_id=? and tenant_id=? "); + "SELECT id,data_id,group_id,tenant_id,app_name,content FROM config_info WHERE data_id=? AND tenant_id=? "); List paramList = new ArrayList(); paramList.add(dataId); paramList.add(tenantTmp); if (StringUtils.isNotBlank(configTags)) { sqlCount = new StringBuilder( - "select count(*) from config_info a left join config_tags_relation b on a.id=b.id where a.data_id=? and a.tenant_id=? "); + "SELECT count(*) FROM config_info a LEFT JOIN config_tags_relation b ON a.id=b.id WHERE a.data_id=? AND a.tenant_id=? "); sql = new StringBuilder( - "select a.ID,a.data_id,a.group_id,a.tenant_id,a.app_name,a.content from config_info a left join " - + "config_tags_relation b on a.id=b.id where a.data_id=? and a.tenant_id=? "); + "SELECT a.id,a.data_id,a.group_id,a.tenant_id,a.app_name,a.content FROM config_info a LEFT JOIN " + + "config_tags_relation b ON a.id=b.id WHERE a.data_id=? AND a.tenant_id=? "); - sqlCount.append(" and b.tag_name in ("); - sql.append(" and b.tag_name in ("); + sqlCount.append(" AND b.tag_name IN ("); + sql.append(" AND b.tag_name IN ("); String[] tagArr = configTags.split(","); for (int i = 0; i < tagArr.length; i++) { if (i != 0) { @@ -962,14 +962,14 @@ public Page findConfigInfoByDataIdAndAdvance(final int pageNo, final sql.append(") "); if (StringUtils.isNotBlank(appName)) { - sqlCount.append(" and a.app_name=? "); - sql.append(" and a.app_name=? "); + sqlCount.append(" AND a.app_name=? "); + sql.append(" AND a.app_name=? "); paramList.add(appName); } } else { if (StringUtils.isNotBlank(appName)) { - sqlCount.append(" and app_name=? "); - sql.append(" and app_name=? "); + sqlCount.append(" AND app_name=? "); + sql.append(" AND app_name=? "); paramList.add(appName); } } @@ -985,32 +985,32 @@ public Page findConfigInfo4Page(final int pageNo, final int pageSize String tenantTmp = StringUtils.isBlank(tenant) ? StringUtils.EMPTY : tenant; final String appName = configAdvanceInfo == null ? null : (String) configAdvanceInfo.get("appName"); final String configTags = configAdvanceInfo == null ? null : (String) configAdvanceInfo.get("config_tags"); - String sqlCount = "select count(*) from config_info"; - String sql = "select ID,data_id,group_id,tenant_id,app_name,content,type from config_info"; - StringBuilder where = new StringBuilder(" where "); + String sqlCount = "SELECT count(*) FROM config_info"; + String sql = "SELECT id,data_id,group_id,tenant_id,app_name,content,type FROM config_info"; + StringBuilder where = new StringBuilder(" WHERE "); List paramList = new ArrayList(); paramList.add(tenantTmp); if (StringUtils.isNotBlank(configTags)) { - sqlCount = "select count(*) from config_info a left join config_tags_relation b on a.id=b.id"; - sql = "select a.ID,a.data_id,a.group_id,a.tenant_id,a.app_name,a.content from config_info a left join " - + "config_tags_relation b on a.id=b.id"; + sqlCount = "SELECT count(*) FROM config_info a LEFT JOIN config_tags_relation b ON a.id=b.id"; + sql = "SELECT a.id,a.data_id,a.group_id,a.tenant_id,a.app_name,a.content FROM config_info a LEFT JOIN " + + "config_tags_relation b ON a.id=b.id"; where.append(" a.tenant_id=? "); if (StringUtils.isNotBlank(dataId)) { - where.append(" and a.data_id=? "); + where.append(" AND a.data_id=? "); paramList.add(dataId); } if (StringUtils.isNotBlank(group)) { - where.append(" and a.group_id=? "); + where.append(" AND a.group_id=? "); paramList.add(group); } if (StringUtils.isNotBlank(appName)) { - where.append(" and a.app_name=? "); + where.append(" AND a.app_name=? "); paramList.add(appName); } - where.append(" and b.tag_name in ("); + where.append(" AND b.tag_name IN ("); String[] tagArr = configTags.split(","); for (int i = 0; i < tagArr.length; i++) { if (i != 0) { @@ -1023,15 +1023,15 @@ public Page findConfigInfo4Page(final int pageNo, final int pageSize } else { where.append(" tenant_id=? "); if (StringUtils.isNotBlank(dataId)) { - where.append(" and data_id=? "); + where.append(" AND data_id=? "); paramList.add(dataId); } if (StringUtils.isNotBlank(group)) { - where.append(" and group_id=? "); + where.append(" AND group_id=? "); paramList.add(group); } if (StringUtils.isNotBlank(appName)) { - where.append(" and app_name=? "); + where.append(" AND app_name=? "); paramList.add(appName); } } @@ -1044,8 +1044,8 @@ public Page findConfigInfo4Page(final int pageNo, final int pageSize @Override public Page findConfigInfoBaseByDataId(final int pageNo, final int pageSize, final String dataId) { PaginationHelper helper = createPaginationHelper(); - return helper.fetchPage("select count(*) from config_info where data_id=? and tenant_id=?", - "select ID,data_id,group_id,content from config_info where data_id=? and tenant_id=?", + return helper.fetchPage("SELECT count(*) FROM config_info WHERE data_id=? AND tenant_id=?", + "SELECT id,data_id,group_id,content FROM config_info WHERE data_id=? AND tenant_id=?", new Object[] {dataId, StringUtils.EMPTY}, pageNo, pageSize, CONFIG_INFO_BASE_ROW_MAPPER); } @@ -1055,8 +1055,8 @@ public Page findConfigInfoByGroup(final int pageNo, final int pageSi final String tenant) { String tenantTmp = StringUtils.isBlank(tenant) ? StringUtils.EMPTY : tenant; PaginationHelper helper = createPaginationHelper(); - return helper.fetchPage("select count(*) from config_info where group_id=? and tenant_id=?", - "select ID,data_id,group_id,tenant_id,app_name,content from config_info where group_id=? and " + return helper.fetchPage("SELECT count(*) FROM config_info WHERE group_id=? AND tenant_id=?", + "SELECT id,data_id,group_id,tenant_id,app_name,content FROM config_info WHERE group_id=? AND " + "tenant_id=?", new Object[] {group, tenantTmp}, pageNo, pageSize, CONFIG_INFO_ROW_MAPPER); } @@ -1066,9 +1066,9 @@ public Page findConfigInfoByGroupAndApp(final int pageNo, final int final String tenant, final String appName) { String tenantTmp = StringUtils.isBlank(tenant) ? StringUtils.EMPTY : tenant; PaginationHelper helper = createPaginationHelper(); - return helper.fetchPage("select count(*) from config_info where group_id=? and tenant_id=? and app_name =?", - "select ID,data_id,group_id,tenant_id,app_name,content from config_info where group_id=? and " - + "tenant_id=? and app_name =?", new Object[] {group, tenantTmp, appName}, pageNo, pageSize, + return helper.fetchPage("SELECT count(*) FROM config_info WHERE group_id=? AND tenant_id=? AND app_name =?", + "SELECT id,data_id,group_id,tenant_id,app_name,content FROM config_info WHERE group_id=? AND " + + "tenant_id=? AND app_name =?", new Object[] {group, tenantTmp, appName}, pageNo, pageSize, CONFIG_INFO_ROW_MAPPER); } @@ -1081,21 +1081,21 @@ public Page findConfigInfoByGroupAndAdvance(final int pageNo, final final String appName = configAdvanceInfo == null ? null : (String) configAdvanceInfo.get("appName"); final String configTags = configAdvanceInfo == null ? null : (String) configAdvanceInfo.get("config_tags"); StringBuilder sqlCount = new StringBuilder( - "select count(*) from config_info where group_id=? and tenant_id=? "); + "SELECT count(*) FROM config_info WHERE group_id=? AND tenant_id=? "); StringBuilder sql = new StringBuilder( - "select ID,data_id,group_id,tenant_id,app_name,content from config_info where group_id=? and tenant_id=? "); + "SELECT id,data_id,group_id,tenant_id,app_name,content FROM config_info WHERE group_id=? AND tenant_id=? "); List paramList = new ArrayList(); paramList.add(group); paramList.add(tenantTmp); if (StringUtils.isNotBlank(configTags)) { sqlCount = new StringBuilder( - "select count(*) from config_info a left join config_tags_relation b on a.id=b.id where a.group_id=? and a.tenant_id=? "); + "SELECT count(*) FROM config_info a LEFT JOIN config_tags_relation b ON a.id=b.id WHERE a.group_id=? AND a.tenant_id=? "); sql = new StringBuilder( - "select a.ID,a.data_id,a.group_id,a.tenant_id,a.app_name,a.content from config_info a left join " - + "config_tags_relation b on a.id=b.id where a.group_id=? and a.tenant_id=? "); + "SELECT a.id,a.data_id,a.group_id,a.tenant_id,a.app_name,a.content FROM config_info a LEFT JOIN " + + "config_tags_relation b ON a.id=b.id WHERE a.group_id=? AND a.tenant_id=? "); - sqlCount.append(" and b.tag_name in ("); - sql.append(" and b.tag_name in ("); + sqlCount.append(" AND b.tag_name IN ("); + sql.append(" AND b.tag_name IN ("); String[] tagArr = configTags.split(","); for (int i = 0; i < tagArr.length; i++) { if (i != 0) { @@ -1110,14 +1110,14 @@ public Page findConfigInfoByGroupAndAdvance(final int pageNo, final sql.append(") "); if (StringUtils.isNotBlank(appName)) { - sqlCount.append(" and a.app_name=? "); - sql.append(" and a.app_name=? "); + sqlCount.append(" AND a.app_name=? "); + sql.append(" AND a.app_name=? "); paramList.add(appName); } } else { if (StringUtils.isNotBlank(appName)) { - sqlCount.append(" and app_name=? "); - sql.append(" and app_name=? "); + sqlCount.append(" AND app_name=? "); + sql.append(" AND app_name=? "); paramList.add(appName); } } @@ -1132,8 +1132,8 @@ public Page findConfigInfoByApp(final int pageNo, final int pageSize final String appName) { String tenantTmp = StringUtils.isBlank(tenant) ? StringUtils.EMPTY : tenant; PaginationHelper helper = createPaginationHelper(); - return helper.fetchPage("select count(*) from config_info where tenant_id like ? and app_name=?", - "select ID,data_id,group_id,tenant_id,app_name,content from config_info where tenant_id like ? and " + return helper.fetchPage("SELECT count(*) FROM config_info WHERE tenant_id LIKE ? AND app_name=?", + "SELECT ID,data_id,group_id,tenant_id,app_name,content FROM config_info WHERE tenant_id LIKE ? AND " + "app_name=?", new Object[] {generateLikeArgument(tenantTmp), appName}, pageNo, pageSize, CONFIG_INFO_ROW_MAPPER); @@ -1145,21 +1145,21 @@ public Page findConfigInfoByAdvance(final int pageNo, final int page String tenantTmp = StringUtils.isBlank(tenant) ? StringUtils.EMPTY : tenant; final String appName = configAdvanceInfo == null ? null : (String) configAdvanceInfo.get("appName"); final String configTags = configAdvanceInfo == null ? null : (String) configAdvanceInfo.get("config_tags"); - StringBuilder sqlCount = new StringBuilder("select count(*) from config_info where tenant_id like ? "); + StringBuilder sqlCount = new StringBuilder("SELECT count(*) FROM config_info WHERE tenant_id LIKE ? "); StringBuilder sql = new StringBuilder( - "select ID,data_id,group_id,tenant_id,app_name,content from config_info where tenant_id like ? "); + "SELECT id,data_id,group_id,tenant_id,app_name,content FROM config_info where tenant_id LIKE ? "); List paramList = new ArrayList(); paramList.add(tenantTmp); if (StringUtils.isNotBlank(configTags)) { sqlCount = new StringBuilder( - "select count(*) from config_info a left join config_tags_relation b on a.id=b.id where a.tenant_id=? "); + "SELECT count(*) FROM config_info a LEFT JOIN config_tags_relation b ON a.id=b.id WHERE a.tenant_id=? "); sql = new StringBuilder( - "select a.ID,a.data_id,a.group_id,a.tenant_id,a.app_name,a.content from config_info a left join " - + "config_tags_relation b on a.id=b.id where a.tenant_id=? "); + "SELECT a.id,a.data_id,a.group_id,a.tenant_id,a.app_name,a.content FROM config_info a LEFT JOIN " + + "config_tags_relation b ON a.id=b.id WHERE a.tenant_id=? "); - sqlCount.append(" and b.tag_name in ("); - sql.append(" and b.tag_name in ("); + sqlCount.append(" AND b.tag_name IN ("); + sql.append(" AND b.tag_name IN ("); String[] tagArr = configTags.split(","); for (int i = 0; i < tagArr.length; i++) { if (i != 0) { @@ -1174,14 +1174,14 @@ public Page findConfigInfoByAdvance(final int pageNo, final int page sql.append(") "); if (StringUtils.isNotBlank(appName)) { - sqlCount.append(" and a.app_name=? "); - sql.append(" and a.app_name=? "); + sqlCount.append(" AND a.app_name=? "); + sql.append(" AND a.app_name=? "); paramList.add(appName); } } else { if (StringUtils.isNotBlank(appName)) { - sqlCount.append(" and app_name=? "); - sql.append(" and app_name=? "); + sqlCount.append(" AND app_name=? "); + sql.append(" AND app_name=? "); paramList.add(appName); } } @@ -1194,14 +1194,14 @@ public Page findConfigInfoByAdvance(final int pageNo, final int page @Override public Page findConfigInfoBaseByGroup(final int pageNo, final int pageSize, final String group) { PaginationHelper helper = createPaginationHelper(); - return helper.fetchPage("select count(*) from config_info where group_id=? and tenant_id=?", - "select ID,data_id,group_id,content from config_info where group_id=? and tenant_id=?", + return helper.fetchPage("SELECT count(*) FROM config_info WHERE group_id=? AND tenant_id=?", + "SELECT id,data_id,group_id,content FROM config_info WHERE group_id=? AND tenant_id=?", new Object[] {group, StringUtils.EMPTY}, pageNo, pageSize, CONFIG_INFO_BASE_ROW_MAPPER); } @Override public int configInfoCount() { - String sql = " SELECT COUNT(ID) FROM config_info "; + String sql = " SELECT count(*) FROM config_info "; Integer result = databaseOperate.queryOne(sql, Integer.class); if (result == null) { throw new IllegalArgumentException("configInfoCount error"); @@ -1211,7 +1211,7 @@ public int configInfoCount() { @Override public int configInfoCount(String tenant) { - String sql = " SELECT COUNT(ID) FROM config_info where tenant_id like ?"; + String sql = " SELECT count(*) FROM config_info WHERE tenant_id LIKE ?"; Integer result = databaseOperate.queryOne(sql, new Object[] {tenant}, Integer.class); if (result == null) { throw new IllegalArgumentException("configInfoCount error"); @@ -1221,7 +1221,7 @@ public int configInfoCount(String tenant) { @Override public int configInfoBetaCount() { - String sql = " SELECT COUNT(ID) FROM config_info_beta "; + String sql = " SELECT count(*) FROM config_info_beta "; Integer result = databaseOperate.queryOne(sql, Integer.class); if (result == null) { throw new IllegalArgumentException("configInfoBetaCount error"); @@ -1231,7 +1231,7 @@ public int configInfoBetaCount() { @Override public int configInfoTagCount() { - String sql = " SELECT COUNT(ID) FROM config_info_tag "; + String sql = " SELECT count(*) FROM config_info_tag "; Integer result = databaseOperate.queryOne(sql, Integer.class); if (result == null) { throw new IllegalArgumentException("configInfoBetaCount error"); @@ -1268,7 +1268,7 @@ public List getGroupIdList(int page, int pageSize) { @Override public int aggrConfigInfoCount(String dataId, String group, String tenant) { String tenantTmp = StringUtils.isBlank(tenant) ? StringUtils.EMPTY : tenant; - String sql = " SELECT COUNT(ID) FROM config_info_aggr WHERE data_id = ? AND group_id = ? AND tenant_id = ?"; + String sql = " SELECT count(*) FROM config_info_aggr WHERE data_id = ? AND group_id = ? AND tenant_id = ?"; Integer result = databaseOperate.queryOne(sql, new Object[] {dataId, group, tenantTmp}, Integer.class); if (result == null) { throw new IllegalArgumentException("aggrConfigInfoCount error"); @@ -1283,11 +1283,11 @@ public int aggrConfigInfoCount(String dataId, String group, String tenant, List< } final String tenantTmp = StringUtils.isBlank(tenant) ? StringUtils.EMPTY : tenant; StringBuilder sql = new StringBuilder( - " SELECT COUNT(*) FROM config_info_aggr WHERE data_id = ? and group_id = ? and tenant_id = ? and datum_id"); + " SELECT count(*) FROM config_info_aggr WHERE data_id = ? AND group_id = ? AND tenant_id = ? AND datum_id"); if (isIn) { - sql.append(" in ("); + sql.append(" IN ("); } else { - sql.append(" not in ("); + sql.append(" NOT IN ("); } for (int i = 0, size = datumIds.size(); i < size; i++) { if (i > 0) { @@ -1320,9 +1320,9 @@ public int aggrConfigInfoCountNotIn(String dataId, String group, String tenant, @Override public Page findAllConfigInfo(final int pageNo, final int pageSize, final String tenant) { String tenantTmp = StringUtils.isBlank(tenant) ? StringUtils.EMPTY : tenant; - String sqlCountRows = "SELECT COUNT(*) FROM config_info"; + String sqlCountRows = "SELECT count(*) FROM config_info"; String sqlFetchRows = " SELECT t.id,data_id,group_id,tenant_id,app_name,content,md5 " - + " FROM ( SELECT id FROM config_info WHERE tenant_id like ? ORDER BY id LIMIT ?,? )" + + " FROM ( SELECT id FROM config_info WHERE tenant_id LIKE ? ORDER BY id LIMIT ?,? )" + " g, config_info t WHERE g.id = t.id "; PaginationHelper helper = createPaginationHelper(); @@ -1367,7 +1367,7 @@ public Page findAllConfigKey(final int pageNo, final int pageSize, fi @Override public Page findAllConfigInfoBase(final int pageNo, final int pageSize) { - String sqlCountRows = "SELECT COUNT(*) FROM config_info"; + String sqlCountRows = "SELECT count(*) FROM config_info"; String sqlFetchRows = "SELECT t.id,data_id,group_id,content,md5 " + " FROM ( SELECT id FROM config_info ORDER BY id LIMIT ?,? ) " + " g, config_info t WHERE g.id = t.id "; @@ -1381,7 +1381,7 @@ public Page findAllConfigInfoBase(final int pageNo, final int pa @Override public Page findAllConfigInfoForDumpAll(final int pageNo, final int pageSize) { - String sqlCountRows = "select count(*) from config_info"; + String sqlCountRows = "SELECT count(*) FROM config_info"; String sqlFetchRows = " SELECT t.id,data_id,group_id,tenant_id,app_name,content,type,md5,gmt_modified " + " FROM ( SELECT id FROM config_info ORDER BY id LIMIT ?,? )" + " g, config_info t WHERE g.id = t.id "; @@ -1396,8 +1396,8 @@ public Page findAllConfigInfoForDumpAll(final int pageNo, fin @Override public Page findAllConfigInfoFragment(final long lastMaxId, final int pageSize) { String select = - "SELECT id,data_id,group_id,tenant_id,app_name,content,md5,gmt_modified,type from config_info where id > ? " - + "order by id asc limit ?,?"; + "SELECT id,data_id,group_id,tenant_id,app_name,content,md5,gmt_modified,type FROM config_info WHERE id > ? " + + "ORDER BY id ASC LIMIT ?,?"; PaginationHelper helper = createPaginationHelper(); return helper.fetchPageLimit(select, new Object[] {lastMaxId, 0, pageSize}, 1, pageSize, CONFIG_INFO_WRAPPER_ROW_MAPPER); @@ -1406,7 +1406,7 @@ public Page findAllConfigInfoFragment(final long lastMaxId, f @Override public Page findAllConfigInfoBetaForDumpAll(final int pageNo, final int pageSize) { - String sqlCountRows = "SELECT COUNT(*) FROM config_info_beta"; + String sqlCountRows = "SELECT count(*) FROM config_info_beta"; String sqlFetchRows = " SELECT t.id,data_id,group_id,tenant_id,app_name,content,md5,gmt_modified,beta_ips " + " FROM ( SELECT id FROM config_info_beta ORDER BY id LIMIT ?,? )" + " g, config_info_beta t WHERE g.id = t.id "; @@ -1419,7 +1419,7 @@ public Page findAllConfigInfoBetaForDumpAll(final int pag @Override public Page findAllConfigInfoTagForDumpAll(final int pageNo, final int pageSize) { - String sqlCountRows = "SELECT COUNT(*) FROM config_info_tag"; + String sqlCountRows = "SELECT count(*) FROM config_info_tag"; String sqlFetchRows = " SELECT t.id,data_id,group_id,tenant_id,tag_id,app_name,content,md5,gmt_modified " + " FROM ( SELECT id FROM config_info_tag ORDER BY id LIMIT ?,? ) " + " g, config_info_tag t WHERE g.id = t.id "; @@ -1447,7 +1447,7 @@ public List findConfigInfoByBatch(final List dataIds, final } List result = new ArrayList(dataIds.size()); - String sqlStart = "select data_id, group_id, tenant_id, app_name, content from config_info where group_id = ? and tenant_id = ? and data_id in ("; + String sqlStart = "SELECT data_id, group_id, tenant_id, app_name, content FROM config_info WHERE group_id = ? AND tenant_id = ? AND data_id IN ("; String sqlEnd = ")"; StringBuilder subQuerySql = new StringBuilder(); @@ -1491,29 +1491,29 @@ public Page findConfigInfoLike(final int pageNo, final int pageSize, } } - final String sqlCountRows = "select count(*) from config_info where "; - final String sqlFetchRows = "select ID,data_id,group_id,tenant_id,app_name,content from config_info where "; + final String sqlCountRows = "SELECT count(*) FROM config_info WHERE "; + final String sqlFetchRows = "SELECT id,data_id,group_id,tenant_id,app_name,content FROM config_info WHERE "; String where = " 1=1 "; List params = new ArrayList(); if (!StringUtils.isBlank(dataId)) { - where += " and data_id like ? "; + where += " AND data_id LIKE ? "; params.add(generateLikeArgument(dataId)); } if (!StringUtils.isBlank(group)) { - where += " and group_id like ? "; + where += " AND group_id LIKE ? "; params.add(generateLikeArgument(group)); } - where += " and tenant_id like ? "; + where += " AND tenant_id LIKE ? "; params.add(generateLikeArgument(tenantTmp)); if (!StringUtils.isBlank(appName)) { - where += " and app_name = ? "; + where += " AND app_name = ? "; params.add(appName); } if (!StringUtils.isBlank(content)) { - where += " and content like ? "; + where += " AND content LIKE ? "; params.add(generateLikeArgument(content)); } PaginationHelper helper = createPaginationHelper(); @@ -1525,8 +1525,8 @@ public Page findConfigInfoLike(final int pageNo, final int pageSize, @Override public Page findConfigInfoLike(final int pageNo, final int pageSize, final ConfigKey[] configKeys, final boolean blacklist) { - String sqlCountRows = "select count(*) from config_info where "; - String sqlFetchRows = "select ID,data_id,group_id,tenant_id,app_name,content from config_info where "; + String sqlCountRows = "SELECT count(*) FROM config_info WHERE "; + String sqlFetchRows = "SELECT id,data_id,group_id,tenant_id,app_name,content FROM config_info WHERE "; StringBuilder where = new StringBuilder(" 1=1 "); // White list, please synchronize the condition is empty, there is no qualified configuration if (configKeys.length == 0 && !blacklist) { @@ -1548,29 +1548,29 @@ public Page findConfigInfoLike(final int pageNo, final int pageSize, if (blacklist) { if (isFirst) { isFirst = false; - where.append(" and "); + where.append(" AND "); } else { - where.append(" and "); + where.append(" AND "); } where.append("("); boolean isFirstSub = true; if (!StringUtils.isBlank(dataId)) { - where.append(" data_id not like ? "); + where.append(" data_id NOT LIKE ? "); params.add(generateLikeArgument(dataId)); isFirstSub = false; } if (!StringUtils.isBlank(group)) { if (!isFirstSub) { - where.append(" or "); + where.append(" OR "); } - where.append(" group_id not like ? "); + where.append(" group_id NOT LIKE ? "); params.add(generateLikeArgument(group)); isFirstSub = false; } if (!StringUtils.isBlank(appName)) { if (!isFirstSub) { - where.append(" or "); + where.append(" OR "); } where.append(" app_name != ? "); params.add(appName); @@ -1580,28 +1580,28 @@ public Page findConfigInfoLike(final int pageNo, final int pageSize, } else { if (isFirst) { isFirst = false; - where.append(" and "); + where.append(" AND "); } else { - where.append(" or "); + where.append(" OR "); } where.append("("); boolean isFirstSub = true; if (!StringUtils.isBlank(dataId)) { - where.append(" data_id like ? "); + where.append(" data_id LIKE ? "); params.add(generateLikeArgument(dataId)); isFirstSub = false; } if (!StringUtils.isBlank(group)) { if (!isFirstSub) { - where.append(" and "); + where.append(" AND "); } - where.append(" group_id like ? "); + where.append(" group_id LIKE ? "); params.add(generateLikeArgument(group)); isFirstSub = false; } if (!StringUtils.isBlank(appName)) { if (!isFirstSub) { - where.append(" and "); + where.append(" AND "); } where.append(" app_name = ? "); params.add(appName); @@ -1624,36 +1624,36 @@ public Page findConfigInfoLike4Page(final int pageNo, final int page final String appName = configAdvanceInfo == null ? null : (String) configAdvanceInfo.get("appName"); final String content = configAdvanceInfo == null ? null : (String) configAdvanceInfo.get("content"); final String configTags = configAdvanceInfo == null ? null : (String) configAdvanceInfo.get("config_tags"); - String sqlCountRows = "select count(*) from config_info"; - String sqlFetchRows = "select ID,data_id,group_id,tenant_id,app_name,content from config_info"; - StringBuilder where = new StringBuilder(" where "); + String sqlCountRows = "SELECT count(*) FROM config_info"; + String sqlFetchRows = "SELECT id,data_id,group_id,tenant_id,app_name,content FROM config_info"; + StringBuilder where = new StringBuilder(" WHERE "); List params = new ArrayList(); params.add(generateLikeArgument(tenantTmp)); if (StringUtils.isNotBlank(configTags)) { - sqlCountRows = "select count(*) from config_info a left join config_tags_relation b on a.id=b.id "; + sqlCountRows = "SELECT count(*) FROM config_info a LEFT JOIN config_tags_relation b ON a.id=b.id "; sqlFetchRows = - "select a.ID,a.data_id,a.group_id,a.tenant_id,a.app_name,a.content from config_info a left join " - + "config_tags_relation b on a.id=b.id "; + "SELECT a.ID,a.data_id,a.group_id,a.tenant_id,a.app_name,a.content FROM config_info a LEFT JOIN " + + "config_tags_relation b ON a.id=b.id "; - where.append(" a.tenant_id like ? "); + where.append(" a.tenant_id LIKE ? "); if (!StringUtils.isBlank(dataId)) { - where.append(" and a.data_id like ? "); + where.append(" AND a.data_id LIKE ? "); params.add(generateLikeArgument(dataId)); } if (!StringUtils.isBlank(group)) { - where.append(" and a.group_id like ? "); + where.append(" AND a.group_id LIKE ? "); params.add(generateLikeArgument(group)); } if (!StringUtils.isBlank(appName)) { - where.append(" and a.app_name = ? "); + where.append(" AND a.app_name = ? "); params.add(appName); } if (!StringUtils.isBlank(content)) { - where.append(" and a.content like ? "); + where.append(" AND a.content LIKE ? "); params.add(generateLikeArgument(content)); } - where.append(" and b.tag_name in ("); + where.append(" AND b.tag_name IN ("); String[] tagArr = configTags.split(","); for (int i = 0; i < tagArr.length; i++) { if (i != 0) { @@ -1664,21 +1664,21 @@ public Page findConfigInfoLike4Page(final int pageNo, final int page } where.append(") "); } else { - where.append(" tenant_id like ? "); + where.append(" tenant_id LIKE ? "); if (!StringUtils.isBlank(dataId)) { - where.append(" and data_id like ? "); + where.append(" AND data_id LIKE ? "); params.add(generateLikeArgument(dataId)); } if (!StringUtils.isBlank(group)) { - where.append(" and group_id like ? "); + where.append(" AND group_id LIKE ? "); params.add(generateLikeArgument(group)); } if (!StringUtils.isBlank(appName)) { - where.append(" and app_name = ? "); + where.append(" AND app_name = ? "); params.add(appName); } if (!StringUtils.isBlank(content)) { - where.append(" and content like ? "); + where.append(" AND content LIKE ? "); params.add(generateLikeArgument(content)); } } @@ -1695,21 +1695,21 @@ public Page findConfigInfoBaseLike(final int pageNo, final int p throw new IOException("invalid param"); } - final String sqlCountRows = "select count(*) from config_info where "; - final String sqlFetchRows = "select ID,data_id,group_id,tenant_id,content from config_info where "; - String where = " 1=1 and tenant_id='' "; + final String sqlCountRows = "SELECT count(*) FROM config_info WHERE "; + final String sqlFetchRows = "SELECT id,data_id,group_id,tenant_id,content FROM config_info WHERE "; + String where = " 1=1 AND tenant_id='' "; List params = new ArrayList(); if (!StringUtils.isBlank(dataId)) { - where += " and data_id like ? "; + where += " AND data_id LIKE ? "; params.add(generateLikeArgument(dataId)); } if (!StringUtils.isBlank(group)) { - where += " and group_id like ? "; + where += " AND group_id LIKE ? "; params.add(generateLikeArgument(group)); } if (!StringUtils.isBlank(content)) { - where += " and content like ? "; + where += " AND content LIKE ? "; params.add(generateLikeArgument(content)); } PaginationHelper helper = createPaginationHelper(); @@ -1745,10 +1745,10 @@ public List findConfigInfoAggr(String dataId, String group, Stri public Page findConfigInfoAggrByPage(String dataId, String group, String tenant, final int pageNo, final int pageSize) { String tenantTmp = StringUtils.isBlank(tenant) ? StringUtils.EMPTY : tenant; - String sqlCountRows = "SELECT COUNT(*) FROM config_info_aggr WHERE data_id = ? and group_id = ? and tenant_id = ?"; + String sqlCountRows = "SELECT count(*) FROM config_info_aggr WHERE data_id = ? AND group_id = ? AND tenant_id = ?"; String sqlFetchRows = - "select data_id,group_id,tenant_id,datum_id,app_name,content from config_info_aggr where data_id=? and " - + "group_id=? and tenant_id=? order by datum_id limit ?,?"; + "SELECT data_id,group_id,tenant_id,datum_id,app_name,content FROM config_info_aggr WHERE data_id=? AND " + + "group_id=? AND tenant_id=? ORDER BY datum_id LIMIT ?,?"; PaginationHelper helper = createPaginationHelper(); return helper.fetchPageLimit(sqlCountRows, new Object[] {dataId, group, tenantTmp}, sqlFetchRows, new Object[] {dataId, group, tenantTmp, (pageNo - 1) * pageSize, pageSize}, pageNo, pageSize, @@ -1760,8 +1760,8 @@ public Page findConfigInfoAggrByPage(String dataId, String group public Page findConfigInfoAggrLike(final int pageNo, final int pageSize, ConfigKey[] configKeys, boolean blacklist) { - String sqlCountRows = "select count(*) from config_info_aggr where "; - String sqlFetchRows = "select data_id,group_id,tenant_id,datum_id,app_name,content from config_info_aggr where "; + String sqlCountRows = "SELECT count(*) FROM config_info_aggr WHERE "; + String sqlFetchRows = "SELECT data_id,group_id,tenant_id,datum_id,app_name,content FROM config_info_aggr WHERE "; StringBuilder where = new StringBuilder(" 1=1 "); // White list, please synchronize the condition is empty, there is no qualified configuration if (configKeys.length == 0 && blacklist == false) { @@ -1782,29 +1782,29 @@ public Page findConfigInfoAggrLike(final int pageNo, final int p if (blacklist) { if (isFirst) { isFirst = false; - where.append(" and "); + where.append(" AND "); } else { - where.append(" and "); + where.append(" AND "); } where.append("("); boolean isFirstSub = true; if (!StringUtils.isBlank(dataId)) { - where.append(" data_id not like ? "); + where.append(" data_id NOT LIKE ? "); params.add(generateLikeArgument(dataId)); isFirstSub = false; } if (!StringUtils.isBlank(group)) { if (!isFirstSub) { - where.append(" or "); + where.append(" OR "); } - where.append(" group_id not like ? "); + where.append(" group_id NOT LIKE ? "); params.add(generateLikeArgument(group)); isFirstSub = false; } if (!StringUtils.isBlank(appName)) { if (!isFirstSub) { - where.append(" or "); + where.append(" OR "); } where.append(" app_name != ? "); params.add(appName); @@ -1814,28 +1814,28 @@ public Page findConfigInfoAggrLike(final int pageNo, final int p } else { if (isFirst) { isFirst = false; - where.append(" and "); + where.append(" AND "); } else { - where.append(" or "); + where.append(" OR "); } where.append("("); boolean isFirstSub = true; if (!StringUtils.isBlank(dataId)) { - where.append(" data_id like ? "); + where.append(" data_id LIKE ? "); params.add(generateLikeArgument(dataId)); isFirstSub = false; } if (!StringUtils.isBlank(group)) { if (!isFirstSub) { - where.append(" and "); + where.append(" AND "); } - where.append(" group_id like ? "); + where.append(" group_id LIKE ? "); params.add(generateLikeArgument(group)); isFirstSub = false; } if (!StringUtils.isBlank(appName)) { if (!isFirstSub) { - where.append(" and "); + where.append(" AND "); } where.append(" app_name = ? "); params.add(appName); @@ -1881,35 +1881,35 @@ public Page findChangeConfig(final String dataId, final Strin final String appName, final Timestamp startTime, final Timestamp endTime, final int pageNo, final int pageSize, final long lastMaxId) { String tenantTmp = StringUtils.isBlank(tenant) ? StringUtils.EMPTY : tenant; - final String sqlCountRows = "select count(*) from config_info where "; - final String sqlFetchRows = "select id,data_id,group_id,tenant_id,app_name,content,type,md5,gmt_modified from config_info where "; + final String sqlCountRows = "SELECT count(*) FROM config_info WHERE "; + final String sqlFetchRows = "SELECT id,data_id,group_id,tenant_id,app_name,content,type,md5,gmt_modified FROM config_info WHERE "; String where = " 1=1 "; List params = new ArrayList(); if (!StringUtils.isBlank(dataId)) { - where += " and data_id like ? "; + where += " AND data_id LIKE ? "; params.add(generateLikeArgument(dataId)); } if (!StringUtils.isBlank(group)) { - where += " and group_id like ? "; + where += " AND group_id LIKE ? "; params.add(generateLikeArgument(group)); } if (!StringUtils.isBlank(tenantTmp)) { - where += " and tenant_id = ? "; + where += " AND tenant_id = ? "; params.add(tenantTmp); } if (!StringUtils.isBlank(appName)) { - where += " and app_name = ? "; + where += " AND app_name = ? "; params.add(appName); } if (startTime != null) { - where += " and gmt_modified >=? "; + where += " AND gmt_modified >=? "; params.add(startTime); } if (endTime != null) { - where += " and gmt_modified <=? "; + where += " AND gmt_modified <=? "; params.add(endTime); } PaginationHelper helper = createPaginationHelper(); @@ -2004,7 +2004,7 @@ public void removeConfigInfoByIdsAtomic(final String ids) { return; } StringBuilder sql = new StringBuilder(SQL_DELETE_CONFIG_INFO_BY_IDS); - sql.append("id in ("); + sql.append("id IN ("); List paramList = new ArrayList<>(); String[] tagArr = ids.split(","); for (int i = 0; i < tagArr.length; i++) { @@ -2073,7 +2073,7 @@ private void updateConfigInfoAtomicCas(final ConfigInfo configInfo, final String final String schema = configAdvanceInfo == null ? null : (String) configAdvanceInfo.get("schema"); final String sql = "UPDATE config_info SET content=?, md5 = ?, src_ip=?,src_user=?,gmt_modified=?,app_name=?," - + "c_desc=?,c_use=?,effect=?,type=?,c_schema=? WHERE data_id=? AND group_id=? AND tenant_id=? AND (md5=? or md5 is null or md5='')"; + + "c_desc=?,c_use=?,effect=?,type=?,c_schema=? WHERE data_id=? AND group_id=? AND tenant_id=? AND (md5=? OR md5 IS NULL OR md5='')"; final Object[] args = new Object[] {configInfo.getContent(), md5Tmp, srcIp, srcUser, time, appNameTmp, desc, use, effect, type, schema, configInfo.getDataId(), configInfo.getGroup(), tenantTmp, @@ -2088,7 +2088,7 @@ public List findConfigInfosByIds(final String ids) { return null; } StringBuilder sql = new StringBuilder(SQL_FIND_CONFIG_INFO_BY_IDS); - sql.append("id in ("); + sql.append("id IN ("); List paramList = new ArrayList<>(); String[] tagArr = ids.split(","); for (int i = 0; i < tagArr.length; i++) { @@ -2130,7 +2130,7 @@ public ConfigAdvanceInfo findConfigAdvanceInfo(final String dataId, final String public ConfigAllInfo findConfigAllInfo(final String dataId, final String group, final String tenant) { final String tenantTmp = StringUtils.isBlank(tenant) ? StringUtils.EMPTY : tenant; - final String sql = "SELECT ID,data_id,group_id,tenant_id,app_name,content,md5,gmt_create," + final String sql = "SELECT id,data_id,group_id,tenant_id,app_name,content,md5,gmt_create," + "gmt_modified,src_user,src_ip,c_desc,c_use,effect,type,c_schema FROM config_info " + "WHERE data_id=? AND group_id=? AND tenant_id=?"; @@ -2172,8 +2172,8 @@ public void insertConfigHistoryAtomic(long configHistoryId, ConfigInfo configInf public Page findConfigHistory(String dataId, String group, String tenant, int pageNo, int pageSize) { String tenantTmp = StringUtils.isBlank(tenant) ? StringUtils.EMPTY : tenant; - String sqlCountRows = "select count(*) from his_config_info where data_id = ? and group_id = ? and tenant_id = ?"; - String sqlFetchRows = "select nid,data_id,group_id,tenant_id,app_name,src_ip,src_user,op_type,gmt_create,gmt_modified from his_config_info where data_id = ? and group_id = ? and tenant_id = ? order by nid desc"; + String sqlCountRows = "SELECT count(*) FROM his_config_info WHERE data_id = ? AND group_id = ? AND tenant_id = ?"; + String sqlFetchRows = "SELECT nid,data_id,group_id,tenant_id,app_name,src_ip,src_user,op_type,gmt_create,gmt_modified FROM his_config_info WHERE data_id = ? AND group_id = ? AND tenant_id = ? ORDER BY nid DESC"; PaginationHelper helper = createPaginationHelper(); return helper.fetchPage(sqlCountRows, sqlFetchRows, new Object[] {dataId, group, tenantTmp}, pageNo, pageSize, @@ -2221,7 +2221,7 @@ public ConfigHistoryInfo detailConfigHistory(Long nid) { @Override public ConfigHistoryInfo detailPreviousConfigHistory(Long id) { - String sqlFetchRows = "SELECT nid,data_id,group_id,tenant_id,app_name,content,md5,src_user,src_ip,op_type,gmt_create,gmt_modified FROM his_config_info WHERE nid = (select max(nid) from his_config_info where id = ?)"; + String sqlFetchRows = "SELECT nid,data_id,group_id,tenant_id,app_name,content,md5,src_user,src_ip,op_type,gmt_create,gmt_modified FROM his_config_info WHERE nid = (SELECT max(nid) FROM his_config_info WHERE id = ?)"; return databaseOperate.queryOne(sqlFetchRows, new Object[] {id}, HISTORY_DETAIL_ROW_MAPPER); } @@ -2337,7 +2337,7 @@ public List listAllGroupKeyMd5() { @Override public List listGroupKeyMd5ByPage(int pageNo, int pageSize) { - String sqlCountRows = " SELECT COUNT(*) FROM config_info "; + String sqlCountRows = " SELECT count(*) FROM config_info "; String sqlFetchRows = " SELECT t.id,data_id,group_id,tenant_id,app_name,type,md5,gmt_modified FROM ( SELECT id FROM config_info ORDER BY id LIMIT ?,? ) g, config_info t WHERE g.id = t.id"; PaginationHelper helper = createPaginationHelper(); Page page = helper @@ -2361,7 +2361,7 @@ public String generateLikeArgument(String s) { @Override public ConfigInfoWrapper queryConfigInfo(final String dataId, final String group, final String tenant) { String tenantTmp = StringUtils.isBlank(tenant) ? StringUtils.EMPTY : tenant; - final String sql = "SELECT ID,data_id,group_id,tenant_id,app_name,content,type,gmt_modified,md5 FROM config_info WHERE data_id=? AND group_id=? AND tenant_id=?"; + final String sql = "SELECT id,data_id,group_id,tenant_id,app_name,content,type,gmt_modified,md5 FROM config_info WHERE data_id=? AND group_id=? AND tenant_id=?"; return databaseOperate.queryOne(sql, new Object[] {dataId, group, tenantTmp}, CONFIG_INFO_WRAPPER_ROW_MAPPER); } @@ -2425,10 +2425,10 @@ public Boolean completeMd5() { public List findAllConfigInfo4Export(final String dataId, final String group, final String tenant, final String appName, final List ids) { String tenantTmp = StringUtils.isBlank(tenant) ? StringUtils.EMPTY : tenant; - StringBuilder where = new StringBuilder(" where "); + StringBuilder where = new StringBuilder(" WHERE "); List paramList = new ArrayList<>(); if (!CollectionUtils.isEmpty(ids)) { - where.append(" id in ("); + where.append(" id IN ("); for (int i = 0; i < ids.size(); i++) { if (i != 0) { where.append(", "); @@ -2441,15 +2441,15 @@ public List findAllConfigInfo4Export(final String dataId, final S where.append(" tenant_id=? "); paramList.add(tenantTmp); if (!StringUtils.isBlank(dataId)) { - where.append(" and data_id like ? "); + where.append(" AND data_id LIKE ? "); paramList.add(generateLikeArgument(dataId)); } if (StringUtils.isNotBlank(group)) { - where.append(" and group_id=? "); + where.append(" AND group_id=? "); paramList.add(group); } if (StringUtils.isNotBlank(appName)) { - where.append(" and app_name=? "); + where.append(" AND app_name=? "); paramList.add(appName); } } diff --git a/config/src/main/java/com/alibaba/nacos/config/server/service/repository/extrnal/ExternalStoragePaginationHelperImpl.java b/config/src/main/java/com/alibaba/nacos/config/server/service/repository/extrnal/ExternalStoragePaginationHelperImpl.java index e6134d943bf..61ac0092dd4 100644 --- a/config/src/main/java/com/alibaba/nacos/config/server/service/repository/extrnal/ExternalStoragePaginationHelperImpl.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/service/repository/extrnal/ExternalStoragePaginationHelperImpl.java @@ -91,9 +91,9 @@ public Page fetchPage(final String sqlCountRows, final String sqlFetchRows, f if (isDerby()) { selectSql = sqlFetchRows + " OFFSET " + startRow + " ROWS FETCH NEXT " + pageSize + " ROWS ONLY"; } else if (lastMaxId != null) { - selectSql = sqlFetchRows + " and id > " + lastMaxId + " order by id asc" + " limit " + 0 + "," + pageSize; + selectSql = sqlFetchRows + " AND id > " + lastMaxId + " ORDER BY id ASC" + " LIMIT " + 0 + "," + pageSize; } else { - selectSql = sqlFetchRows + " limit " + startRow + "," + pageSize; + selectSql = sqlFetchRows + " LIMIT " + startRow + "," + pageSize; } List result = jdbcTemplate.query(selectSql, args, rowMapper); @@ -209,7 +209,7 @@ public void updateLimit(final String sql, final Object[] args) { String sqlUpdate = sql; if (isDerby()) { - sqlUpdate = sqlUpdate.replaceAll("limit \\?", "OFFSET 0 ROWS FETCH NEXT ? ROWS ONLY"); + sqlUpdate = sqlUpdate.replaceAll("LIMIT \\?", "OFFSET 0 ROWS FETCH NEXT ? ROWS ONLY"); } try { diff --git a/config/src/main/java/com/alibaba/nacos/config/server/service/repository/extrnal/ExternalStoragePersistServiceImpl.java b/config/src/main/java/com/alibaba/nacos/config/server/service/repository/extrnal/ExternalStoragePersistServiceImpl.java index 5c440021620..4545a9b61cc 100644 --- a/config/src/main/java/com/alibaba/nacos/config/server/service/repository/extrnal/ExternalStoragePersistServiceImpl.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/service/repository/extrnal/ExternalStoragePersistServiceImpl.java @@ -105,9 +105,9 @@ public class ExternalStoragePersistServiceImpl implements PersistService { private DataSourceService dataSourceService; - private static final String SQL_FIND_ALL_CONFIG_INFO = "select id,data_id,group_id,tenant_id,app_name,content,type,md5,gmt_create,gmt_modified,src_user,src_ip,c_desc,c_use,effect,c_schema from config_info"; + private static final String SQL_FIND_ALL_CONFIG_INFO = "SELECT id,data_id,group_id,tenant_id,app_name,content,type,md5,gmt_create,gmt_modified,src_user,src_ip,c_desc,c_use,effect,c_schema FROM config_info"; - private static final String SQL_TENANT_INFO_COUNT_BY_TENANT_ID = "select count(1) from tenant_info where tenant_id = ?"; + private static final String SQL_TENANT_INFO_COUNT_BY_TENANT_ID = "SELECT count(*) FROM tenant_info WHERE tenant_id = ?"; private static final String SQL_FIND_CONFIG_INFO_BY_IDS = "SELECT ID,data_id,group_id,tenant_id,app_name,content,md5 FROM config_info WHERE "; @@ -619,7 +619,7 @@ public boolean batchRemoveAggr(final String dataId, final String group, final St } datumString.deleteCharAt(datumString.length() - 1); final String sql = - "delete from config_info_aggr where data_id=? and group_id=? and tenant_id=? and datum_id in (" + "DELETE FROM config_info_aggr WHERE data_id=? AND group_id=? AND tenant_id=? AND datum_id IN (" + datumString.toString() + ")"; try { jt.update(sql, dataId, group, tenantTmp); @@ -632,7 +632,7 @@ public boolean batchRemoveAggr(final String dataId, final String group, final St @Override public void removeConfigHistory(final Timestamp startTime, final int limitSize) { - String sql = "delete from his_config_info where gmt_modified < ? limit ?"; + String sql = "DELETE FROM his_config_info WHERE gmt_modified < ? LIMIT ?"; PaginationHelper helper = createPaginationHelper(); try { helper.updateLimit(sql, new Object[] {startTime, limitSize}); @@ -644,7 +644,7 @@ public void removeConfigHistory(final Timestamp startTime, final int limitSize) @Override public int findConfigHistoryCountByTime(final Timestamp startTime) { - String sql = "SELECT COUNT(*) FROM his_config_info WHERE gmt_modified < ?"; + String sql = "SELECT count(*) FROM his_config_info WHERE gmt_modified < ?"; Integer result = jt.queryForObject(sql, Integer.class, new Object[] {startTime}); if (result == null) { throw new IllegalArgumentException("configInfoBetaCount error"); @@ -747,7 +747,7 @@ public ConfigInfoBetaWrapper findConfigInfo4Beta(final String dataId, final Stri String tenantTmp = StringUtils.isBlank(tenant) ? StringUtils.EMPTY : tenant; try { return this.jt.queryForObject( - "SELECT ID,data_id,group_id,tenant_id,app_name,content,beta_ips FROM config_info_beta WHERE data_id=? AND group_id=? AND tenant_id=?", + "SELECT id,data_id,group_id,tenant_id,app_name,content,beta_ips FROM config_info_beta WHERE data_id=? AND group_id=? AND tenant_id=?", new Object[] {dataId, group, tenantTmp}, CONFIG_INFO_BETA_WRAPPER_ROW_MAPPER); } catch (EmptyResultDataAccessException e) { // Indicates that the data does not exist, returns null. return null; @@ -764,7 +764,7 @@ public ConfigInfoTagWrapper findConfigInfo4Tag(final String dataId, final String String tagTmp = StringUtils.isBlank(tag) ? StringUtils.EMPTY : tag.trim(); try { return this.jt.queryForObject( - "SELECT ID,data_id,group_id,tenant_id,tag_id,app_name,content FROM config_info_tag WHERE data_id=? AND group_id=? AND tenant_id=? AND tag_id=?", + "SELECT id,data_id,group_id,tenant_id,tag_id,app_name,content FROM config_info_tag WHERE data_id=? AND group_id=? AND tenant_id=? AND tag_id=?", new Object[] {dataId, group, tenantTmp, tagTmp}, CONFIG_INFO_TAG_WRAPPER_ROW_MAPPER); } catch (EmptyResultDataAccessException e) { // Indicates that the data does not exist, returns null. return null; @@ -780,7 +780,7 @@ public ConfigInfo findConfigInfoApp(final String dataId, final String group, fin String tenantTmp = StringUtils.isBlank(tenant) ? StringUtils.EMPTY : tenant; try { return this.jt.queryForObject( - "SELECT ID,data_id,group_id,tenant_id,app_name,content FROM config_info WHERE data_id=? AND group_id=? AND tenant_id=? AND app_name=?", + "SELECT id,data_id,group_id,tenant_id,app_name,content FROM config_info WHERE data_id=? AND group_id=? AND tenant_id=? AND app_name=?", new Object[] {dataId, group, tenantTmp, appName}, CONFIG_INFO_ROW_MAPPER); } catch (EmptyResultDataAccessException e) { // Indicates that the data does not exist, returns null. return null; @@ -802,12 +802,12 @@ public ConfigInfo findConfigInfoAdvanceInfo(final String dataId, final String gr paramList.add(tenantTmp); StringBuilder sql = new StringBuilder( - "select ID,data_id,group_id,tenant_id,app_name,content from config_info where data_id=? and group_id=? and tenant_id=? "); + "SELECT id,data_id,group_id,tenant_id,app_name,content FROM config_info WHERE data_id=? AND group_id=? AND tenant_id=? "); if (StringUtils.isNotBlank(configTags)) { sql = new StringBuilder( - "select a.ID,a.data_id,a.group_id,a.tenant_id,a.app_name,a.content from config_info a left join " - + "config_tags_relation b on a.id=b.id where a.data_id=? and a.group_id=? and a.tenant_id=? "); - sql.append(" and b.tag_name in ("); + "SELECT a.id,a.data_id,a.group_id,a.tenant_id,a.app_name,a.content FROM config_info a LEFT JOIN " + + "config_tags_relation b ON a.id=b.id WHERE a.data_id=? AND a.group_id=? AND a.tenant_id=? "); + sql.append(" AND b.tag_name IN ("); String[] tagArr = configTags.split(","); for (int i = 0; i < tagArr.length; i++) { if (i != 0) { @@ -819,12 +819,12 @@ public ConfigInfo findConfigInfoAdvanceInfo(final String dataId, final String gr sql.append(") "); if (StringUtils.isNotBlank(appName)) { - sql.append(" and a.app_name=? "); + sql.append(" AND a.app_name=? "); paramList.add(appName); } } else { if (StringUtils.isNotBlank(appName)) { - sql.append(" and app_name=? "); + sql.append(" AND app_name=? "); paramList.add(appName); } } @@ -844,7 +844,7 @@ public ConfigInfo findConfigInfoAdvanceInfo(final String dataId, final String gr public ConfigInfoBase findConfigInfoBase(final String dataId, final String group) { try { return this.jt.queryForObject( - "SELECT ID,data_id,group_id,content FROM config_info WHERE data_id=? AND group_id=? AND tenant_id=?", + "SELECT id,data_id,group_id,content FROM config_info WHERE data_id=? AND group_id=? AND tenant_id=?", new Object[] {dataId, group, StringUtils.EMPTY}, CONFIG_INFO_BASE_ROW_MAPPER); } catch (EmptyResultDataAccessException e) { // Indicates that the data does not exist, returns null. return null; @@ -858,7 +858,7 @@ public ConfigInfoBase findConfigInfoBase(final String dataId, final String group public ConfigInfo findConfigInfo(long id) { try { return this.jt - .queryForObject("SELECT ID,data_id,group_id,tenant_id,app_name,content FROM config_info WHERE ID=?", + .queryForObject("SELECT id,data_id,group_id,tenant_id,app_name,content FROM config_info WHERE id=?", new Object[] {id}, CONFIG_INFO_ROW_MAPPER); } catch (EmptyResultDataAccessException e) { // Indicates that the data does not exist, returns null. return null; @@ -873,7 +873,7 @@ public ConfigInfoWrapper findConfigInfo(final String dataId, final String group, final String tenantTmp = StringUtils.isBlank(tenant) ? StringUtils.EMPTY : tenant; try { return this.jt.queryForObject( - "SELECT ID,data_id,group_id,tenant_id,app_name,content,md5,type FROM config_info WHERE data_id=? AND group_id=? AND tenant_id=?", + "SELECT id,data_id,group_id,tenant_id,app_name,content,md5,type FROM config_info WHERE data_id=? AND group_id=? AND tenant_id=?", new Object[] {dataId, group, tenantTmp}, CONFIG_INFO_WRAPPER_ROW_MAPPER); } catch (EmptyResultDataAccessException e) { // Indicates that the data does not exist, returns null. return null; @@ -889,8 +889,8 @@ public Page findConfigInfoByDataId(final int pageNo, final int pageS String tenantTmp = StringUtils.isBlank(tenant) ? StringUtils.EMPTY : tenant; PaginationHelper helper = createPaginationHelper(); try { - return helper.fetchPage("select count(*) from config_info where data_id=? and tenant_id=?", - "select ID,data_id,group_id,tenant_id,app_name,content from config_info where data_id=? and tenant_id=?", + return helper.fetchPage("SELECT count(*) FROM config_info WHERE data_id=? AND tenant_id=?", + "SELECT id,data_id,group_id,tenant_id,app_name,content FROM config_info WHERE data_id=? AND tenant_id=?", new Object[] {dataId, tenantTmp}, pageNo, pageSize, CONFIG_INFO_ROW_MAPPER); } catch (CannotGetJdbcConnectionException e) { LogUtil.FATAL_LOG.error("[db-error] " + e.toString(), e); @@ -904,8 +904,8 @@ public Page findConfigInfoByDataIdAndApp(final int pageNo, final int String tenantTmp = StringUtils.isBlank(tenant) ? StringUtils.EMPTY : tenant; PaginationHelper helper = createPaginationHelper(); try { - return helper.fetchPage("select count(*) from config_info where data_id=? and tenant_id=? and app_name=?", - "select ID,data_id,group_id,tenant_id,app_name,content from config_info where data_id=? and tenant_id=? and app_name=?", + return helper.fetchPage("SELECT count(*) FROM config_info WHERE data_id=? AND tenant_id=? AND app_name=?", + "SELECT id,data_id,group_id,tenant_id,app_name,content FROM config_info WHERE data_id=? AND tenant_id=? AND app_name=?", new Object[] {dataId, tenantTmp, appName}, pageNo, pageSize, CONFIG_INFO_ROW_MAPPER); } catch (CannotGetJdbcConnectionException e) { LogUtil.FATAL_LOG.error("[db-error] " + e.toString(), e); @@ -920,22 +920,22 @@ public Page findConfigInfoByDataIdAndAdvance(final int pageNo, final PaginationHelper helper = createPaginationHelper(); final String appName = configAdvanceInfo == null ? null : (String) configAdvanceInfo.get("appName"); final String configTags = configAdvanceInfo == null ? null : (String) configAdvanceInfo.get("config_tags"); - StringBuilder sqlCount = new StringBuilder("select count(*) from config_info where data_id=? and tenant_id=? "); + StringBuilder sqlCount = new StringBuilder("SELECT count(*) FROM config_info WHERE data_id=? AND tenant_id=? "); StringBuilder sql = new StringBuilder( - "select ID,data_id,group_id,tenant_id,app_name,content from config_info where data_id=? and tenant_id=? "); + "SELECT id,data_id,group_id,tenant_id,app_name,content FROM config_info WHERE data_id=? AND tenant_id=? "); List paramList = new ArrayList(); paramList.add(dataId); paramList.add(tenantTmp); if (StringUtils.isNotBlank(configTags)) { sqlCount = new StringBuilder( - "select count(*) from config_info a left join config_tags_relation b on a.id=b.id where a.data_id=? and a.tenant_id=? "); + "SELECT count(*) FROM config_info a LEFT JOIN config_tags_relation b ON a.id=b.id WHERE a.data_id=? AND a.tenant_id=? "); sql = new StringBuilder( - "select a.ID,a.data_id,a.group_id,a.tenant_id,a.app_name,a.content from config_info a left join " - + "config_tags_relation b on a.id=b.id where a.data_id=? and a.tenant_id=? "); + "SELECT a.id,a.data_id,a.group_id,a.tenant_id,a.app_name,a.content FROM config_info a LEFT JOIN " + + "config_tags_relation b ON a.id=b.id WHERE a.data_id=? AND a.tenant_id=? "); - sqlCount.append(" and b.tag_name in ("); - sql.append(" and b.tag_name in ("); + sqlCount.append(" AND b.tag_name IN ("); + sql.append(" AND b.tag_name IN ("); String[] tagArr = configTags.split(","); for (int i = 0; i < tagArr.length; i++) { if (i != 0) { @@ -950,14 +950,14 @@ public Page findConfigInfoByDataIdAndAdvance(final int pageNo, final sql.append(") "); if (StringUtils.isNotBlank(appName)) { - sqlCount.append(" and a.app_name=? "); - sql.append(" and a.app_name=? "); + sqlCount.append(" AND a.app_name=? "); + sql.append(" AND a.app_name=? "); paramList.add(appName); } } else { if (StringUtils.isNotBlank(appName)) { - sqlCount.append(" and app_name=? "); - sql.append(" and app_name=? "); + sqlCount.append(" AND app_name=? "); + sql.append(" AND app_name=? "); paramList.add(appName); } } @@ -977,32 +977,32 @@ public Page findConfigInfo4Page(final int pageNo, final int pageSize PaginationHelper helper = createPaginationHelper(); final String appName = configAdvanceInfo == null ? null : (String) configAdvanceInfo.get("appName"); final String configTags = configAdvanceInfo == null ? null : (String) configAdvanceInfo.get("config_tags"); - String sqlCount = "select count(*) from config_info"; - String sql = "select ID,data_id,group_id,tenant_id,app_name,content,type from config_info"; - StringBuilder where = new StringBuilder(" where "); + String sqlCount = "SELECT count(*) FROM config_info"; + String sql = "SELECT id,data_id,group_id,tenant_id,app_name,content,type FROM config_info"; + StringBuilder where = new StringBuilder(" WHERE "); List paramList = new ArrayList(); paramList.add(tenantTmp); if (StringUtils.isNotBlank(configTags)) { - sqlCount = "select count(*) from config_info a left join config_tags_relation b on a.id=b.id"; - sql = "select a.ID,a.data_id,a.group_id,a.tenant_id,a.app_name,a.content from config_info a left join " - + "config_tags_relation b on a.id=b.id"; + sqlCount = "SELECT count(*) FROM config_info a LEFT JOIN config_tags_relation b ON a.id=b.id"; + sql = "SELECT a.id,a.data_id,a.group_id,a.tenant_id,a.app_name,a.content FROM config_info a LEFT JOIN " + + "config_tags_relation b ON a.id=b.id"; where.append(" a.tenant_id=? "); if (StringUtils.isNotBlank(dataId)) { - where.append(" and a.data_id=? "); + where.append(" AND a.data_id=? "); paramList.add(dataId); } if (StringUtils.isNotBlank(group)) { - where.append(" and a.group_id=? "); + where.append(" AND a.group_id=? "); paramList.add(group); } if (StringUtils.isNotBlank(appName)) { - where.append(" and a.app_name=? "); + where.append(" AND a.app_name=? "); paramList.add(appName); } - where.append(" and b.tag_name in ("); + where.append(" AND b.tag_name IN ("); String[] tagArr = configTags.split(","); for (int i = 0; i < tagArr.length; i++) { if (i != 0) { @@ -1015,15 +1015,15 @@ public Page findConfigInfo4Page(final int pageNo, final int pageSize } else { where.append(" tenant_id=? "); if (StringUtils.isNotBlank(dataId)) { - where.append(" and data_id=? "); + where.append(" AND data_id=? "); paramList.add(dataId); } if (StringUtils.isNotBlank(group)) { - where.append(" and group_id=? "); + where.append(" AND group_id=? "); paramList.add(group); } if (StringUtils.isNotBlank(appName)) { - where.append(" and app_name=? "); + where.append(" AND app_name=? "); paramList.add(appName); } } @@ -1040,8 +1040,8 @@ public Page findConfigInfo4Page(final int pageNo, final int pageSize public Page findConfigInfoBaseByDataId(final int pageNo, final int pageSize, final String dataId) { PaginationHelper helper = createPaginationHelper(); try { - return helper.fetchPage("select count(*) from config_info where data_id=? and tenant_id=?", - "select ID,data_id,group_id,content from config_info where data_id=? and tenant_id=?", + return helper.fetchPage("SELECT count(*) FROM config_info WHERE data_id=? AND tenant_id=?", + "SELECT id,data_id,group_id,content FROM config_info WHERE data_id=? AND tenant_id=?", new Object[] {dataId, StringUtils.EMPTY}, pageNo, pageSize, CONFIG_INFO_BASE_ROW_MAPPER); } catch (CannotGetJdbcConnectionException e) { LogUtil.FATAL_LOG.error("[db-error] " + e.toString(), e); @@ -1055,8 +1055,8 @@ public Page findConfigInfoByGroup(final int pageNo, final int pageSi String tenantTmp = StringUtils.isBlank(tenant) ? StringUtils.EMPTY : tenant; PaginationHelper helper = createPaginationHelper(); try { - return helper.fetchPage("select count(*) from config_info where group_id=? and tenant_id=?", - "select ID,data_id,group_id,tenant_id,app_name,content from config_info where group_id=? and tenant_id=?", + return helper.fetchPage("SELECT count(*) FROM config_info WHERE group_id=? AND tenant_id=?", + "SELECT id,data_id,group_id,tenant_id,app_name,content FROM config_info WHERE group_id=? AND tenant_id=?", new Object[] {group, tenantTmp}, pageNo, pageSize, CONFIG_INFO_ROW_MAPPER); } catch (CannotGetJdbcConnectionException e) { LogUtil.FATAL_LOG.error("[db-error] " + e.toString(), e); @@ -1070,8 +1070,8 @@ public Page findConfigInfoByGroupAndApp(final int pageNo, final int String tenantTmp = StringUtils.isBlank(tenant) ? StringUtils.EMPTY : tenant; PaginationHelper helper = createPaginationHelper(); try { - return helper.fetchPage("select count(*) from config_info where group_id=? and tenant_id=? and app_name =?", - "select ID,data_id,group_id,tenant_id,app_name,content from config_info where group_id=? and tenant_id=? and app_name =?", + return helper.fetchPage("SELECT count(*) FROM config_info WHERE group_id=? AND tenant_id=? AND app_name =?", + "SELECT id,data_id,group_id,tenant_id,app_name,content FROM config_info WHERE group_id=? AND tenant_id=? AND app_name =?", new Object[] {group, tenantTmp, appName}, pageNo, pageSize, CONFIG_INFO_ROW_MAPPER); } catch (CannotGetJdbcConnectionException e) { LogUtil.FATAL_LOG.error("[db-error] " + e.toString(), e); @@ -1088,21 +1088,21 @@ public Page findConfigInfoByGroupAndAdvance(final int pageNo, final final String appName = configAdvanceInfo == null ? null : (String) configAdvanceInfo.get("appName"); final String configTags = configAdvanceInfo == null ? null : (String) configAdvanceInfo.get("config_tags"); StringBuilder sqlCount = new StringBuilder( - "select count(*) from config_info where group_id=? and tenant_id=? "); + "SELECT count(*) FROM config_info WHERE group_id=? AND tenant_id=? "); StringBuilder sql = new StringBuilder( - "select ID,data_id,group_id,tenant_id,app_name,content from config_info where group_id=? and tenant_id=? "); + "SELECT id,data_id,group_id,tenant_id,app_name,content FROM config_info WHERE group_id=? AND tenant_id=? "); List paramList = new ArrayList(); paramList.add(group); paramList.add(tenantTmp); if (StringUtils.isNotBlank(configTags)) { sqlCount = new StringBuilder( - "select count(*) from config_info a left join config_tags_relation b on a.id=b.id where a.group_id=? and a.tenant_id=? "); + "SELECT count(*) FROM config_info a LEFT JOIN config_tags_relation b ON a.id=b.id WHERE a.group_id=? AND a.tenant_id=? "); sql = new StringBuilder( - "select a.ID,a.data_id,a.group_id,a.tenant_id,a.app_name,a.content from config_info a left join " - + "config_tags_relation b on a.id=b.id where a.group_id=? and a.tenant_id=? "); + "SELECT a.id,a.data_id,a.group_id,a.tenant_id,a.app_name,a.content FROM config_info a LEFT JOIN " + + "config_tags_relation b ON a.id=b.id WHERE a.group_id=? AND a.tenant_id=? "); - sqlCount.append(" and b.tag_name in ("); - sql.append(" and b.tag_name in ("); + sqlCount.append(" AND b.tag_name IN ("); + sql.append(" AND b.tag_name IN ("); String[] tagArr = configTags.split(","); for (int i = 0; i < tagArr.length; i++) { if (i != 0) { @@ -1117,14 +1117,14 @@ public Page findConfigInfoByGroupAndAdvance(final int pageNo, final sql.append(") "); if (StringUtils.isNotBlank(appName)) { - sqlCount.append(" and a.app_name=? "); - sql.append(" and a.app_name=? "); + sqlCount.append(" AND a.app_name=? "); + sql.append(" AND a.app_name=? "); paramList.add(appName); } } else { if (StringUtils.isNotBlank(appName)) { - sqlCount.append(" and app_name=? "); - sql.append(" and app_name=? "); + sqlCount.append(" AND app_name=? "); + sql.append(" AND app_name=? "); paramList.add(appName); } } @@ -1144,8 +1144,8 @@ public Page findConfigInfoByApp(final int pageNo, final int pageSize String tenantTmp = StringUtils.isBlank(tenant) ? StringUtils.EMPTY : tenant; PaginationHelper helper = createPaginationHelper(); try { - return helper.fetchPage("select count(*) from config_info where tenant_id like ? and app_name=?", - "select ID,data_id,group_id,tenant_id,app_name,content from config_info where tenant_id like ? and app_name=?", + return helper.fetchPage("SELECT count(*) FROM config_info WHERE tenant_id LIKE ? AND app_name=?", + "SELECT id,data_id,group_id,tenant_id,app_name,content FROM config_info WHERE tenant_id LIKE ? AND app_name=?", new Object[] {generateLikeArgument(tenantTmp), appName}, pageNo, pageSize, CONFIG_INFO_ROW_MAPPER); } catch (CannotGetJdbcConnectionException e) { LogUtil.FATAL_LOG.error("[db-error] " + e.toString(), e); @@ -1160,21 +1160,21 @@ public Page findConfigInfoByAdvance(final int pageNo, final int page PaginationHelper helper = createPaginationHelper(); final String appName = configAdvanceInfo == null ? null : (String) configAdvanceInfo.get("appName"); final String configTags = configAdvanceInfo == null ? null : (String) configAdvanceInfo.get("config_tags"); - StringBuilder sqlCount = new StringBuilder("select count(*) from config_info where tenant_id like ? "); + StringBuilder sqlCount = new StringBuilder("SELECT count(*) FROM config_info WHERE tenant_id LIKE ? "); StringBuilder sql = new StringBuilder( - "select ID,data_id,group_id,tenant_id,app_name,content from config_info where tenant_id like ? "); + "SELECT id,data_id,group_id,tenant_id,app_name,content FROM config_info WHERE tenant_id LIKE ? "); List paramList = new ArrayList(); paramList.add(tenantTmp); if (StringUtils.isNotBlank(configTags)) { sqlCount = new StringBuilder( - "select count(*) from config_info a left join config_tags_relation b on a.id=b.id where a.tenant_id=? "); + "SELECT count(*) FROM config_info a LEFT JOIN config_tags_relation b ON a.id=b.id WHERE a.tenant_id=? "); sql = new StringBuilder( - "select a.ID,a.data_id,a.group_id,a.tenant_id,a.app_name,a.content from config_info a left join " - + "config_tags_relation b on a.id=b.id where a.tenant_id=? "); + "SELECT a.id,a.data_id,a.group_id,a.tenant_id,a.app_name,a.content FROM config_info a LEFT JOIN " + + "config_tags_relation b ON a.id=b.id WHERE a.tenant_id=? "); - sqlCount.append(" and b.tag_name in ("); - sql.append(" and b.tag_name in ("); + sqlCount.append(" AND b.tag_name IN ("); + sql.append(" AND b.tag_name IN ("); String[] tagArr = configTags.split(","); for (int i = 0; i < tagArr.length; i++) { if (i != 0) { @@ -1189,14 +1189,14 @@ public Page findConfigInfoByAdvance(final int pageNo, final int page sql.append(") "); if (StringUtils.isNotBlank(appName)) { - sqlCount.append(" and a.app_name=? "); - sql.append(" and a.app_name=? "); + sqlCount.append(" AND a.app_name=? "); + sql.append(" AND a.app_name=? "); paramList.add(appName); } } else { if (StringUtils.isNotBlank(appName)) { - sqlCount.append(" and app_name=? "); - sql.append(" and app_name=? "); + sqlCount.append(" AND app_name=? "); + sql.append(" AND app_name=? "); paramList.add(appName); } } @@ -1215,8 +1215,8 @@ public Page findConfigInfoByAdvance(final int pageNo, final int page public Page findConfigInfoBaseByGroup(final int pageNo, final int pageSize, final String group) { PaginationHelper helper = createPaginationHelper(); try { - return helper.fetchPage("select count(*) from config_info where group_id=? and tenant_id=?", - "select ID,data_id,group_id,content from config_info where group_id=? and tenant_id=?", + return helper.fetchPage("SELECT count(*) FROM config_info WHERE group_id=? AND tenant_id=?", + "SELECT id,data_id,group_id,content FROM config_info WHERE group_id=? AND tenant_id=?", new Object[] {group, StringUtils.EMPTY}, pageNo, pageSize, CONFIG_INFO_BASE_ROW_MAPPER); } catch (CannotGetJdbcConnectionException e) { LogUtil.FATAL_LOG.error("[db-error] " + e.toString(), e); @@ -1226,7 +1226,7 @@ public Page findConfigInfoBaseByGroup(final int pageNo, final in @Override public int configInfoCount() { - String sql = " SELECT COUNT(ID) FROM config_info "; + String sql = " SELECT count(*) FROM config_info "; Integer result = jt.queryForObject(sql, Integer.class); if (result == null) { throw new IllegalArgumentException("configInfoCount error"); @@ -1236,7 +1236,7 @@ public int configInfoCount() { @Override public int configInfoCount(String tenant) { - String sql = " SELECT COUNT(ID) FROM config_info where tenant_id like ?"; + String sql = " SELECT count(*) FROM config_info WHERE tenant_id LIKE ?"; Integer result = jt.queryForObject(sql, new Object[] {tenant}, Integer.class); if (result == null) { throw new IllegalArgumentException("configInfoCount error"); @@ -1246,7 +1246,7 @@ public int configInfoCount(String tenant) { @Override public int configInfoBetaCount() { - String sql = " SELECT COUNT(ID) FROM config_info_beta "; + String sql = " SELECT count(*) FROM config_info_beta "; Integer result = jt.queryForObject(sql, Integer.class); if (result == null) { throw new IllegalArgumentException("configInfoBetaCount error"); @@ -1256,7 +1256,7 @@ public int configInfoBetaCount() { @Override public int configInfoTagCount() { - String sql = " SELECT COUNT(ID) FROM config_info_tag "; + String sql = " SELECT count(ID) FROM config_info_tag "; Integer result = jt.queryForObject(sql, Integer.class); if (result == null) { throw new IllegalArgumentException("configInfoBetaCount error"); @@ -1281,7 +1281,7 @@ public List getGroupIdList(int page, int pageSize) { @Override public int aggrConfigInfoCount(String dataId, String group, String tenant) { String tenantTmp = StringUtils.isBlank(tenant) ? StringUtils.EMPTY : tenant; - String sql = " SELECT COUNT(ID) FROM config_info_aggr WHERE data_id = ? AND group_id = ? AND tenant_id = ?"; + String sql = " SELECT count(*) FROM config_info_aggr WHERE data_id = ? AND group_id = ? AND tenant_id = ?"; Integer result = jt.queryForObject(sql, Integer.class, new Object[] {dataId, group, tenantTmp}); if (result == null) { throw new IllegalArgumentException("aggrConfigInfoCount error"); @@ -1296,11 +1296,11 @@ public int aggrConfigInfoCount(String dataId, String group, String tenant, List< } final String tenantTmp = StringUtils.isBlank(tenant) ? StringUtils.EMPTY : tenant; StringBuilder sql = new StringBuilder( - " SELECT COUNT(*) FROM config_info_aggr WHERE data_id = ? and group_id = ? and tenant_id = ? and datum_id"); + " SELECT count(*) FROM config_info_aggr WHERE data_id = ? AND group_id = ? AND tenant_id = ? AND datum_id"); if (isIn) { - sql.append(" in ("); + sql.append(" IN ("); } else { - sql.append(" not in ("); + sql.append(" NOT IN ("); } for (int i = 0, size = datumIds.size(); i < size; i++) { if (i > 0) { @@ -1332,9 +1332,9 @@ public int aggrConfigInfoCountNotIn(String dataId, String group, String tenant, @Override public Page findAllConfigInfo(final int pageNo, final int pageSize, final String tenant) { String tenantTmp = StringUtils.isBlank(tenant) ? StringUtils.EMPTY : tenant; - String sqlCountRows = "SELECT COUNT(*) FROM config_info"; + String sqlCountRows = "SELECT count(*) FROM config_info"; String sqlFetchRows = " SELECT t.id,data_id,group_id,tenant_id,app_name,content,md5 " - + " FROM ( SELECT id FROM config_info WHERE tenant_id like ? ORDER BY id LIMIT ?,? )" + + " FROM ( SELECT id FROM config_info WHERE tenant_id LIKE ? ORDER BY id LIMIT ?,? )" + " g, config_info t WHERE g.id = t.id "; PaginationHelper helper = createPaginationHelper(); @@ -1391,7 +1391,7 @@ public Page findAllConfigKey(final int pageNo, final int pageSize, fi @Override @Deprecated public Page findAllConfigInfoBase(final int pageNo, final int pageSize) { - String sqlCountRows = "SELECT COUNT(*) FROM config_info"; + String sqlCountRows = "SELECT count(*) FROM config_info"; String sqlFetchRows = " SELECT t.id,data_id,group_id,content,md5" + " FROM ( SELECT id FROM config_info ORDER BY id LIMIT ?,? ) " + " g, config_info t WHERE g.id = t.id "; @@ -1408,7 +1408,7 @@ public Page findAllConfigInfoBase(final int pageNo, final int pa @Override public Page findAllConfigInfoForDumpAll(final int pageNo, final int pageSize) { - String sqlCountRows = "select count(*) from config_info"; + String sqlCountRows = "SELECT count(*) FROM config_info"; String sqlFetchRows = " SELECT t.id,type,data_id,group_id,tenant_id,app_name,content,type,md5,gmt_modified " + " FROM ( SELECT id FROM config_info ORDER BY id LIMIT ?,? )" + " g, config_info t WHERE g.id = t.id "; @@ -1427,7 +1427,7 @@ public Page findAllConfigInfoForDumpAll(final int pageNo, fin @Override public Page findAllConfigInfoFragment(final long lastMaxId, final int pageSize) { - String select = "SELECT id,data_id,group_id,tenant_id,app_name,content,md5,gmt_modified,type from config_info where id > ? order by id asc limit ?,?"; + String select = "SELECT id,data_id,group_id,tenant_id,app_name,content,md5,gmt_modified,type FROM config_info WHERE id > ? ORDER BY id ASC LIMIT ?,?"; PaginationHelper helper = createPaginationHelper(); try { return helper.fetchPageLimit(select, new Object[] {lastMaxId, 0, pageSize}, 1, pageSize, @@ -1440,7 +1440,7 @@ public Page findAllConfigInfoFragment(final long lastMaxId, f @Override public Page findAllConfigInfoBetaForDumpAll(final int pageNo, final int pageSize) { - String sqlCountRows = "SELECT COUNT(*) FROM config_info_beta"; + String sqlCountRows = "SELECT count(*) FROM config_info_beta"; String sqlFetchRows = " SELECT t.id,data_id,group_id,tenant_id,app_name,content,md5,gmt_modified,beta_ips " + " FROM ( SELECT id FROM config_info_beta ORDER BY id LIMIT ?,? )" + " g, config_info_beta t WHERE g.id = t.id "; @@ -1457,7 +1457,7 @@ public Page findAllConfigInfoBetaForDumpAll(final int pag @Override public Page findAllConfigInfoTagForDumpAll(final int pageNo, final int pageSize) { - String sqlCountRows = "SELECT COUNT(*) FROM config_info_tag"; + String sqlCountRows = "SELECT count(*) FROM config_info_tag"; String sqlFetchRows = " SELECT t.id,data_id,group_id,tenant_id,tag_id,app_name,content,md5,gmt_modified " + " FROM ( SELECT id FROM config_info_tag ORDER BY id LIMIT ?,? ) " + "g, config_info_tag t WHERE g.id = t.id "; @@ -1489,7 +1489,7 @@ public List findConfigInfoByBatch(final List dataIds, final } List result = new ArrayList(dataIds.size()); - String sqlStart = "select data_id, group_id, tenant_id, app_name, content from config_info where group_id = ? and tenant_id = ? and data_id in ("; + String sqlStart = "SELECT data_id, group_id, tenant_id, app_name, content FROM config_info WHERE group_id = ? AND tenant_id = ? AND data_id IN ("; String sqlEnd = ")"; StringBuilder subQuerySql = new StringBuilder(); @@ -1534,29 +1534,29 @@ public Page findConfigInfoLike(final int pageNo, final int pageSize, PaginationHelper helper = createPaginationHelper(); - String sqlCountRows = "select count(*) from config_info where "; - String sqlFetchRows = "select ID,data_id,group_id,tenant_id,app_name,content from config_info where "; + String sqlCountRows = "SELECT count(*) FROM config_info WHERE "; + String sqlFetchRows = "SELECT id,data_id,group_id,tenant_id,app_name,content FROM config_info WHERE "; String where = " 1=1 "; List params = new ArrayList(); if (!StringUtils.isBlank(dataId)) { - where += " and data_id like ? "; + where += " AND data_id LIKE ? "; params.add(generateLikeArgument(dataId)); } if (!StringUtils.isBlank(group)) { - where += " and group_id like ? "; + where += " AND group_id LIKE ? "; params.add(generateLikeArgument(group)); } - where += " and tenant_id like ? "; + where += " AND tenant_id LIKE ? "; params.add(generateLikeArgument(tenantTmp)); if (!StringUtils.isBlank(appName)) { - where += " and app_name = ? "; + where += " AND app_name = ? "; params.add(appName); } if (!StringUtils.isBlank(content)) { - where += " and content like ? "; + where += " AND content LIKE ? "; params.add(generateLikeArgument(content)); } @@ -1572,8 +1572,8 @@ public Page findConfigInfoLike(final int pageNo, final int pageSize, @Override public Page findConfigInfoLike(final int pageNo, final int pageSize, final ConfigKey[] configKeys, final boolean blacklist) { - String sqlCountRows = "select count(*) from config_info where "; - String sqlFetchRows = "select ID,data_id,group_id,tenant_id,app_name,content from config_info where "; + String sqlCountRows = "SELECT count(*) FROM config_info WHERE "; + String sqlFetchRows = "SELECT id,data_id,group_id,tenant_id,app_name,content FROM config_info WHERE "; StringBuilder where = new StringBuilder(" 1=1 "); // Whitelist, please leave the synchronization condition empty, there is no configuration that meets the conditions if (configKeys.length == 0 && blacklist == false) { @@ -1596,29 +1596,29 @@ public Page findConfigInfoLike(final int pageNo, final int pageSize, if (blacklist) { if (isFirst) { isFirst = false; - where.append(" and "); + where.append(" AND "); } else { - where.append(" and "); + where.append(" AND "); } where.append("("); boolean isFirstSub = true; if (!StringUtils.isBlank(dataId)) { - where.append(" data_id not like ? "); + where.append(" data_id NOT LIKE ? "); params.add(generateLikeArgument(dataId)); isFirstSub = false; } if (!StringUtils.isBlank(group)) { if (!isFirstSub) { - where.append(" or "); + where.append(" OR "); } - where.append(" group_id not like ? "); + where.append(" group_id NOT LIKE ? "); params.add(generateLikeArgument(group)); isFirstSub = false; } if (!StringUtils.isBlank(appName)) { if (!isFirstSub) { - where.append(" or "); + where.append(" OR "); } where.append(" app_name != ? "); params.add(appName); @@ -1628,28 +1628,28 @@ public Page findConfigInfoLike(final int pageNo, final int pageSize, } else { if (isFirst) { isFirst = false; - where.append(" and "); + where.append(" AND "); } else { - where.append(" or "); + where.append(" OR "); } where.append("("); boolean isFirstSub = true; if (!StringUtils.isBlank(dataId)) { - where.append(" data_id like ? "); + where.append(" data_id LIKE ? "); params.add(generateLikeArgument(dataId)); isFirstSub = false; } if (!StringUtils.isBlank(group)) { if (!isFirstSub) { - where.append(" and "); + where.append(" AND "); } - where.append(" group_id like ? "); + where.append(" group_id LIKE ? "); params.add(generateLikeArgument(group)); isFirstSub = false; } if (!StringUtils.isBlank(appName)) { if (!isFirstSub) { - where.append(" and "); + where.append(" AND "); } where.append(" app_name = ? "); params.add(appName); @@ -1676,34 +1676,34 @@ public Page findConfigInfoLike4Page(final int pageNo, final int page final String content = configAdvanceInfo == null ? null : (String) configAdvanceInfo.get("content"); final String configTags = configAdvanceInfo == null ? null : (String) configAdvanceInfo.get("config_tags"); PaginationHelper helper = createPaginationHelper(); - String sqlCountRows = "select count(*) from config_info"; - String sqlFetchRows = "select ID,data_id,group_id,tenant_id,app_name,content from config_info"; - StringBuilder where = new StringBuilder(" where "); + String sqlCountRows = "SELECT count(*) FROM config_info"; + String sqlFetchRows = "SELECT id,data_id,group_id,tenant_id,app_name,content FROM config_info"; + StringBuilder where = new StringBuilder(" WHERE "); List params = new ArrayList(); params.add(generateLikeArgument(tenantTmp)); if (StringUtils.isNotBlank(configTags)) { - sqlCountRows = "select count(*) from config_info a left join config_tags_relation b on a.id=b.id "; - sqlFetchRows = "select a.ID,a.data_id,a.group_id,a.tenant_id,a.app_name,a.content from config_info a left join config_tags_relation b on a.id=b.id "; + sqlCountRows = "SELECT count(*) FROM config_info a LEFT JOIN config_tags_relation b ON a.id=b.id "; + sqlFetchRows = "SELECT a.id,a.data_id,a.group_id,a.tenant_id,a.app_name,a.content FROM config_info a LEFT JOIN config_tags_relation b ON a.id=b.id "; - where.append(" a.tenant_id like ? "); + where.append(" a.tenant_id LIKE ? "); if (!StringUtils.isBlank(dataId)) { - where.append(" and a.data_id like ? "); + where.append(" AND a.data_id LIKE ? "); params.add(generateLikeArgument(dataId)); } if (!StringUtils.isBlank(group)) { - where.append(" and a.group_id like ? "); + where.append(" AND a.group_id LIKE ? "); params.add(generateLikeArgument(group)); } if (!StringUtils.isBlank(appName)) { - where.append(" and a.app_name = ? "); + where.append(" AND a.app_name = ? "); params.add(appName); } if (!StringUtils.isBlank(content)) { - where.append(" and a.content like ? "); + where.append(" AND a.content LIKE ? "); params.add(generateLikeArgument(content)); } - where.append(" and b.tag_name in ("); + where.append(" AND b.tag_name IN ("); String[] tagArr = configTags.split(","); for (int i = 0; i < tagArr.length; i++) { if (i != 0) { @@ -1714,21 +1714,21 @@ public Page findConfigInfoLike4Page(final int pageNo, final int page } where.append(") "); } else { - where.append(" tenant_id like ? "); + where.append(" tenant_id LIKE ? "); if (!StringUtils.isBlank(dataId)) { - where.append(" and data_id like ? "); + where.append(" AND data_id LIKE ? "); params.add(generateLikeArgument(dataId)); } if (!StringUtils.isBlank(group)) { - where.append(" and group_id like ? "); + where.append(" AND group_id LIKE ? "); params.add(generateLikeArgument(group)); } if (!StringUtils.isBlank(appName)) { - where.append(" and app_name = ? "); + where.append(" AND app_name = ? "); params.add(appName); } if (!StringUtils.isBlank(content)) { - where.append(" and content like ? "); + where.append(" AND content LIKE ? "); params.add(generateLikeArgument(content)); } } @@ -1751,21 +1751,21 @@ public Page findConfigInfoBaseLike(final int pageNo, final int p PaginationHelper helper = createPaginationHelper(); - String sqlCountRows = "select count(*) from config_info where "; - String sqlFetchRows = "select ID,data_id,group_id,tenant_id,content from config_info where "; - String where = " 1=1 and tenant_id='' "; + String sqlCountRows = "SELECT count(*) FROM config_info WHERE "; + String sqlFetchRows = "SELECT id,data_id,group_id,tenant_id,content FROM config_info WHERE "; + String where = " 1=1 AND tenant_id='' "; List params = new ArrayList(); if (!StringUtils.isBlank(dataId)) { - where += " and data_id like ? "; + where += " AND data_id LIKE ? "; params.add(generateLikeArgument(dataId)); } if (!StringUtils.isBlank(group)) { - where += " and group_id like ? "; + where += " AND group_id LIKE "; params.add(generateLikeArgument(group)); } if (!StringUtils.isBlank(content)) { - where += " and content like ? "; + where += " AND content LIKE ? "; params.add(generateLikeArgument(content)); } @@ -1820,10 +1820,10 @@ public List findConfigInfoAggr(String dataId, String group, Stri public Page findConfigInfoAggrByPage(String dataId, String group, String tenant, final int pageNo, final int pageSize) { String tenantTmp = StringUtils.isBlank(tenant) ? StringUtils.EMPTY : tenant; - String sqlCountRows = "SELECT COUNT(*) FROM config_info_aggr WHERE data_id = ? and group_id = ? and tenant_id = ?"; + String sqlCountRows = "SELECT count(*) FROM config_info_aggr WHERE data_id = ? AND group_id = ? AND tenant_id = ?"; String sqlFetchRows = - "select data_id,group_id,tenant_id,datum_id,app_name,content from config_info_aggr where data_id=? and " - + "group_id=? and tenant_id=? order by datum_id limit ?,?"; + "SELECT data_id,group_id,tenant_id,datum_id,app_name,content FROM config_info_aggr WHERE data_id=? AND " + + "group_id=? AND tenant_id=? ORDER BY datum_id LIMIT ?,?"; PaginationHelper helper = createPaginationHelper(); try { return helper.fetchPageLimit(sqlCountRows, new Object[] {dataId, group, tenantTmp}, sqlFetchRows, @@ -1840,8 +1840,8 @@ public Page findConfigInfoAggrByPage(String dataId, String group public Page findConfigInfoAggrLike(final int pageNo, final int pageSize, ConfigKey[] configKeys, boolean blacklist) { - String sqlCountRows = "select count(*) from config_info_aggr where "; - String sqlFetchRows = "select data_id,group_id,tenant_id,datum_id,app_name,content from config_info_aggr where "; + String sqlCountRows = "SELECT count(*) FROM config_info_aggr WHERE "; + String sqlFetchRows = "SELECT data_id,group_id,tenant_id,datum_id,app_name,content FROM config_info_aggr WHERE "; StringBuilder where = new StringBuilder(" 1=1 "); // Whitelist, please leave the synchronization condition empty, there is no configuration that meets the conditions if (configKeys.length == 0 && blacklist == false) { @@ -1863,29 +1863,29 @@ public Page findConfigInfoAggrLike(final int pageNo, final int p if (blacklist) { if (isFirst) { isFirst = false; - where.append(" and "); + where.append(" AND "); } else { - where.append(" and "); + where.append(" AND "); } where.append("("); boolean isFirstSub = true; if (!StringUtils.isBlank(dataId)) { - where.append(" data_id not like ? "); + where.append(" data_id NOT LIKE ? "); params.add(generateLikeArgument(dataId)); isFirstSub = false; } if (!StringUtils.isBlank(group)) { if (!isFirstSub) { - where.append(" or "); + where.append(" OR "); } - where.append(" group_id not like ? "); + where.append(" group_id NOT LIKE ? "); params.add(generateLikeArgument(group)); isFirstSub = false; } if (!StringUtils.isBlank(appName)) { if (!isFirstSub) { - where.append(" or "); + where.append(" OR "); } where.append(" app_name != ? "); params.add(appName); @@ -1895,28 +1895,28 @@ public Page findConfigInfoAggrLike(final int pageNo, final int p } else { if (isFirst) { isFirst = false; - where.append(" and "); + where.append(" AND "); } else { - where.append(" or "); + where.append(" OR "); } where.append("("); boolean isFirstSub = true; if (!StringUtils.isBlank(dataId)) { - where.append(" data_id like ? "); + where.append(" data_id LIKE ? "); params.add(generateLikeArgument(dataId)); isFirstSub = false; } if (!StringUtils.isBlank(group)) { if (!isFirstSub) { - where.append(" and "); + where.append(" AND "); } - where.append(" group_id like ? "); + where.append(" group_id LIKE ? "); params.add(generateLikeArgument(group)); isFirstSub = false; } if (!StringUtils.isBlank(appName)) { if (!isFirstSub) { - where.append(" and "); + where.append(" AND "); } where.append(" app_name = ? "); params.add(appName); @@ -1988,35 +1988,35 @@ public Page findChangeConfig(final String dataId, final Strin final String appName, final Timestamp startTime, final Timestamp endTime, final int pageNo, final int pageSize, final long lastMaxId) { String tenantTmp = StringUtils.isBlank(tenant) ? StringUtils.EMPTY : tenant; - String sqlCountRows = "select count(*) from config_info where "; - String sqlFetchRows = "select id,data_id,group_id,tenant_id,app_name,content,type,md5,gmt_modified from config_info where "; + String sqlCountRows = "SELECT count(*) FROM config_info WHERE "; + String sqlFetchRows = "SELECT id,data_id,group_id,tenant_id,app_name,content,type,md5,gmt_modified FROM config_info WHERE "; String where = " 1=1 "; List params = new ArrayList(); if (!StringUtils.isBlank(dataId)) { - where += " and data_id like ? "; + where += " AND data_id LIKE ? "; params.add(generateLikeArgument(dataId)); } if (!StringUtils.isBlank(group)) { - where += " and group_id like ? "; + where += " AND group_id LIKE ? "; params.add(generateLikeArgument(group)); } if (!StringUtils.isBlank(tenantTmp)) { - where += " and tenant_id = ? "; + where += " AND tenant_id = ? "; params.add(tenantTmp); } if (!StringUtils.isBlank(appName)) { - where += " and app_name = ? "; + where += " AND app_name = ? "; params.add(appName); } if (startTime != null) { - where += " and gmt_modified >=? "; + where += " AND gmt_modified >=? "; params.add(startTime); } if (endTime != null) { - where += " and gmt_modified <=? "; + where += " AND gmt_modified <=? "; params.add(endTime); } @@ -2180,7 +2180,7 @@ public void removeConfigInfoByIdsAtomic(final String ids) { return; } StringBuilder sql = new StringBuilder(SQL_DELETE_CONFIG_INFO_BY_IDS); - sql.append("id in ("); + sql.append("id IN ("); List paramList = new ArrayList<>(); String[] tagArr = ids.split(","); for (int i = 0; i < tagArr.length; i++) { @@ -2251,7 +2251,7 @@ private int updateConfigInfoAtomicCas(final ConfigInfo configInfo, final String try { return jt.update("UPDATE config_info SET content=?, md5 = ?, src_ip=?,src_user=?,gmt_modified=?," + "app_name=?,c_desc=?,c_use=?,effect=?,type=?,c_schema=? " - + "WHERE data_id=? AND group_id=? AND tenant_id=? AND (md5=? or md5 is null or md5='')", + + "WHERE data_id=? AND group_id=? AND tenant_id=? AND (md5=? OR md5 IS NULL OR md5='')", configInfo.getContent(), md5Tmp, srcIp, srcUser, time, appNameTmp, desc, use, effect, type, schema, configInfo.getDataId(), configInfo.getGroup(), tenantTmp, configInfo.getMd5()); } catch (CannotGetJdbcConnectionException e) { @@ -2266,7 +2266,7 @@ public List findConfigInfosByIds(final String ids) { return null; } StringBuilder sql = new StringBuilder(SQL_FIND_CONFIG_INFO_BY_IDS); - sql.append("id in ("); + sql.append("id IN ("); List paramList = new ArrayList<>(); String[] tagArr = ids.split(","); for (int i = 0; i < tagArr.length; i++) { @@ -2321,7 +2321,7 @@ public ConfigAllInfo findConfigAllInfo(final String dataId, final String group, try { List configTagList = this.selectTagByConfig(dataId, group, tenant); ConfigAllInfo configAdvance = this.jt.queryForObject( - "SELECT ID,data_id,group_id,tenant_id,app_name,content,md5," + "SELECT id,data_id,group_id,tenant_id,app_name,content,md5," + "gmt_create,gmt_modified,src_user,src_ip,c_desc,c_use,effect,type,c_schema FROM config_info " + "WHERE data_id=? AND group_id=? AND tenant_id=?", new Object[] {dataId, group, tenantTmp}, CONFIG_ALL_INFO_ROW_MAPPER); @@ -2367,10 +2367,10 @@ public Page findConfigHistory(String dataId, String group, St int pageSize) { PaginationHelper helper = createPaginationHelper(); String tenantTmp = StringUtils.isBlank(tenant) ? StringUtils.EMPTY : tenant; - String sqlCountRows = "select count(*) from his_config_info where data_id = ? and group_id = ? and tenant_id = ?"; + String sqlCountRows = "SELECT count(*) FROM his_config_info WHERE data_id = ? AND group_id = ? AND tenant_id = ?"; String sqlFetchRows = - "select nid,data_id,group_id,tenant_id,app_name,src_ip,src_user,op_type,gmt_create,gmt_modified from his_config_info " - + "where data_id = ? and group_id = ? and tenant_id = ? order by nid desc"; + "SELECT nid,data_id,group_id,tenant_id,app_name,src_ip,src_user,op_type,gmt_create,gmt_modified FROM his_config_info " + + "WHERE data_id = ? AND group_id = ? AND tenant_id = ? ORDER BY nid DESC"; Page page = null; try { @@ -2428,7 +2428,7 @@ public ConfigHistoryInfo detailConfigHistory(Long nid) { @Override public ConfigHistoryInfo detailPreviousConfigHistory(Long id) { - String sqlFetchRows = "SELECT nid,data_id,group_id,tenant_id,app_name,content,md5,src_user,src_ip,op_type,gmt_create,gmt_modified FROM his_config_info WHERE nid = (select max(nid) from his_config_info where id = ?) "; + String sqlFetchRows = "SELECT nid,data_id,group_id,tenant_id,app_name,content,md5,src_user,src_ip,op_type,gmt_create,gmt_modified FROM his_config_info WHERE nid = (SELECT max(nid) FROM his_config_info WHERE id = ?) "; try { ConfigHistoryInfo historyInfo = jt .queryForObject(sqlFetchRows, new Object[] {id}, HISTORY_DETAIL_ROW_MAPPER); @@ -2557,7 +2557,7 @@ public List listAllGroupKeyMd5() { @Override public List listGroupKeyMd5ByPage(int pageNo, int pageSize) { - String sqlCountRows = " SELECT COUNT(*) FROM config_info "; + String sqlCountRows = " SELECT count(*) FROM config_info "; String sqlFetchRows = " SELECT t.id,data_id,group_id,tenant_id,app_name,md5,type,gmt_modified FROM " + "( SELECT id FROM config_info ORDER BY id LIMIT ?,? ) g, config_info t WHERE g.id = t.id"; PaginationHelper helper = createPaginationHelper(); @@ -2589,7 +2589,7 @@ public ConfigInfoWrapper queryConfigInfo(final String dataId, final String group String tenantTmp = StringUtils.isBlank(tenant) ? StringUtils.EMPTY : tenant; try { return this.jt.queryForObject( - "SELECT ID,data_id,group_id,tenant_id,app_name,content,type,gmt_modified,md5 FROM config_info " + "SELECT id,data_id,group_id,tenant_id,app_name,content,type,gmt_modified,md5 FROM config_info " + "WHERE data_id=? AND group_id=? AND tenant_id=?", new Object[] {dataId, group, tenantTmp}, CONFIG_INFO_WRAPPER_ROW_MAPPER); } catch (EmptyResultDataAccessException e) { @@ -2602,7 +2602,7 @@ public ConfigInfoWrapper queryConfigInfo(final String dataId, final String group @Override public boolean isExistTable(String tableName) { - String sql = String.format("select 1 from %s limit 1", tableName); + String sql = String.format("SELECT 1 FROM %s LIMIT 1", tableName); try { jt.queryForObject(sql, Integer.class); return true; @@ -2658,10 +2658,10 @@ public Boolean completeMd5() { public List findAllConfigInfo4Export(final String dataId, final String group, final String tenant, final String appName, final List ids) { String tenantTmp = StringUtils.isBlank(tenant) ? StringUtils.EMPTY : tenant; - StringBuilder where = new StringBuilder(" where "); + StringBuilder where = new StringBuilder(" WHERE "); List paramList = new ArrayList<>(); if (!CollectionUtils.isEmpty(ids)) { - where.append(" id in ("); + where.append(" id IN ("); for (int i = 0; i < ids.size(); i++) { if (i != 0) { where.append(", "); @@ -2674,15 +2674,15 @@ public List findAllConfigInfo4Export(final String dataId, final S where.append(" tenant_id=? "); paramList.add(tenantTmp); if (!StringUtils.isBlank(dataId)) { - where.append(" and data_id like ? "); + where.append(" AND data_id LIKE ? "); paramList.add(generateLikeArgument(dataId)); } if (StringUtils.isNotBlank(group)) { - where.append(" and group_id=? "); + where.append(" AND group_id=? "); paramList.add(group); } if (StringUtils.isNotBlank(appName)) { - where.append(" and app_name=? "); + where.append(" AND app_name=? "); paramList.add(appName); } } diff --git a/config/src/test/java/com/alibaba/nacos/config/server/auth/ExternalPermissionPersistServiceImplTest.java b/config/src/test/java/com/alibaba/nacos/config/server/auth/ExternalPermissionPersistServiceImplTest.java index adf953129cf..10b38db08bd 100644 --- a/config/src/test/java/com/alibaba/nacos/config/server/auth/ExternalPermissionPersistServiceImplTest.java +++ b/config/src/test/java/com/alibaba/nacos/config/server/auth/ExternalPermissionPersistServiceImplTest.java @@ -69,7 +69,7 @@ public void testGetPermissions() { @Test public void testAddPermission() { - String sql = "INSERT into permissions (role, resource, action) VALUES (?, ?, ?)"; + String sql = "INSERT INTO permissions (role, resource, action) VALUES (?, ?, ?)"; externalPermissionPersistService.addPermission("role", "resource", "action"); Mockito.verify(jdbcTemplate).update(sql, "role", "resource", "action"); @@ -77,7 +77,7 @@ public void testAddPermission() { @Test public void testDeletePermission() { - String sql = "DELETE from permissions WHERE role=? and resource=? and action=?"; + String sql = "DELETE FROM permissions WHERE role=? AND resource=? AND action=?"; externalPermissionPersistService.deletePermission("role", "resource", "action"); Mockito.verify(jdbcTemplate).update(sql, "role", "resource", "action"); diff --git a/config/src/test/java/com/alibaba/nacos/config/server/auth/ExternalRolePersistServiceImplTest.java b/config/src/test/java/com/alibaba/nacos/config/server/auth/ExternalRolePersistServiceImplTest.java index a81d7359d9a..263912a7158 100644 --- a/config/src/test/java/com/alibaba/nacos/config/server/auth/ExternalRolePersistServiceImplTest.java +++ b/config/src/test/java/com/alibaba/nacos/config/server/auth/ExternalRolePersistServiceImplTest.java @@ -84,11 +84,11 @@ public void testAddRole() { public void testDeleteRole() { externalRolePersistService.deleteRole("role"); - String sql = "DELETE from roles WHERE role=?"; + String sql = "DELETE FROM roles WHERE role=?"; Mockito.verify(jt).update(sql, "role"); externalRolePersistService.deleteRole("role", "userName"); - String sql2 = "DELETE from roles WHERE role=? and username=?"; + String sql2 = "DELETE FROM roles WHERE role=? AND username=?"; Mockito.verify(jt).update(sql2, "role", "userName"); } diff --git a/config/src/test/java/com/alibaba/nacos/config/server/auth/ExternalUserPersistServiceImplTest.java b/config/src/test/java/com/alibaba/nacos/config/server/auth/ExternalUserPersistServiceImplTest.java index 6b99023d2a6..c6a70b8e99a 100644 --- a/config/src/test/java/com/alibaba/nacos/config/server/auth/ExternalUserPersistServiceImplTest.java +++ b/config/src/test/java/com/alibaba/nacos/config/server/auth/ExternalUserPersistServiceImplTest.java @@ -72,7 +72,7 @@ public void testCreateUser() { public void testDeleteUser() { externalUserPersistService.deleteUser("username"); - String sql = "DELETE from users WHERE username=?"; + String sql = "DELETE FROM users WHERE username=?"; Mockito.verify(jdbcTemplate).update(sql, "username"); }