[ISSUE #4311] Fix Derby data source related SQL LIMIT exception (#4313)

* for #4311,Fixed Derby data source related SQL LIMIT exception.

* fix code style.

* code format.
This commit is contained in:
mai.jh 2020-11-24 13:21:15 +08:00 committed by GitHub
parent 7f2a3307d6
commit 3bf8844992
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1116,16 +1116,26 @@ public class EmbeddedStoragePersistServiceImpl implements PersistService {
@Override
public List<String> getTenantIdList(int page, int pageSize) {
String sql = "SELECT tenant_id FROM config_info WHERE tenant_id != '' GROUP BY tenant_id LIMIT ?, ?";
PaginationHelper<String> helper = createPaginationHelper();
String sql = "SELECT tenant_id FROM config_info WHERE tenant_id != '' GROUP BY tenant_id LIMIT ?,?";
int from = (page - 1) * pageSize;
return databaseOperate.queryMany(sql, new Object[] {from, pageSize}, String.class);
Page<String> pageList = helper.fetchPageLimit(sql, new Object[] {from, pageSize}, page, pageSize,
(resultSet, i) -> resultSet.getString("tenant_id"));
return pageList.getPageItems();
}
@Override
public List<String> getGroupIdList(int page, int pageSize) {
String sql = "SELECT group_id FROM config_info WHERE tenant_id ='' GROUP BY group_id LIMIT ?, ?";
PaginationHelper<String> helper = createPaginationHelper();
String sql = "SELECT group_id FROM config_info WHERE tenant_id ='' GROUP BY group_id LIMIT ?,?";
int from = (page - 1) * pageSize;
return databaseOperate.queryMany(sql, new Object[] {from, pageSize}, String.class);
Page<String> pageList = helper.fetchPageLimit(sql, new Object[] {from, pageSize}, page, pageSize,
(resultSet, i) -> resultSet.getString("group_id"));
return pageList.getPageItems();
}
@Override