opensource/cloudbeaver
3
0
Fork 0
mirror of https://github.com/dbeaver/cloudbeaver.git synced 2026-09-24 16:04:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

CB-153 Batch data update fixes

Browse Source
This commit is contained in:
serge-rider
2020-06-28 19:59:35 +03:00
parent a6aa1a91df
commit b8420a7377
3 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLProcessor.java
+18 -11
View File
@@ -279,7 +279,7 @@ public class WebSQLProcessor {
updatedResultSet.setRows(new Object[][]{finalRow});
WebSQLQueryResults updateResults = new WebSQLQueryResults();
updateResults.setUpdateRowCount((int) statistics.getRowsUpdated());
updateResults.setUpdateRowCount(statistics.getRowsUpdated());
updateResults.setResultSet(updatedResultSet);
result.setDuration(statistics.getExecuteTime());
result.setResults(new WebSQLQueryResults[]{updateResults});
@@ -329,6 +329,13 @@ public class WebSQLProcessor {
DBDAttributeBinding[] keyAttributes = rowIdentifier.getAttributes().toArray(new DBDAttributeBinding[0]);
if (!CommonUtils.isEmpty(updatedRows)) {
WebSQLQueryResultSet updatedResultSet = new WebSQLQueryResultSet();
updatedResultSet.setResultsInfo(resultsInfo);
updatedResultSet.setColumns(resultsInfo.getAttributes());
long totalUpdateCount = 0;
List <Object[]> resultRows = new ArrayList<>();
for (WebSQLResultsRow row : updatedRows) {
Map<String, Object> updateValues = row.getUpdateValues();
if (CommonUtils.isEmpty(row.getData()) || CommonUtils.isEmpty(updateValues)) {
@@ -362,20 +369,20 @@ public class WebSQLProcessor {
updateBatch.add(rowValues);
DBCStatistics statistics = updateBatch.execute(session);
WebSQLQueryResultSet updatedResultSet = new WebSQLQueryResultSet();
updatedResultSet.setResultsInfo(resultsInfo);
updatedResultSet.setColumns(resultsInfo.getAttributes());
updatedResultSet.setRows(new Object[][]{finalRow});
WebSQLQueryResults updateResults = new WebSQLQueryResults();
updateResults.setUpdateRowCount((int) statistics.getRowsUpdated());
updateResults.setResultSet(updatedResultSet);
queryResults.add(updateResults);
totalUpdateCount += statistics.getRowsUpdated();
result.setDuration(result.getDuration() + statistics.getExecuteTime());
resultRows.add(finalRow);
}
WebSQLQueryResults updateResults = new WebSQLQueryResults();
updateResults.setUpdateRowCount(totalUpdateCount);
updateResults.setResultSet(updatedResultSet);
updatedResultSet.setRows(resultRows.toArray(new Object[0][]));
queryResults.add(updateResults);
}
if (!CommonUtils.isEmpty(updatedRows)) {
if (!CommonUtils.isEmpty(addedRows)) {
throw new DBCException("New row add is not supported");
}
server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLQueryResults.java
+3 -3
View File
@@ -23,15 +23,15 @@ import org.jkiss.dbeaver.model.meta.Property;
*/
public class WebSQLQueryResults {
private Integer updateRowCount;
private Long updateRowCount;
private WebSQLQueryResultSet resultSet;
@Property
public Integer getUpdateRowCount() {
public Long getUpdateRowCount() {
return updateRowCount;
}
public void setUpdateRowCount(int updateRowCount) {
public void setUpdateRowCount(long updateRowCount) {
this.updateRowCount = updateRowCount;
}
server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebServiceBindingSQL.java
+1 -1
View File
@@ -167,7 +167,7 @@ public class WebServiceBindingSQL extends WebServiceBindingBase<DBWServiceSQL> {
}
private static List<WebSQLResultsRow> getResultsRow(DataFetchingEnvironment env, String param) {
List<Map<String, Object>> mapList = env.getArgument("param");
List<Map<String, Object>> mapList = env.getArgument(param);
if (CommonUtils.isEmpty(mapList)) {
return null;
}