Skip to content

Commit

Permalink
Fixed error with parameters for list items
Browse files Browse the repository at this point in the history
  • Loading branch information
yamelsenih committed Oct 17, 2019
1 parent eef6f20 commit 6717a38
Showing 1 changed file with 13 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -545,7 +545,12 @@ private BusinessProcess.Builder runProcess(Properties context, RunBusinessProces
}
}
// Execute Process
ProcessInfo result = builder.execute();
ProcessInfo result = null;
try {
result = builder.execute();
} catch (Exception e) {
result = builder.getProcessInfo();
}
String instanceUuid = DB.getSQLValueString(null, "SELECT UUID FROM AD_PInstance WHERE AD_PInstance_ID = ?", result.getAD_PInstance_ID());
response.setInstanceUuid(validateNull(instanceUuid));
response.setIsError(result.isError());
Expand Down Expand Up @@ -1318,12 +1323,12 @@ private ListEntitiesResponse.Builder convertEntitiesList(Properties context, Lis
orderByClause = " ORDER BY " + orderByClause;
}
// Count records
count = countRecords(context, parsedSQL, criteria.getTableName(), new ArrayList<>());
count = countRecords(context, parsedSQL, criteria.getTableName(), params);
// Add Row Number
parsedSQL = parsedSQL + " AND ROWNUM >= " + offset + " AND ROWNUM <= " + limit;
// Add Order By
parsedSQL = parsedSQL + orderByClause;
builder = convertListEntitiesResult(MTable.get(context, criteria.getTableName()), parsedSQL);
builder = convertListEntitiesResult(MTable.get(context, criteria.getTableName()), parsedSQL, params);
}
//
builder.setRecordCount(count);
Expand All @@ -1343,7 +1348,7 @@ private ListEntitiesResponse.Builder convertEntitiesList(Properties context, Lis
* @param sql
* @return
*/
private ListEntitiesResponse.Builder convertListEntitiesResult(MTable table, String sql) {
private ListEntitiesResponse.Builder convertListEntitiesResult(MTable table, String sql, List<Object> params) {
PreparedStatement pstmt = null;
ResultSet rs = null;
ListEntitiesResponse.Builder builder = ListEntitiesResponse.newBuilder();
Expand All @@ -1356,6 +1361,10 @@ private ListEntitiesResponse.Builder convertListEntitiesResult(MTable table, Str
}
// SELECT Key, Value, Name FROM ...
pstmt = DB.prepareStatement(sql, null);
AtomicInteger parameterIndex = new AtomicInteger(1);
for(Object value : params) {
setParameterFromObject(pstmt, value, parameterIndex.getAndIncrement());
}
// Get from Query
rs = pstmt.executeQuery();
while(rs.next()) {
Expand Down

0 comments on commit 6717a38

Please sign in to comment.