open all connections inside try-with-resources

This commit is contained in:
2022-07-01 14:54:03 -05:00
parent 5c6ea4732a
commit 55b5f3536c
4 changed files with 96 additions and 86 deletions

View File

@ -65,7 +65,8 @@ public class RDBMSDeleteAction extends AbstractRDBMSAction implements DeleteInte
// todo sql customization - can edit sql and/or param list // todo sql customization - can edit sql and/or param list
Connection connection = getConnection(deleteRequest); try(Connection connection = getConnection(deleteRequest))
{
QueryManager.executeUpdateForRowCount(connection, sql, params); QueryManager.executeUpdateForRowCount(connection, sql, params);
List<QRecord> outputRecords = new ArrayList<>(); List<QRecord> outputRecords = new ArrayList<>();
rs.setRecords(outputRecords); rs.setRecords(outputRecords);
@ -76,6 +77,7 @@ public class RDBMSDeleteAction extends AbstractRDBMSAction implements DeleteInte
QRecord outputRecord = new QRecord(qRecord); QRecord outputRecord = new QRecord(qRecord);
outputRecords.add(outputRecord); outputRecords.add(outputRecord);
} }
}
return rs; return rs;
} }

View File

@ -99,7 +99,8 @@ public class RDBMSInsertAction extends AbstractRDBMSAction implements InsertInte
// todo - non-serial-id style tables // todo - non-serial-id style tables
// todo - other generated values, e.g., createDate... maybe need to re-select? // todo - other generated values, e.g., createDate... maybe need to re-select?
Connection connection = getConnection(insertRequest); try(Connection connection = getConnection(insertRequest))
{
List<Integer> idList = QueryManager.executeInsertForGeneratedIds(connection, sql.toString(), params); List<Integer> idList = QueryManager.executeInsertForGeneratedIds(connection, sql.toString(), params);
List<QRecord> outputRecords = new ArrayList<>(); List<QRecord> outputRecords = new ArrayList<>();
rs.setRecords(outputRecords); rs.setRecords(outputRecords);
@ -111,6 +112,7 @@ public class RDBMSInsertAction extends AbstractRDBMSAction implements InsertInte
outputRecord.setValue(table.getPrimaryKeyField(), id); outputRecord.setValue(table.getPrimaryKeyField(), id);
outputRecords.add(outputRecord); outputRecords.add(outputRecord);
} }
}
return rs; return rs;
} }

View File

@ -56,6 +56,8 @@ public class RDBMSQueryAction extends AbstractRDBMSAction implements QueryInterf
{ {
private static final Logger LOG = LogManager.getLogger(RDBMSQueryAction.class); private static final Logger LOG = LogManager.getLogger(RDBMSQueryAction.class);
/******************************************************************************* /*******************************************************************************
** **
*******************************************************************************/ *******************************************************************************/
@ -102,7 +104,8 @@ public class RDBMSQueryAction extends AbstractRDBMSAction implements QueryInterf
List<QRecord> records = new ArrayList<>(); List<QRecord> records = new ArrayList<>();
rs.setRecords(records); rs.setRecords(records);
Connection connection = getConnection(queryRequest); try(Connection connection = getConnection(queryRequest))
{
QueryManager.executeStatement(connection, sql, ((ResultSet resultSet) -> QueryManager.executeStatement(connection, sql, ((ResultSet resultSet) ->
{ {
ResultSetMetaData metaData = resultSet.getMetaData(); ResultSetMetaData metaData = resultSet.getMetaData();
@ -125,6 +128,7 @@ public class RDBMSQueryAction extends AbstractRDBMSAction implements QueryInterf
} }
}), params); }), params);
}
return rs; return rs;
} }

View File

@ -58,7 +58,8 @@ public class RDBMSUpdateAction extends AbstractRDBMSAction implements UpdateInte
// todo - sql batch for performance // todo - sql batch for performance
// todo - if setting a bunch of records to have the same value, a single update where id IN? // todo - if setting a bunch of records to have the same value, a single update where id IN?
Connection connection = getConnection(updateRequest); try(Connection connection = getConnection(updateRequest))
{
int recordIndex = 0; int recordIndex = 0;
for(QRecord record : updateRequest.getRecords()) for(QRecord record : updateRequest.getRecords())
{ {
@ -101,6 +102,7 @@ public class RDBMSUpdateAction extends AbstractRDBMSAction implements UpdateInte
throw new QException("Error executing update: " + e.getMessage(), e); throw new QException("Error executing update: " + e.getMessage(), e);
} }
} }
}
return rs; return rs;
} }