QRunIO/qqq
2
0
Fork 0
mirror of https://github.com/Kingsrook/qqq.git synced 2025-07-18 13:10:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reorganize packages; rename Request to Input and Response to Output

Browse Source
This commit is contained in:
darin.kelkhoff
2022-07-14 12:59:23 -05:00
parent 8a3f798553
commit ae70c34d4e
16 changed files with 272 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -51,7 +51,7 @@
<dependency> <dependency>
<groupId>com.kingsrook.qqq</groupId> <groupId>com.kingsrook.qqq</groupId>
<artifactId>qqq-backend-core</artifactId> <artifactId>qqq-backend-core</artifactId>
<version>0.1.0</version> <version>0.2.0-SNAPSHOT</version>
</dependency> </dependency>
<!-- 3rd party deps specifically for this module --> <!-- 3rd party deps specifically for this module -->

14
src/main/java/com/kingsrook/qqq/backend/module/rdbms/RDBMSBackendModule.java
View File

@ -22,14 +22,14 @@
package com.kingsrook.qqq.backend.module.rdbms; package com.kingsrook.qqq.backend.module.rdbms;
import com.kingsrook.qqq.backend.core.actions.interfaces.CountInterface;
import com.kingsrook.qqq.backend.core.actions.interfaces.DeleteInterface;
import com.kingsrook.qqq.backend.core.actions.interfaces.InsertInterface;
import com.kingsrook.qqq.backend.core.actions.interfaces.QueryInterface;
import com.kingsrook.qqq.backend.core.actions.interfaces.UpdateInterface;
import com.kingsrook.qqq.backend.core.model.metadata.QBackendMetaData; import com.kingsrook.qqq.backend.core.model.metadata.QBackendMetaData;
import com.kingsrook.qqq.backend.core.model.metadata.QTableBackendDetails; import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableBackendDetails;
import com.kingsrook.qqq.backend.core.modules.interfaces.CountInterface; import com.kingsrook.qqq.backend.core.modules.backend.QBackendModuleInterface;
import com.kingsrook.qqq.backend.core.modules.interfaces.DeleteInterface;
import com.kingsrook.qqq.backend.core.modules.interfaces.InsertInterface;
import com.kingsrook.qqq.backend.core.modules.interfaces.QBackendModuleInterface;
import com.kingsrook.qqq.backend.core.modules.interfaces.QueryInterface;
import com.kingsrook.qqq.backend.core.modules.interfaces.UpdateInterface;
import com.kingsrook.qqq.backend.module.rdbms.actions.RDBMSCountAction; import com.kingsrook.qqq.backend.module.rdbms.actions.RDBMSCountAction;
import com.kingsrook.qqq.backend.module.rdbms.actions.RDBMSDeleteAction; import com.kingsrook.qqq.backend.module.rdbms.actions.RDBMSDeleteAction;
import com.kingsrook.qqq.backend.module.rdbms.actions.RDBMSInsertAction; import com.kingsrook.qqq.backend.module.rdbms.actions.RDBMSInsertAction;

12
src/main/java/com/kingsrook/qqq/backend/module/rdbms/actions/AbstractRDBMSAction.java
View File

@ -29,12 +29,12 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.function.Function; import java.util.function.Function;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import com.kingsrook.qqq.backend.core.model.actions.AbstractQTableRequest; import com.kingsrook.qqq.backend.core.model.actions.AbstractTableActionInput;
import com.kingsrook.qqq.backend.core.model.actions.query.QFilterCriteria; import com.kingsrook.qqq.backend.core.model.actions.tables.query.QFilterCriteria;
import com.kingsrook.qqq.backend.core.model.data.QRecord; import com.kingsrook.qqq.backend.core.model.data.QRecord;
import com.kingsrook.qqq.backend.core.model.metadata.QFieldMetaData; import com.kingsrook.qqq.backend.core.model.metadata.fields.QFieldMetaData;
import com.kingsrook.qqq.backend.core.model.metadata.QFieldType; import com.kingsrook.qqq.backend.core.model.metadata.fields.QFieldType;
import com.kingsrook.qqq.backend.core.model.metadata.QTableMetaData; import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableMetaData;
import com.kingsrook.qqq.backend.core.utils.StringUtils; import com.kingsrook.qqq.backend.core.utils.StringUtils;
import com.kingsrook.qqq.backend.module.rdbms.jdbc.ConnectionManager; import com.kingsrook.qqq.backend.module.rdbms.jdbc.ConnectionManager;
import com.kingsrook.qqq.backend.module.rdbms.model.metadata.RDBMSBackendMetaData; import com.kingsrook.qqq.backend.module.rdbms.model.metadata.RDBMSBackendMetaData;
@ -85,7 +85,7 @@ public abstract class AbstractRDBMSAction
/******************************************************************************* /*******************************************************************************
** Get a database connection, per the backend in the request. ** Get a database connection, per the backend in the request.
*******************************************************************************/ *******************************************************************************/
protected Connection getConnection(AbstractQTableRequest qTableRequest) throws SQLException protected Connection getConnection(AbstractTableActionInput qTableRequest) throws SQLException
{ {
ConnectionManager connectionManager = new ConnectionManager(); ConnectionManager connectionManager = new ConnectionManager();
return connectionManager.getConnection((RDBMSBackendMetaData) qTableRequest.getBackend()); return connectionManager.getConnection((RDBMSBackendMetaData) qTableRequest.getBackend());

20
src/main/java/com/kingsrook/qqq/backend/module/rdbms/actions/RDBMSCountAction.java
View File

@ -28,12 +28,12 @@ import java.sql.ResultSet;
import java.sql.ResultSetMetaData; import java.sql.ResultSetMetaData;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import com.kingsrook.qqq.backend.core.actions.interfaces.CountInterface;
import com.kingsrook.qqq.backend.core.exceptions.QException; import com.kingsrook.qqq.backend.core.exceptions.QException;
import com.kingsrook.qqq.backend.core.model.actions.count.CountRequest; import com.kingsrook.qqq.backend.core.model.actions.tables.count.CountInput;
import com.kingsrook.qqq.backend.core.model.actions.count.CountResult; import com.kingsrook.qqq.backend.core.model.actions.tables.count.CountOutput;
import com.kingsrook.qqq.backend.core.model.actions.query.QQueryFilter; import com.kingsrook.qqq.backend.core.model.actions.tables.query.QQueryFilter;
import com.kingsrook.qqq.backend.core.model.metadata.QTableMetaData; import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableMetaData;
import com.kingsrook.qqq.backend.core.modules.interfaces.CountInterface;
import com.kingsrook.qqq.backend.core.utils.CollectionUtils; import com.kingsrook.qqq.backend.core.utils.CollectionUtils;
import com.kingsrook.qqq.backend.module.rdbms.jdbc.QueryManager; import com.kingsrook.qqq.backend.module.rdbms.jdbc.QueryManager;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
@ -52,16 +52,16 @@ public class RDBMSCountAction extends AbstractRDBMSAction implements CountInterf
/******************************************************************************* /*******************************************************************************
** **
*******************************************************************************/ *******************************************************************************/
public CountResult execute(CountRequest countRequest) throws QException public CountOutput execute(CountInput countInput) throws QException
{ {
try try
{ {
QTableMetaData table = countRequest.getTable(); QTableMetaData table = countInput.getTable();
String tableName = getTableName(table); String tableName = getTableName(table);
String sql = "SELECT count(*) as record_count FROM " + tableName; String sql = "SELECT count(*) as record_count FROM " + tableName;
QQueryFilter filter = countRequest.getFilter(); QQueryFilter filter = countInput.getFilter();
List<Serializable> params = new ArrayList<>(); List<Serializable> params = new ArrayList<>();
if(filter != null && CollectionUtils.nullSafeHasContents(filter.getCriteria())) if(filter != null && CollectionUtils.nullSafeHasContents(filter.getCriteria()))
{ {
@ -70,9 +70,9 @@ public class RDBMSCountAction extends AbstractRDBMSAction implements CountInterf
// todo sql customization - can edit sql and/or param list // todo sql customization - can edit sql and/or param list
CountResult rs = new CountResult(); CountOutput rs = new CountOutput();
try(Connection connection = getConnection(countRequest)) try(Connection connection = getConnection(countInput))
{ {
QueryManager.executeStatement(connection, sql, ((ResultSet resultSet) -> QueryManager.executeStatement(connection, sql, ((ResultSet resultSet) ->
{ {

24
src/main/java/com/kingsrook/qqq/backend/module/rdbms/actions/RDBMSDeleteAction.java
View File

@ -27,12 +27,12 @@ import java.sql.Connection;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import com.kingsrook.qqq.backend.core.actions.interfaces.DeleteInterface;
import com.kingsrook.qqq.backend.core.exceptions.QException; import com.kingsrook.qqq.backend.core.exceptions.QException;
import com.kingsrook.qqq.backend.core.model.actions.delete.DeleteRequest; import com.kingsrook.qqq.backend.core.model.actions.tables.delete.DeleteInput;
import com.kingsrook.qqq.backend.core.model.actions.delete.DeleteResult; import com.kingsrook.qqq.backend.core.model.actions.tables.delete.DeleteOutput;
import com.kingsrook.qqq.backend.core.model.data.QRecord; import com.kingsrook.qqq.backend.core.model.data.QRecord;
import com.kingsrook.qqq.backend.core.model.metadata.QTableMetaData; import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableMetaData;
import com.kingsrook.qqq.backend.core.modules.interfaces.DeleteInterface;
import com.kingsrook.qqq.backend.module.rdbms.jdbc.QueryManager; import com.kingsrook.qqq.backend.module.rdbms.jdbc.QueryManager;
@ -45,12 +45,12 @@ public class RDBMSDeleteAction extends AbstractRDBMSAction implements DeleteInte
/******************************************************************************* /*******************************************************************************
** **
*******************************************************************************/ *******************************************************************************/
public DeleteResult execute(DeleteRequest deleteRequest) throws QException public DeleteOutput execute(DeleteInput deleteInput) throws QException
{ {
try try
{ {
DeleteResult rs = new DeleteResult(); DeleteOutput rs = new DeleteOutput();
QTableMetaData table = deleteRequest.getTable(); QTableMetaData table = deleteInput.getTable();
String tableName = getTableName(table); String tableName = getTableName(table);
String primaryKeyName = getColumnName(table.getField(table.getPrimaryKeyField())); String primaryKeyName = getColumnName(table.getField(table.getPrimaryKeyField()));
@ -59,20 +59,20 @@ public class RDBMSDeleteAction extends AbstractRDBMSAction implements DeleteInte
+ " WHERE " + " WHERE "
+ primaryKeyName + primaryKeyName
+ " IN (" + " IN ("
+ deleteRequest.getPrimaryKeys().stream().map(x -> "?").collect(Collectors.joining(",")) + deleteInput.getPrimaryKeys().stream().map(x -> "?").collect(Collectors.joining(","))
+ ")"; + ")";
List<Serializable> params = deleteRequest.getPrimaryKeys(); List<Serializable> params = deleteInput.getPrimaryKeys();
// todo sql customization - can edit sql and/or param list // todo sql customization - can edit sql and/or param list
try(Connection connection = getConnection(deleteRequest)) try(Connection connection = getConnection(deleteInput))
{ {
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);
for(Serializable primaryKey : deleteRequest.getPrimaryKeys()) for(Serializable primaryKey : deleteInput.getPrimaryKeys())
{ {
QRecord qRecord = new QRecord().withTableName(deleteRequest.getTableName()).withValue("id", primaryKey); QRecord qRecord = new QRecord().withTableName(deleteInput.getTableName()).withValue("id", primaryKey);
// todo uh, identify any errors? // todo uh, identify any errors?
QRecord outputRecord = new QRecord(qRecord); QRecord outputRecord = new QRecord(qRecord);
outputRecords.add(outputRecord); outputRecords.add(outputRecord);

26
src/main/java/com/kingsrook/qqq/backend/module/rdbms/actions/RDBMSInsertAction.java
View File

@ -28,13 +28,13 @@ import java.time.Instant;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import com.kingsrook.qqq.backend.core.actions.interfaces.InsertInterface;
import com.kingsrook.qqq.backend.core.exceptions.QException; import com.kingsrook.qqq.backend.core.exceptions.QException;
import com.kingsrook.qqq.backend.core.model.actions.insert.InsertRequest; import com.kingsrook.qqq.backend.core.model.actions.tables.insert.InsertInput;
import com.kingsrook.qqq.backend.core.model.actions.insert.InsertResult; import com.kingsrook.qqq.backend.core.model.actions.tables.insert.InsertOutput;
import com.kingsrook.qqq.backend.core.model.data.QRecord; import com.kingsrook.qqq.backend.core.model.data.QRecord;
import com.kingsrook.qqq.backend.core.model.metadata.QFieldMetaData; import com.kingsrook.qqq.backend.core.model.metadata.fields.QFieldMetaData;
import com.kingsrook.qqq.backend.core.model.metadata.QTableMetaData; import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableMetaData;
import com.kingsrook.qqq.backend.core.modules.interfaces.InsertInterface;
import com.kingsrook.qqq.backend.core.utils.CollectionUtils; import com.kingsrook.qqq.backend.core.utils.CollectionUtils;
import com.kingsrook.qqq.backend.module.rdbms.jdbc.QueryManager; import com.kingsrook.qqq.backend.module.rdbms.jdbc.QueryManager;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
@ -53,21 +53,21 @@ public class RDBMSInsertAction extends AbstractRDBMSAction implements InsertInte
/******************************************************************************* /*******************************************************************************
** **
*******************************************************************************/ *******************************************************************************/
public InsertResult execute(InsertRequest insertRequest) throws QException public InsertOutput execute(InsertInput insertInput) throws QException
{ {
InsertResult rs = new InsertResult(); InsertOutput rs = new InsertOutput();
if(CollectionUtils.nullSafeIsEmpty(insertRequest.getRecords())) if(CollectionUtils.nullSafeIsEmpty(insertInput.getRecords()))
{ {
LOG.info("Insert request called with 0 records. Returning with no-op"); LOG.info("Insert request called with 0 records. Returning with no-op");
rs.setRecords(new ArrayList<>()); rs.setRecords(new ArrayList<>());
return (rs); return (rs);
} }
QTableMetaData table = insertRequest.getTable(); QTableMetaData table = insertInput.getTable();
Instant now = Instant.now(); Instant now = Instant.now();
for(QRecord record : insertRequest.getRecords()) for(QRecord record : insertInput.getRecords())
{ {
/////////////////////////////////////////// ///////////////////////////////////////////
// todo .. better (not hard-coded names) // // todo .. better (not hard-coded names) //
@ -93,9 +93,9 @@ public class RDBMSInsertAction extends AbstractRDBMSAction implements InsertInte
StringBuilder sql = new StringBuilder("INSERT INTO ").append(tableName).append("(").append(columns).append(") VALUES"); StringBuilder sql = new StringBuilder("INSERT INTO ").append(tableName).append("(").append(columns).append(") VALUES");
List<Object> params = new ArrayList<>(); List<Object> params = new ArrayList<>();
try(Connection connection = getConnection(insertRequest)) try(Connection connection = getConnection(insertInput))
{ {
for(List<QRecord> page : CollectionUtils.getPages(insertRequest.getRecords(), QueryManager.PAGE_SIZE)) for(List<QRecord> page : CollectionUtils.getPages(insertInput.getRecords(), QueryManager.PAGE_SIZE))
{ {
int recordIndex = 0; int recordIndex = 0;
for(QRecord record : page) for(QRecord record : page)
@ -120,7 +120,7 @@ public class RDBMSInsertAction extends AbstractRDBMSAction implements InsertInte
List<QRecord> outputRecords = new ArrayList<>(); List<QRecord> outputRecords = new ArrayList<>();
rs.setRecords(outputRecords); rs.setRecords(outputRecords);
int index = 0; int index = 0;
for(QRecord record : insertRequest.getRecords()) for(QRecord record : insertInput.getRecords())
{ {
Integer id = idList.get(index++); Integer id = idList.get(index++);
QRecord outputRecord = new QRecord(record); QRecord outputRecord = new QRecord(record);

35
src/main/java/com/kingsrook/qqq/backend/module/rdbms/actions/RDBMSQueryAction.java
View File

@ -30,19 +30,16 @@ import java.sql.SQLException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.function.Function;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import com.kingsrook.qqq.backend.core.actions.interfaces.QueryInterface;
import com.kingsrook.qqq.backend.core.exceptions.QException; import com.kingsrook.qqq.backend.core.exceptions.QException;
import com.kingsrook.qqq.backend.core.model.actions.query.QFilterCriteria; import com.kingsrook.qqq.backend.core.model.actions.tables.query.QFilterOrderBy;
import com.kingsrook.qqq.backend.core.model.actions.query.QFilterOrderBy; import com.kingsrook.qqq.backend.core.model.actions.tables.query.QQueryFilter;
import com.kingsrook.qqq.backend.core.model.actions.query.QQueryFilter; import com.kingsrook.qqq.backend.core.model.actions.tables.query.QueryInput;
import com.kingsrook.qqq.backend.core.model.actions.query.QueryRequest; import com.kingsrook.qqq.backend.core.model.actions.tables.query.QueryOutput;
import com.kingsrook.qqq.backend.core.model.actions.query.QueryResult;
import com.kingsrook.qqq.backend.core.model.data.QRecord; import com.kingsrook.qqq.backend.core.model.data.QRecord;
import com.kingsrook.qqq.backend.core.model.metadata.QFieldMetaData; import com.kingsrook.qqq.backend.core.model.metadata.fields.QFieldMetaData;
import com.kingsrook.qqq.backend.core.model.metadata.QFieldType; import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableMetaData;
import com.kingsrook.qqq.backend.core.model.metadata.QTableMetaData;
import com.kingsrook.qqq.backend.core.modules.interfaces.QueryInterface;
import com.kingsrook.qqq.backend.core.utils.CollectionUtils; import com.kingsrook.qqq.backend.core.utils.CollectionUtils;
import com.kingsrook.qqq.backend.module.rdbms.jdbc.QueryManager; import com.kingsrook.qqq.backend.module.rdbms.jdbc.QueryManager;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
@ -61,11 +58,11 @@ public class RDBMSQueryAction extends AbstractRDBMSAction implements QueryInterf
/******************************************************************************* /*******************************************************************************
** **
*******************************************************************************/ *******************************************************************************/
public QueryResult execute(QueryRequest queryRequest) throws QException public QueryOutput execute(QueryInput queryInput) throws QException
{ {
try try
{ {
QTableMetaData table = queryRequest.getTable(); QTableMetaData table = queryInput.getTable();
String tableName = getTableName(table); String tableName = getTableName(table);
List<QFieldMetaData> fieldList = new ArrayList<>(table.getFields().values()); List<QFieldMetaData> fieldList = new ArrayList<>(table.getFields().values());
@ -75,7 +72,7 @@ public class RDBMSQueryAction extends AbstractRDBMSAction implements QueryInterf
String sql = "SELECT " + columns + " FROM " + tableName; String sql = "SELECT " + columns + " FROM " + tableName;
QQueryFilter filter = queryRequest.getFilter(); QQueryFilter filter = queryInput.getFilter();
List<Serializable> params = new ArrayList<>(); List<Serializable> params = new ArrayList<>();
if(filter != null && CollectionUtils.nullSafeHasContents(filter.getCriteria())) if(filter != null && CollectionUtils.nullSafeHasContents(filter.getCriteria()))
{ {
@ -87,24 +84,24 @@ public class RDBMSQueryAction extends AbstractRDBMSAction implements QueryInterf
sql += " ORDER BY " + makeOrderByClause(table, filter.getOrderBys()); sql += " ORDER BY " + makeOrderByClause(table, filter.getOrderBys());
} }
if(queryRequest.getLimit() != null) if(queryInput.getLimit() != null)
{ {
sql += " LIMIT " + queryRequest.getLimit(); sql += " LIMIT " + queryInput.getLimit();
if(queryRequest.getSkip() != null) if(queryInput.getSkip() != null)
{ {
// todo - other sql grammars? // todo - other sql grammars?
sql += " OFFSET " + queryRequest.getSkip(); sql += " OFFSET " + queryInput.getSkip();
} }
} }
// todo sql customization - can edit sql and/or param list // todo sql customization - can edit sql and/or param list
QueryResult rs = new QueryResult(); QueryOutput rs = new QueryOutput();
List<QRecord> records = new ArrayList<>(); List<QRecord> records = new ArrayList<>();
rs.setRecords(records); rs.setRecords(records);
try(Connection connection = getConnection(queryRequest)) try(Connection connection = getConnection(queryInput))
{ {
QueryManager.executeStatement(connection, sql, ((ResultSet resultSet) -> QueryManager.executeStatement(connection, sql, ((ResultSet resultSet) ->
{ {

22
src/main/java/com/kingsrook/qqq/backend/module/rdbms/actions/RDBMSUpdateAction.java
View File

@ -31,13 +31,13 @@ import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import com.kingsrook.qqq.backend.core.actions.interfaces.UpdateInterface;
import com.kingsrook.qqq.backend.core.exceptions.QException; import com.kingsrook.qqq.backend.core.exceptions.QException;
import com.kingsrook.qqq.backend.core.model.actions.update.UpdateRequest; import com.kingsrook.qqq.backend.core.model.actions.tables.update.UpdateInput;
import com.kingsrook.qqq.backend.core.model.actions.update.UpdateResult; import com.kingsrook.qqq.backend.core.model.actions.tables.update.UpdateOutput;
import com.kingsrook.qqq.backend.core.model.data.QRecord; import com.kingsrook.qqq.backend.core.model.data.QRecord;
import com.kingsrook.qqq.backend.core.model.metadata.QFieldMetaData; import com.kingsrook.qqq.backend.core.model.metadata.fields.QFieldMetaData;
import com.kingsrook.qqq.backend.core.model.metadata.QTableMetaData; import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableMetaData;
import com.kingsrook.qqq.backend.core.modules.interfaces.UpdateInterface;
import com.kingsrook.qqq.backend.core.utils.CollectionUtils; import com.kingsrook.qqq.backend.core.utils.CollectionUtils;
import com.kingsrook.qqq.backend.core.utils.ListingHash; import com.kingsrook.qqq.backend.core.utils.ListingHash;
import com.kingsrook.qqq.backend.core.utils.StringUtils; import com.kingsrook.qqq.backend.core.utils.StringUtils;
@ -63,18 +63,18 @@ public class RDBMSUpdateAction extends AbstractRDBMSAction implements UpdateInte
/******************************************************************************* /*******************************************************************************
** **
*******************************************************************************/ *******************************************************************************/
public UpdateResult execute(UpdateRequest updateRequest) throws QException public UpdateOutput execute(UpdateInput updateInput) throws QException
{ {
UpdateResult rs = new UpdateResult(); UpdateOutput rs = new UpdateOutput();
if(CollectionUtils.nullSafeIsEmpty(updateRequest.getRecords())) if(CollectionUtils.nullSafeIsEmpty(updateInput.getRecords()))
{ {
LOG.info("Update request called with 0 records. Returning with no-op"); LOG.info("Update request called with 0 records. Returning with no-op");
rs.setRecords(new ArrayList<>()); rs.setRecords(new ArrayList<>());
return (rs); return (rs);
} }
QTableMetaData table = updateRequest.getTable(); QTableMetaData table = updateInput.getTable();
Instant now = Instant.now(); Instant now = Instant.now();
List<QRecord> outputRecords = new ArrayList<>(); List<QRecord> outputRecords = new ArrayList<>();
@ -86,7 +86,7 @@ public class RDBMSUpdateAction extends AbstractRDBMSAction implements UpdateInte
// record. So, we will first "hash" up the records by their list of fields being updated. // // record. So, we will first "hash" up the records by their list of fields being updated. //
///////////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////////
ListingHash<List<String>, QRecord> recordsByFieldBeingUpdated = new ListingHash<>(); ListingHash<List<String>, QRecord> recordsByFieldBeingUpdated = new ListingHash<>();
for(QRecord record : updateRequest.getRecords()) for(QRecord record : updateInput.getRecords())
{ {
//////////////////////////////////////////// ////////////////////////////////////////////
// todo .. better (not a hard-coded name) // // todo .. better (not a hard-coded name) //
@ -112,7 +112,7 @@ public class RDBMSUpdateAction extends AbstractRDBMSAction implements UpdateInte
outputRecords.add(outputRecord); outputRecords.add(outputRecord);
} }
try(Connection connection = getConnection(updateRequest)) try(Connection connection = getConnection(updateInput))
{ {
///////////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////////
// process each distinct list of fields being updated (e.g., each different SQL statement) // // process each distinct list of fields being updated (e.g., each different SQL statement) //

2
src/main/java/com/kingsrook/qqq/backend/module/rdbms/model/metadata/RDBMSTableBackendDetails.java
View File

@ -22,7 +22,7 @@
package com.kingsrook.qqq.backend.module.rdbms.model.metadata; package com.kingsrook.qqq.backend.module.rdbms.model.metadata;
import com.kingsrook.qqq.backend.core.model.metadata.QTableBackendDetails; import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableBackendDetails;
import com.kingsrook.qqq.backend.module.rdbms.RDBMSBackendModule; import com.kingsrook.qqq.backend.module.rdbms.RDBMSBackendModule;

6
src/test/java/com/kingsrook/qqq/backend/module/rdbms/TestUtils.java
View File

@ -22,10 +22,10 @@
package com.kingsrook.qqq.backend.module.rdbms; package com.kingsrook.qqq.backend.module.rdbms;
import com.kingsrook.qqq.backend.core.model.metadata.QFieldMetaData; import com.kingsrook.qqq.backend.core.model.metadata.fields.QFieldMetaData;
import com.kingsrook.qqq.backend.core.model.metadata.QFieldType; import com.kingsrook.qqq.backend.core.model.metadata.fields.QFieldType;
import com.kingsrook.qqq.backend.core.model.metadata.QInstance; import com.kingsrook.qqq.backend.core.model.metadata.QInstance;
import com.kingsrook.qqq.backend.core.model.metadata.QTableMetaData; import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableMetaData;
import com.kingsrook.qqq.backend.module.rdbms.model.metadata.RDBMSBackendMetaData; import com.kingsrook.qqq.backend.module.rdbms.model.metadata.RDBMSBackendMetaData;
import com.kingsrook.qqq.backend.module.rdbms.model.metadata.RDBMSTableBackendDetails; import com.kingsrook.qqq.backend.module.rdbms.model.metadata.RDBMSTableBackendDetails;

42
src/test/java/com/kingsrook/qqq/backend/module/rdbms/actions/RDBMSCountActionTest.java
View File

@ -24,11 +24,11 @@ package com.kingsrook.qqq.backend.module.rdbms.actions;
import java.util.List; import java.util.List;
import com.kingsrook.qqq.backend.core.exceptions.QException; import com.kingsrook.qqq.backend.core.exceptions.QException;
import com.kingsrook.qqq.backend.core.model.actions.count.CountRequest; import com.kingsrook.qqq.backend.core.model.actions.tables.count.CountInput;
import com.kingsrook.qqq.backend.core.model.actions.count.CountResult; import com.kingsrook.qqq.backend.core.model.actions.tables.count.CountOutput;
import com.kingsrook.qqq.backend.core.model.actions.query.QCriteriaOperator; import com.kingsrook.qqq.backend.core.model.actions.tables.query.QCriteriaOperator;
import com.kingsrook.qqq.backend.core.model.actions.query.QFilterCriteria; import com.kingsrook.qqq.backend.core.model.actions.tables.query.QFilterCriteria;
import com.kingsrook.qqq.backend.core.model.actions.query.QQueryFilter; import com.kingsrook.qqq.backend.core.model.actions.tables.query.QQueryFilter;
import com.kingsrook.qqq.backend.module.rdbms.TestUtils; import com.kingsrook.qqq.backend.module.rdbms.TestUtils;
import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
@ -58,9 +58,9 @@ public class RDBMSCountActionTest extends RDBMSActionTest
@Test @Test
public void testUnfilteredCount() throws QException public void testUnfilteredCount() throws QException
{ {
CountRequest countRequest = initCountRequest(); CountInput countInput = initCountRequest();
CountResult countResult = new RDBMSCountAction().execute(countRequest); CountOutput countOutput = new RDBMSCountAction().execute(countInput);
Assertions.assertEquals(5, countResult.getCount(), "Unfiltered query should find all rows"); Assertions.assertEquals(5, countOutput.getCount(), "Unfiltered query should find all rows");
} }
@ -73,15 +73,15 @@ public class RDBMSCountActionTest extends RDBMSActionTest
{ {
String email = "darin.kelkhoff@gmail.com"; String email = "darin.kelkhoff@gmail.com";
CountRequest countRequest = initCountRequest(); CountInput countInput = initCountRequest();
countRequest.setFilter(new QQueryFilter() countInput.setFilter(new QQueryFilter()
.withCriteria(new QFilterCriteria() .withCriteria(new QFilterCriteria()
.withFieldName("email") .withFieldName("email")
.withOperator(QCriteriaOperator.EQUALS) .withOperator(QCriteriaOperator.EQUALS)
.withValues(List.of(email))) .withValues(List.of(email)))
); );
CountResult countResult = new RDBMSCountAction().execute(countRequest); CountOutput countOutput = new RDBMSCountAction().execute(countInput);
Assertions.assertEquals(1, countResult.getCount(), "Expected # of rows"); Assertions.assertEquals(1, countOutput.getCount(), "Expected # of rows");
} }
@ -94,15 +94,15 @@ public class RDBMSCountActionTest extends RDBMSActionTest
{ {
String email = "darin.kelkhoff@gmail.com"; String email = "darin.kelkhoff@gmail.com";
CountRequest countRequest = initCountRequest(); CountInput countInput = initCountRequest();
countRequest.setFilter(new QQueryFilter() countInput.setFilter(new QQueryFilter()
.withCriteria(new QFilterCriteria() .withCriteria(new QFilterCriteria()
.withFieldName("email") .withFieldName("email")
.withOperator(QCriteriaOperator.NOT_EQUALS) .withOperator(QCriteriaOperator.NOT_EQUALS)
.withValues(List.of(email))) .withValues(List.of(email)))
); );
CountResult countResult = new RDBMSCountAction().execute(countRequest); CountOutput countOutput = new RDBMSCountAction().execute(countInput);
Assertions.assertEquals(4, countResult.getCount(), "Expected # of rows"); Assertions.assertEquals(4, countOutput.getCount(), "Expected # of rows");
} }
@ -110,12 +110,12 @@ public class RDBMSCountActionTest extends RDBMSActionTest
/******************************************************************************* /*******************************************************************************
** **
*******************************************************************************/ *******************************************************************************/
private CountRequest initCountRequest() private CountInput initCountRequest()
{ {
CountRequest countRequest = new CountRequest(); CountInput countInput = new CountInput();
countRequest.setInstance(TestUtils.defineInstance()); countInput.setInstance(TestUtils.defineInstance());
countRequest.setTableName(TestUtils.defineTablePerson().getName()); countInput.setTableName(TestUtils.defineTablePerson().getName());
return countRequest; return countInput;
} }
} }

32
src/test/java/com/kingsrook/qqq/backend/module/rdbms/actions/RDBMSDeleteActionTest.java
View File

@ -23,8 +23,8 @@ package com.kingsrook.qqq.backend.module.rdbms.actions;
import java.util.List; import java.util.List;
import com.kingsrook.qqq.backend.core.model.actions.delete.DeleteRequest; import com.kingsrook.qqq.backend.core.model.actions.tables.delete.DeleteInput;
import com.kingsrook.qqq.backend.core.model.actions.delete.DeleteResult; import com.kingsrook.qqq.backend.core.model.actions.tables.delete.DeleteOutput;
import com.kingsrook.qqq.backend.module.rdbms.TestUtils; import com.kingsrook.qqq.backend.module.rdbms.TestUtils;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
@ -56,9 +56,9 @@ public class RDBMSDeleteActionTest extends RDBMSActionTest
@Test @Test
public void testDeleteAll() throws Exception public void testDeleteAll() throws Exception
{ {
DeleteRequest deleteRequest = initDeleteRequest(); DeleteInput deleteInput = initDeleteRequest();
deleteRequest.setPrimaryKeys(List.of(1, 2, 3, 4, 5)); deleteInput.setPrimaryKeys(List.of(1, 2, 3, 4, 5));
DeleteResult deleteResult = new RDBMSDeleteAction().execute(deleteRequest); DeleteOutput deleteResult = new RDBMSDeleteAction().execute(deleteInput);
assertEquals(5, deleteResult.getRecords().size(), "Unfiltered delete should return all rows"); assertEquals(5, deleteResult.getRecords().size(), "Unfiltered delete should return all rows");
// todo - add errors to QRecord? assertTrue(deleteResult.getRecords().stream().noneMatch(qrs -> CollectionUtils.nullSafeHasContents(qrs.getErrors())), "There should be no errors"); // todo - add errors to QRecord? assertTrue(deleteResult.getRecords().stream().noneMatch(qrs -> CollectionUtils.nullSafeHasContents(qrs.getErrors())), "There should be no errors");
runTestSql("SELECT id FROM person", (rs -> assertFalse(rs.next()))); runTestSql("SELECT id FROM person", (rs -> assertFalse(rs.next())));
@ -72,9 +72,9 @@ public class RDBMSDeleteActionTest extends RDBMSActionTest
@Test @Test
public void testDeleteOne() throws Exception public void testDeleteOne() throws Exception
{ {
DeleteRequest deleteRequest = initDeleteRequest(); DeleteInput deleteInput = initDeleteRequest();
deleteRequest.setPrimaryKeys(List.of(1)); deleteInput.setPrimaryKeys(List.of(1));
DeleteResult deleteResult = new RDBMSDeleteAction().execute(deleteRequest); DeleteOutput deleteResult = new RDBMSDeleteAction().execute(deleteInput);
assertEquals(1, deleteResult.getRecords().size(), "Should delete one row"); assertEquals(1, deleteResult.getRecords().size(), "Should delete one row");
// todo - add errors to QRecord? assertTrue(deleteResult.getRecords().stream().noneMatch(qrs -> CollectionUtils.nullSafeHasContents(qrs.getErrors())), "There should be no errors"); // todo - add errors to QRecord? assertTrue(deleteResult.getRecords().stream().noneMatch(qrs -> CollectionUtils.nullSafeHasContents(qrs.getErrors())), "There should be no errors");
runTestSql("SELECT id FROM person WHERE id = 1", (rs -> assertFalse(rs.next()))); runTestSql("SELECT id FROM person WHERE id = 1", (rs -> assertFalse(rs.next())));
@ -88,9 +88,9 @@ public class RDBMSDeleteActionTest extends RDBMSActionTest
@Test @Test
public void testDeleteSome() throws Exception public void testDeleteSome() throws Exception
{ {
DeleteRequest deleteRequest = initDeleteRequest(); DeleteInput deleteInput = initDeleteRequest();
deleteRequest.setPrimaryKeys(List.of(1, 3, 5)); deleteInput.setPrimaryKeys(List.of(1, 3, 5));
DeleteResult deleteResult = new RDBMSDeleteAction().execute(deleteRequest); DeleteOutput deleteResult = new RDBMSDeleteAction().execute(deleteInput);
assertEquals(3, deleteResult.getRecords().size(), "Should delete one row"); assertEquals(3, deleteResult.getRecords().size(), "Should delete one row");
// todo - add errors to QRecord? assertTrue(deleteResult.getRecords().stream().noneMatch(qrs -> CollectionUtils.nullSafeHasContents(qrs.getErrors())), "There should be no errors"); // todo - add errors to QRecord? assertTrue(deleteResult.getRecords().stream().noneMatch(qrs -> CollectionUtils.nullSafeHasContents(qrs.getErrors())), "There should be no errors");
runTestSql("SELECT id FROM person", (rs -> { runTestSql("SELECT id FROM person", (rs -> {
@ -110,12 +110,12 @@ public class RDBMSDeleteActionTest extends RDBMSActionTest
/******************************************************************************* /*******************************************************************************
** **
*******************************************************************************/ *******************************************************************************/
private DeleteRequest initDeleteRequest() private DeleteInput initDeleteRequest()
{ {
DeleteRequest deleteRequest = new DeleteRequest(); DeleteInput deleteInput = new DeleteInput();
deleteRequest.setInstance(TestUtils.defineInstance()); deleteInput.setInstance(TestUtils.defineInstance());
deleteRequest.setTableName(TestUtils.defineTablePerson().getName()); deleteInput.setTableName(TestUtils.defineTablePerson().getName());
return deleteRequest; return deleteInput;
} }
} }

52
src/test/java/com/kingsrook/qqq/backend/module/rdbms/actions/RDBMSInsertActionTest.java
View File

@ -25,8 +25,8 @@ package com.kingsrook.qqq.backend.module.rdbms.actions;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import com.kingsrook.qqq.backend.core.exceptions.QException; import com.kingsrook.qqq.backend.core.exceptions.QException;
import com.kingsrook.qqq.backend.core.model.actions.insert.InsertRequest; import com.kingsrook.qqq.backend.core.model.actions.tables.insert.InsertInput;
import com.kingsrook.qqq.backend.core.model.actions.insert.InsertResult; import com.kingsrook.qqq.backend.core.model.actions.tables.insert.InsertOutput;
import com.kingsrook.qqq.backend.core.model.data.QRecord; import com.kingsrook.qqq.backend.core.model.data.QRecord;
import com.kingsrook.qqq.backend.module.rdbms.TestUtils; import com.kingsrook.qqq.backend.module.rdbms.TestUtils;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
@ -58,10 +58,10 @@ public class RDBMSInsertActionTest extends RDBMSActionTest
@Test @Test
public void testInsertNullList() throws QException public void testInsertNullList() throws QException
{ {
InsertRequest insertRequest = initInsertRequest(); InsertInput insertInput = initInsertRequest();
insertRequest.setRecords(null); insertInput.setRecords(null);
InsertResult insertResult = new RDBMSInsertAction().execute(insertRequest); InsertOutput insertOutput = new RDBMSInsertAction().execute(insertInput);
assertEquals(0, insertResult.getRecords().size()); assertEquals(0, insertOutput.getRecords().size());
} }
@ -72,10 +72,10 @@ public class RDBMSInsertActionTest extends RDBMSActionTest
@Test @Test
public void testInsertEmptyList() throws QException public void testInsertEmptyList() throws QException
{ {
InsertRequest insertRequest = initInsertRequest(); InsertInput insertInput = initInsertRequest();
insertRequest.setRecords(Collections.emptyList()); insertInput.setRecords(Collections.emptyList());
InsertResult insertResult = new RDBMSInsertAction().execute(insertRequest); InsertOutput insertOutput = new RDBMSInsertAction().execute(insertInput);
assertEquals(0, insertResult.getRecords().size()); assertEquals(0, insertOutput.getRecords().size());
} }
@ -86,16 +86,16 @@ public class RDBMSInsertActionTest extends RDBMSActionTest
@Test @Test
public void testInsertOne() throws Exception public void testInsertOne() throws Exception
{ {
InsertRequest insertRequest = initInsertRequest(); InsertInput insertInput = initInsertRequest();
QRecord record = new QRecord().withTableName("person") QRecord record = new QRecord().withTableName("person")
.withValue("firstName", "James") .withValue("firstName", "James")
.withValue("lastName", "Kirk") .withValue("lastName", "Kirk")
.withValue("email", "jamestk@starfleet.net") .withValue("email", "jamestk@starfleet.net")
.withValue("birthDate", "2210-05-20"); .withValue("birthDate", "2210-05-20");
insertRequest.setRecords(List.of(record)); insertInput.setRecords(List.of(record));
InsertResult insertResult = new RDBMSInsertAction().execute(insertRequest); InsertOutput insertOutput = new RDBMSInsertAction().execute(insertInput);
assertEquals(1, insertResult.getRecords().size(), "Should return 1 row"); assertEquals(1, insertOutput.getRecords().size(), "Should return 1 row");
assertNotNull(insertResult.getRecords().get(0).getValue("id"), "Should have an id in the row"); assertNotNull(insertOutput.getRecords().get(0).getValue("id"), "Should have an id in the row");
// todo - add errors to QRecord? assertTrue(insertResult.getRecords().stream().noneMatch(qrs -> CollectionUtils.nullSafeHasContents(qrs.getErrors())), "There should be no errors"); // todo - add errors to QRecord? assertTrue(insertResult.getRecords().stream().noneMatch(qrs -> CollectionUtils.nullSafeHasContents(qrs.getErrors())), "There should be no errors");
runTestSql("SELECT * FROM person WHERE last_name = 'Kirk'", (rs -> { runTestSql("SELECT * FROM person WHERE last_name = 'Kirk'", (rs -> {
int rowsFound = 0; int rowsFound = 0;
@ -118,7 +118,7 @@ public class RDBMSInsertActionTest extends RDBMSActionTest
@Test @Test
public void testInsertMany() throws Exception public void testInsertMany() throws Exception
{ {
InsertRequest insertRequest = initInsertRequest(); InsertInput insertInput = initInsertRequest();
QRecord record1 = new QRecord().withTableName("person") QRecord record1 = new QRecord().withTableName("person")
.withValue("firstName", "Jean-Luc") .withValue("firstName", "Jean-Luc")
.withValue("lastName", "Picard") .withValue("lastName", "Picard")
@ -129,11 +129,11 @@ public class RDBMSInsertActionTest extends RDBMSActionTest
.withValue("lastName", "Riker") .withValue("lastName", "Riker")
.withValue("email", "notthomas@starfleet.net") .withValue("email", "notthomas@starfleet.net")
.withValue("birthDate", "2320-05-20"); .withValue("birthDate", "2320-05-20");
insertRequest.setRecords(List.of(record1, record2)); insertInput.setRecords(List.of(record1, record2));
InsertResult insertResult = new RDBMSInsertAction().execute(insertRequest); InsertOutput insertOutput = new RDBMSInsertAction().execute(insertInput);
assertEquals(2, insertResult.getRecords().size(), "Should return 1 row"); assertEquals(2, insertOutput.getRecords().size(), "Should return 1 row");
assertEquals(6, insertResult.getRecords().get(0).getValue("id"), "Should have next id in the row"); assertEquals(6, insertOutput.getRecords().get(0).getValue("id"), "Should have next id in the row");
assertEquals(7, insertResult.getRecords().get(1).getValue("id"), "Should have next id in the row"); assertEquals(7, insertOutput.getRecords().get(1).getValue("id"), "Should have next id in the row");
// todo - add errors to QRecord? assertTrue(insertResult.getRecords().stream().noneMatch(qrs -> CollectionUtils.nullSafeHasContents(qrs.getErrors())), "There should be no errors"); // todo - add errors to QRecord? assertTrue(insertResult.getRecords().stream().noneMatch(qrs -> CollectionUtils.nullSafeHasContents(qrs.getErrors())), "There should be no errors");
runTestSql("SELECT * FROM person WHERE last_name = 'Picard'", (rs -> { runTestSql("SELECT * FROM person WHERE last_name = 'Picard'", (rs -> {
int rowsFound = 0; int rowsFound = 0;
@ -162,12 +162,12 @@ public class RDBMSInsertActionTest extends RDBMSActionTest
/******************************************************************************* /*******************************************************************************
** **
*******************************************************************************/ *******************************************************************************/
private InsertRequest initInsertRequest() private InsertInput initInsertRequest()
{ {
InsertRequest insertRequest = new InsertRequest(); InsertInput insertInput = new InsertInput();
insertRequest.setInstance(TestUtils.defineInstance()); insertInput.setInstance(TestUtils.defineInstance());
insertRequest.setTableName(TestUtils.defineTablePerson().getName()); insertInput.setTableName(TestUtils.defineTablePerson().getName());
return insertRequest; return insertInput;
} }
} }

196
src/test/java/com/kingsrook/qqq/backend/module/rdbms/actions/RDBMSQueryActionTest.java
View File

@ -24,11 +24,11 @@ package com.kingsrook.qqq.backend.module.rdbms.actions;
import java.util.List; import java.util.List;
import com.kingsrook.qqq.backend.core.exceptions.QException; import com.kingsrook.qqq.backend.core.exceptions.QException;
import com.kingsrook.qqq.backend.core.model.actions.query.QCriteriaOperator; import com.kingsrook.qqq.backend.core.model.actions.tables.query.QCriteriaOperator;
import com.kingsrook.qqq.backend.core.model.actions.query.QFilterCriteria; import com.kingsrook.qqq.backend.core.model.actions.tables.query.QFilterCriteria;
import com.kingsrook.qqq.backend.core.model.actions.query.QQueryFilter; import com.kingsrook.qqq.backend.core.model.actions.tables.query.QQueryFilter;
import com.kingsrook.qqq.backend.core.model.actions.query.QueryRequest; import com.kingsrook.qqq.backend.core.model.actions.tables.query.QueryInput;
import com.kingsrook.qqq.backend.core.model.actions.query.QueryResult; import com.kingsrook.qqq.backend.core.model.actions.tables.query.QueryOutput;
import com.kingsrook.qqq.backend.module.rdbms.TestUtils; import com.kingsrook.qqq.backend.module.rdbms.TestUtils;
import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
@ -58,9 +58,9 @@ public class RDBMSQueryActionTest extends RDBMSActionTest
@Test @Test
public void testUnfilteredQuery() throws QException public void testUnfilteredQuery() throws QException
{ {
QueryRequest queryRequest = initQueryRequest(); QueryInput queryInput = initQueryRequest();
QueryResult queryResult = new RDBMSQueryAction().execute(queryRequest); QueryOutput queryOutput = new RDBMSQueryAction().execute(queryInput);
Assertions.assertEquals(5, queryResult.getRecords().size(), "Unfiltered query should find all rows"); Assertions.assertEquals(5, queryOutput.getRecords().size(), "Unfiltered query should find all rows");
} }
@ -73,16 +73,16 @@ public class RDBMSQueryActionTest extends RDBMSActionTest
{ {
String email = "darin.kelkhoff@gmail.com"; String email = "darin.kelkhoff@gmail.com";
QueryRequest queryRequest = initQueryRequest(); QueryInput queryInput = initQueryRequest();
queryRequest.setFilter(new QQueryFilter() queryInput.setFilter(new QQueryFilter()
.withCriteria(new QFilterCriteria() .withCriteria(new QFilterCriteria()
.withFieldName("email") .withFieldName("email")
.withOperator(QCriteriaOperator.EQUALS) .withOperator(QCriteriaOperator.EQUALS)
.withValues(List.of(email))) .withValues(List.of(email)))
); );
QueryResult queryResult = new RDBMSQueryAction().execute(queryRequest); QueryOutput queryOutput = new RDBMSQueryAction().execute(queryInput);
Assertions.assertEquals(1, queryResult.getRecords().size(), "Expected # of rows"); Assertions.assertEquals(1, queryOutput.getRecords().size(), "Expected # of rows");
Assertions.assertEquals(email, queryResult.getRecords().get(0).getValueString("email"), "Should find expected email address"); Assertions.assertEquals(email, queryOutput.getRecords().get(0).getValueString("email"), "Should find expected email address");
} }
@ -95,16 +95,16 @@ public class RDBMSQueryActionTest extends RDBMSActionTest
{ {
String email = "darin.kelkhoff@gmail.com"; String email = "darin.kelkhoff@gmail.com";
QueryRequest queryRequest = initQueryRequest(); QueryInput queryInput = initQueryRequest();
queryRequest.setFilter(new QQueryFilter() queryInput.setFilter(new QQueryFilter()
.withCriteria(new QFilterCriteria() .withCriteria(new QFilterCriteria()
.withFieldName("email") .withFieldName("email")
.withOperator(QCriteriaOperator.NOT_EQUALS) .withOperator(QCriteriaOperator.NOT_EQUALS)
.withValues(List.of(email))) .withValues(List.of(email)))
); );
QueryResult queryResult = new RDBMSQueryAction().execute(queryRequest); QueryOutput queryOutput = new RDBMSQueryAction().execute(queryInput);
Assertions.assertEquals(4, queryResult.getRecords().size(), "Expected # of rows"); Assertions.assertEquals(4, queryOutput.getRecords().size(), "Expected # of rows");
Assertions.assertTrue(queryResult.getRecords().stream().noneMatch(r -> r.getValueString("email").equals(email)), "Should NOT find expected email address"); Assertions.assertTrue(queryOutput.getRecords().stream().noneMatch(r -> r.getValueString("email").equals(email)), "Should NOT find expected email address");
} }
@ -115,16 +115,16 @@ public class RDBMSQueryActionTest extends RDBMSActionTest
@Test @Test
public void testInQuery() throws QException public void testInQuery() throws QException
{ {
QueryRequest queryRequest = initQueryRequest(); QueryInput queryInput = initQueryRequest();
queryRequest.setFilter(new QQueryFilter() queryInput.setFilter(new QQueryFilter()
.withCriteria(new QFilterCriteria() .withCriteria(new QFilterCriteria()
.withFieldName("id") .withFieldName("id")
.withOperator(QCriteriaOperator.IN) .withOperator(QCriteriaOperator.IN)
.withValues(List.of(2, 4))) .withValues(List.of(2, 4)))
); );
QueryResult queryResult = new RDBMSQueryAction().execute(queryRequest); QueryOutput queryOutput = new RDBMSQueryAction().execute(queryInput);
Assertions.assertEquals(2, queryResult.getRecords().size(), "Expected # of rows"); Assertions.assertEquals(2, queryOutput.getRecords().size(), "Expected # of rows");
Assertions.assertTrue(queryResult.getRecords().stream().allMatch(r -> r.getValueInteger("id").equals(2) || r.getValueInteger("id").equals(4)), "Should find expected ids"); Assertions.assertTrue(queryOutput.getRecords().stream().allMatch(r -> r.getValueInteger("id").equals(2) || r.getValueInteger("id").equals(4)), "Should find expected ids");
} }
@ -135,16 +135,16 @@ public class RDBMSQueryActionTest extends RDBMSActionTest
@Test @Test
public void testNotInQuery() throws QException public void testNotInQuery() throws QException
{ {
QueryRequest queryRequest = initQueryRequest(); QueryInput queryInput = initQueryRequest();
queryRequest.setFilter(new QQueryFilter() queryInput.setFilter(new QQueryFilter()
.withCriteria(new QFilterCriteria() .withCriteria(new QFilterCriteria()
.withFieldName("id") .withFieldName("id")
.withOperator(QCriteriaOperator.NOT_IN) .withOperator(QCriteriaOperator.NOT_IN)
.withValues(List.of(2, 3, 4))) .withValues(List.of(2, 3, 4)))
); );
QueryResult queryResult = new RDBMSQueryAction().execute(queryRequest); QueryOutput queryOutput = new RDBMSQueryAction().execute(queryInput);
Assertions.assertEquals(2, queryResult.getRecords().size(), "Expected # of rows"); Assertions.assertEquals(2, queryOutput.getRecords().size(), "Expected # of rows");
Assertions.assertTrue(queryResult.getRecords().stream().allMatch(r -> r.getValueInteger("id").equals(1) || r.getValueInteger("id").equals(5)), "Should find expected ids"); Assertions.assertTrue(queryOutput.getRecords().stream().allMatch(r -> r.getValueInteger("id").equals(1) || r.getValueInteger("id").equals(5)), "Should find expected ids");
} }
@ -155,16 +155,16 @@ public class RDBMSQueryActionTest extends RDBMSActionTest
@Test @Test
public void testStartsWith() throws QException public void testStartsWith() throws QException
{ {
QueryRequest queryRequest = initQueryRequest(); QueryInput queryInput = initQueryRequest();
queryRequest.setFilter(new QQueryFilter() queryInput.setFilter(new QQueryFilter()
.withCriteria(new QFilterCriteria() .withCriteria(new QFilterCriteria()
.withFieldName("email") .withFieldName("email")
.withOperator(QCriteriaOperator.STARTS_WITH) .withOperator(QCriteriaOperator.STARTS_WITH)
.withValues(List.of("darin"))) .withValues(List.of("darin")))
); );
QueryResult queryResult = new RDBMSQueryAction().execute(queryRequest); QueryOutput queryOutput = new RDBMSQueryAction().execute(queryInput);
Assertions.assertEquals(1, queryResult.getRecords().size(), "Expected # of rows"); Assertions.assertEquals(1, queryOutput.getRecords().size(), "Expected # of rows");
Assertions.assertTrue(queryResult.getRecords().stream().allMatch(r -> r.getValueString("email").matches("darin.*")), "Should find matching email address"); Assertions.assertTrue(queryOutput.getRecords().stream().allMatch(r -> r.getValueString("email").matches("darin.*")), "Should find matching email address");
} }
@ -175,16 +175,16 @@ public class RDBMSQueryActionTest extends RDBMSActionTest
@Test @Test
public void testContains() throws QException public void testContains() throws QException
{ {
QueryRequest queryRequest = initQueryRequest(); QueryInput queryInput = initQueryRequest();
queryRequest.setFilter(new QQueryFilter() queryInput.setFilter(new QQueryFilter()
.withCriteria(new QFilterCriteria() .withCriteria(new QFilterCriteria()
.withFieldName("email") .withFieldName("email")
.withOperator(QCriteriaOperator.CONTAINS) .withOperator(QCriteriaOperator.CONTAINS)
.withValues(List.of("kelkhoff"))) .withValues(List.of("kelkhoff")))
); );
QueryResult queryResult = new RDBMSQueryAction().execute(queryRequest); QueryOutput queryOutput = new RDBMSQueryAction().execute(queryInput);
Assertions.assertEquals(1, queryResult.getRecords().size(), "Expected # of rows"); Assertions.assertEquals(1, queryOutput.getRecords().size(), "Expected # of rows");
Assertions.assertTrue(queryResult.getRecords().stream().allMatch(r -> r.getValueString("email").matches(".*kelkhoff.*")), "Should find matching email address"); Assertions.assertTrue(queryOutput.getRecords().stream().allMatch(r -> r.getValueString("email").matches(".*kelkhoff.*")), "Should find matching email address");
} }
@ -195,16 +195,16 @@ public class RDBMSQueryActionTest extends RDBMSActionTest
@Test @Test
public void testEndsWith() throws QException public void testEndsWith() throws QException
{ {
QueryRequest queryRequest = initQueryRequest(); QueryInput queryInput = initQueryRequest();
queryRequest.setFilter(new QQueryFilter() queryInput.setFilter(new QQueryFilter()
.withCriteria(new QFilterCriteria() .withCriteria(new QFilterCriteria()
.withFieldName("email") .withFieldName("email")
.withOperator(QCriteriaOperator.ENDS_WITH) .withOperator(QCriteriaOperator.ENDS_WITH)
.withValues(List.of("gmail.com"))) .withValues(List.of("gmail.com")))
); );
QueryResult queryResult = new RDBMSQueryAction().execute(queryRequest); QueryOutput queryOutput = new RDBMSQueryAction().execute(queryInput);
Assertions.assertEquals(1, queryResult.getRecords().size(), "Expected # of rows"); Assertions.assertEquals(1, queryOutput.getRecords().size(), "Expected # of rows");
Assertions.assertTrue(queryResult.getRecords().stream().allMatch(r -> r.getValueString("email").matches(".*gmail.com")), "Should find matching email address"); Assertions.assertTrue(queryOutput.getRecords().stream().allMatch(r -> r.getValueString("email").matches(".*gmail.com")), "Should find matching email address");
} }
@ -215,16 +215,16 @@ public class RDBMSQueryActionTest extends RDBMSActionTest
@Test @Test
public void testNotStartsWith() throws QException public void testNotStartsWith() throws QException
{ {
QueryRequest queryRequest = initQueryRequest(); QueryInput queryInput = initQueryRequest();
queryRequest.setFilter(new QQueryFilter() queryInput.setFilter(new QQueryFilter()
.withCriteria(new QFilterCriteria() .withCriteria(new QFilterCriteria()
.withFieldName("email") .withFieldName("email")
.withOperator(QCriteriaOperator.NOT_STARTS_WITH) .withOperator(QCriteriaOperator.NOT_STARTS_WITH)
.withValues(List.of("darin"))) .withValues(List.of("darin")))
); );
QueryResult queryResult = new RDBMSQueryAction().execute(queryRequest); QueryOutput queryOutput = new RDBMSQueryAction().execute(queryInput);
Assertions.assertEquals(4, queryResult.getRecords().size(), "Expected # of rows"); Assertions.assertEquals(4, queryOutput.getRecords().size(), "Expected # of rows");
Assertions.assertTrue(queryResult.getRecords().stream().noneMatch(r -> r.getValueString("email").matches("darin.*")), "Should find matching email address"); Assertions.assertTrue(queryOutput.getRecords().stream().noneMatch(r -> r.getValueString("email").matches("darin.*")), "Should find matching email address");
} }
@ -235,16 +235,16 @@ public class RDBMSQueryActionTest extends RDBMSActionTest
@Test @Test
public void testNotContains() throws QException public void testNotContains() throws QException
{ {
QueryRequest queryRequest = initQueryRequest(); QueryInput queryInput = initQueryRequest();
queryRequest.setFilter(new QQueryFilter() queryInput.setFilter(new QQueryFilter()
.withCriteria(new QFilterCriteria() .withCriteria(new QFilterCriteria()
.withFieldName("email") .withFieldName("email")
.withOperator(QCriteriaOperator.NOT_CONTAINS) .withOperator(QCriteriaOperator.NOT_CONTAINS)
.withValues(List.of("kelkhoff"))) .withValues(List.of("kelkhoff")))
); );
QueryResult queryResult = new RDBMSQueryAction().execute(queryRequest); QueryOutput queryOutput = new RDBMSQueryAction().execute(queryInput);
Assertions.assertEquals(4, queryResult.getRecords().size(), "Expected # of rows"); Assertions.assertEquals(4, queryOutput.getRecords().size(), "Expected # of rows");
Assertions.assertTrue(queryResult.getRecords().stream().noneMatch(r -> r.getValueString("email").matches(".*kelkhoff.*")), "Should find matching email address"); Assertions.assertTrue(queryOutput.getRecords().stream().noneMatch(r -> r.getValueString("email").matches(".*kelkhoff.*")), "Should find matching email address");
} }
@ -255,16 +255,16 @@ public class RDBMSQueryActionTest extends RDBMSActionTest
@Test @Test
public void testNotEndsWith() throws QException public void testNotEndsWith() throws QException
{ {
QueryRequest queryRequest = initQueryRequest(); QueryInput queryInput = initQueryRequest();
queryRequest.setFilter(new QQueryFilter() queryInput.setFilter(new QQueryFilter()
.withCriteria(new QFilterCriteria() .withCriteria(new QFilterCriteria()
.withFieldName("email") .withFieldName("email")
.withOperator(QCriteriaOperator.NOT_ENDS_WITH) .withOperator(QCriteriaOperator.NOT_ENDS_WITH)
.withValues(List.of("gmail.com"))) .withValues(List.of("gmail.com")))
); );
QueryResult queryResult = new RDBMSQueryAction().execute(queryRequest); QueryOutput queryOutput = new RDBMSQueryAction().execute(queryInput);
Assertions.assertEquals(4, queryResult.getRecords().size(), "Expected # of rows"); Assertions.assertEquals(4, queryOutput.getRecords().size(), "Expected # of rows");
Assertions.assertTrue(queryResult.getRecords().stream().noneMatch(r -> r.getValueString("email").matches(".*gmail.com")), "Should find matching email address"); Assertions.assertTrue(queryOutput.getRecords().stream().noneMatch(r -> r.getValueString("email").matches(".*gmail.com")), "Should find matching email address");
} }
@ -275,16 +275,16 @@ public class RDBMSQueryActionTest extends RDBMSActionTest
@Test @Test
public void testLessThanQuery() throws QException public void testLessThanQuery() throws QException
{ {
QueryRequest queryRequest = initQueryRequest(); QueryInput queryInput = initQueryRequest();
queryRequest.setFilter(new QQueryFilter() queryInput.setFilter(new QQueryFilter()
.withCriteria(new QFilterCriteria() .withCriteria(new QFilterCriteria()
.withFieldName("id") .withFieldName("id")
.withOperator(QCriteriaOperator.LESS_THAN) .withOperator(QCriteriaOperator.LESS_THAN)
.withValues(List.of(3))) .withValues(List.of(3)))
); );
QueryResult queryResult = new RDBMSQueryAction().execute(queryRequest); QueryOutput queryOutput = new RDBMSQueryAction().execute(queryInput);
Assertions.assertEquals(2, queryResult.getRecords().size(), "Expected # of rows"); Assertions.assertEquals(2, queryOutput.getRecords().size(), "Expected # of rows");
Assertions.assertTrue(queryResult.getRecords().stream().allMatch(r -> r.getValueInteger("id").equals(1) || r.getValueInteger("id").equals(2)), "Should find expected ids"); Assertions.assertTrue(queryOutput.getRecords().stream().allMatch(r -> r.getValueInteger("id").equals(1) || r.getValueInteger("id").equals(2)), "Should find expected ids");
} }
@ -295,16 +295,16 @@ public class RDBMSQueryActionTest extends RDBMSActionTest
@Test @Test
public void testLessThanOrEqualsQuery() throws QException public void testLessThanOrEqualsQuery() throws QException
{ {
QueryRequest queryRequest = initQueryRequest(); QueryInput queryInput = initQueryRequest();
queryRequest.setFilter(new QQueryFilter() queryInput.setFilter(new QQueryFilter()
.withCriteria(new QFilterCriteria() .withCriteria(new QFilterCriteria()
.withFieldName("id") .withFieldName("id")
.withOperator(QCriteriaOperator.LESS_THAN_OR_EQUALS) .withOperator(QCriteriaOperator.LESS_THAN_OR_EQUALS)
.withValues(List.of(2))) .withValues(List.of(2)))
); );
QueryResult queryResult = new RDBMSQueryAction().execute(queryRequest); QueryOutput queryOutput = new RDBMSQueryAction().execute(queryInput);
Assertions.assertEquals(2, queryResult.getRecords().size(), "Expected # of rows"); Assertions.assertEquals(2, queryOutput.getRecords().size(), "Expected # of rows");
Assertions.assertTrue(queryResult.getRecords().stream().allMatch(r -> r.getValueInteger("id").equals(1) || r.getValueInteger("id").equals(2)), "Should find expected ids"); Assertions.assertTrue(queryOutput.getRecords().stream().allMatch(r -> r.getValueInteger("id").equals(1) || r.getValueInteger("id").equals(2)), "Should find expected ids");
} }
@ -315,16 +315,16 @@ public class RDBMSQueryActionTest extends RDBMSActionTest
@Test @Test
public void testGreaterThanQuery() throws QException public void testGreaterThanQuery() throws QException
{ {
QueryRequest queryRequest = initQueryRequest(); QueryInput queryInput = initQueryRequest();
queryRequest.setFilter(new QQueryFilter() queryInput.setFilter(new QQueryFilter()
.withCriteria(new QFilterCriteria() .withCriteria(new QFilterCriteria()
.withFieldName("id") .withFieldName("id")
.withOperator(QCriteriaOperator.GREATER_THAN) .withOperator(QCriteriaOperator.GREATER_THAN)
.withValues(List.of(3))) .withValues(List.of(3)))
); );
QueryResult queryResult = new RDBMSQueryAction().execute(queryRequest); QueryOutput queryOutput = new RDBMSQueryAction().execute(queryInput);
Assertions.assertEquals(2, queryResult.getRecords().size(), "Expected # of rows"); Assertions.assertEquals(2, queryOutput.getRecords().size(), "Expected # of rows");
Assertions.assertTrue(queryResult.getRecords().stream().allMatch(r -> r.getValueInteger("id").equals(4) || r.getValueInteger("id").equals(5)), "Should find expected ids"); Assertions.assertTrue(queryOutput.getRecords().stream().allMatch(r -> r.getValueInteger("id").equals(4) || r.getValueInteger("id").equals(5)), "Should find expected ids");
} }
@ -335,16 +335,16 @@ public class RDBMSQueryActionTest extends RDBMSActionTest
@Test @Test
public void testGreaterThanOrEqualsQuery() throws QException public void testGreaterThanOrEqualsQuery() throws QException
{ {
QueryRequest queryRequest = initQueryRequest(); QueryInput queryInput = initQueryRequest();
queryRequest.setFilter(new QQueryFilter() queryInput.setFilter(new QQueryFilter()
.withCriteria(new QFilterCriteria() .withCriteria(new QFilterCriteria()
.withFieldName("id") .withFieldName("id")
.withOperator(QCriteriaOperator.GREATER_THAN_OR_EQUALS) .withOperator(QCriteriaOperator.GREATER_THAN_OR_EQUALS)
.withValues(List.of(4))) .withValues(List.of(4)))
); );
QueryResult queryResult = new RDBMSQueryAction().execute(queryRequest); QueryOutput queryOutput = new RDBMSQueryAction().execute(queryInput);
Assertions.assertEquals(2, queryResult.getRecords().size(), "Expected # of rows"); Assertions.assertEquals(2, queryOutput.getRecords().size(), "Expected # of rows");
Assertions.assertTrue(queryResult.getRecords().stream().allMatch(r -> r.getValueInteger("id").equals(4) || r.getValueInteger("id").equals(5)), "Should find expected ids"); Assertions.assertTrue(queryOutput.getRecords().stream().allMatch(r -> r.getValueInteger("id").equals(4) || r.getValueInteger("id").equals(5)), "Should find expected ids");
} }
@ -355,15 +355,15 @@ public class RDBMSQueryActionTest extends RDBMSActionTest
@Test @Test
public void testIsBlankQuery() throws QException public void testIsBlankQuery() throws QException
{ {
QueryRequest queryRequest = initQueryRequest(); QueryInput queryInput = initQueryRequest();
queryRequest.setFilter(new QQueryFilter() queryInput.setFilter(new QQueryFilter()
.withCriteria(new QFilterCriteria() .withCriteria(new QFilterCriteria()
.withFieldName("birthDate") .withFieldName("birthDate")
.withOperator(QCriteriaOperator.IS_BLANK) .withOperator(QCriteriaOperator.IS_BLANK)
)); ));
QueryResult queryResult = new RDBMSQueryAction().execute(queryRequest); QueryOutput queryOutput = new RDBMSQueryAction().execute(queryInput);
Assertions.assertEquals(1, queryResult.getRecords().size(), "Expected # of rows"); Assertions.assertEquals(1, queryOutput.getRecords().size(), "Expected # of rows");
Assertions.assertTrue(queryResult.getRecords().stream().allMatch(r -> r.getValue("birthDate") == null), "Should find expected row"); Assertions.assertTrue(queryOutput.getRecords().stream().allMatch(r -> r.getValue("birthDate") == null), "Should find expected row");
} }
@ -374,16 +374,16 @@ public class RDBMSQueryActionTest extends RDBMSActionTest
@Test @Test
public void testBetweenQuery() throws QException public void testBetweenQuery() throws QException
{ {
QueryRequest queryRequest = initQueryRequest(); QueryInput queryInput = initQueryRequest();
queryRequest.setFilter(new QQueryFilter() queryInput.setFilter(new QQueryFilter()
.withCriteria(new QFilterCriteria() .withCriteria(new QFilterCriteria()
.withFieldName("id") .withFieldName("id")
.withOperator(QCriteriaOperator.BETWEEN) .withOperator(QCriteriaOperator.BETWEEN)
.withValues(List.of(2, 4)) .withValues(List.of(2, 4))
)); ));
QueryResult queryResult = new RDBMSQueryAction().execute(queryRequest); QueryOutput queryOutput = new RDBMSQueryAction().execute(queryInput);
Assertions.assertEquals(3, queryResult.getRecords().size(), "Expected # of rows"); Assertions.assertEquals(3, queryOutput.getRecords().size(), "Expected # of rows");
Assertions.assertTrue(queryResult.getRecords().stream().allMatch(r -> r.getValueInteger("id").equals(2) || r.getValueInteger("id").equals(3) || r.getValueInteger("id").equals(4)), "Should find expected ids"); Assertions.assertTrue(queryOutput.getRecords().stream().allMatch(r -> r.getValueInteger("id").equals(2) || r.getValueInteger("id").equals(3) || r.getValueInteger("id").equals(4)), "Should find expected ids");
} }
@ -394,16 +394,16 @@ public class RDBMSQueryActionTest extends RDBMSActionTest
@Test @Test
public void testNotBetweenQuery() throws QException public void testNotBetweenQuery() throws QException
{ {
QueryRequest queryRequest = initQueryRequest(); QueryInput queryInput = initQueryRequest();
queryRequest.setFilter(new QQueryFilter() queryInput.setFilter(new QQueryFilter()
.withCriteria(new QFilterCriteria() .withCriteria(new QFilterCriteria()
.withFieldName("id") .withFieldName("id")
.withOperator(QCriteriaOperator.NOT_BETWEEN) .withOperator(QCriteriaOperator.NOT_BETWEEN)
.withValues(List.of(2, 4)) .withValues(List.of(2, 4))
)); ));
QueryResult queryResult = new RDBMSQueryAction().execute(queryRequest); QueryOutput queryOutput = new RDBMSQueryAction().execute(queryInput);
Assertions.assertEquals(2, queryResult.getRecords().size(), "Expected # of rows"); Assertions.assertEquals(2, queryOutput.getRecords().size(), "Expected # of rows");
Assertions.assertTrue(queryResult.getRecords().stream().allMatch(r -> r.getValueInteger("id").equals(1) || r.getValueInteger("id").equals(5)), "Should find expected ids"); Assertions.assertTrue(queryOutput.getRecords().stream().allMatch(r -> r.getValueInteger("id").equals(1) || r.getValueInteger("id").equals(5)), "Should find expected ids");
} }
@ -411,12 +411,12 @@ public class RDBMSQueryActionTest extends RDBMSActionTest
/******************************************************************************* /*******************************************************************************
** **
*******************************************************************************/ *******************************************************************************/
private QueryRequest initQueryRequest() private QueryInput initQueryRequest()
{ {
QueryRequest queryRequest = new QueryRequest(); QueryInput queryInput = new QueryInput();
queryRequest.setInstance(TestUtils.defineInstance()); queryInput.setInstance(TestUtils.defineInstance());
queryRequest.setTableName(TestUtils.defineTablePerson().getName()); queryInput.setTableName(TestUtils.defineTablePerson().getName());
return queryRequest; return queryInput;
} }
} }

52
src/test/java/com/kingsrook/qqq/backend/module/rdbms/actions/RDBMSUpdateActionTest.java
View File

@ -27,8 +27,8 @@ import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import com.kingsrook.qqq.backend.core.exceptions.QException; import com.kingsrook.qqq.backend.core.exceptions.QException;
import com.kingsrook.qqq.backend.core.model.actions.update.UpdateRequest; import com.kingsrook.qqq.backend.core.model.actions.tables.update.UpdateInput;
import com.kingsrook.qqq.backend.core.model.actions.update.UpdateResult; import com.kingsrook.qqq.backend.core.model.actions.tables.update.UpdateOutput;
import com.kingsrook.qqq.backend.core.model.data.QRecord; import com.kingsrook.qqq.backend.core.model.data.QRecord;
import com.kingsrook.qqq.backend.module.rdbms.TestUtils; import com.kingsrook.qqq.backend.module.rdbms.TestUtils;
import com.kingsrook.qqq.backend.module.rdbms.jdbc.QueryManager; import com.kingsrook.qqq.backend.module.rdbms.jdbc.QueryManager;
@ -77,9 +77,9 @@ public class RDBMSUpdateActionTest extends RDBMSActionTest
@Test @Test
public void testUpdateNullList() throws QException public void testUpdateNullList() throws QException
{ {
UpdateRequest updateRequest = initUpdateRequest(); UpdateInput updateInput = initUpdateRequest();
updateRequest.setRecords(null); updateInput.setRecords(null);
UpdateResult updateResult = new RDBMSUpdateAction().execute(updateRequest); UpdateOutput updateResult = new RDBMSUpdateAction().execute(updateInput);
assertEquals(0, updateResult.getRecords().size()); assertEquals(0, updateResult.getRecords().size());
} }
@ -91,10 +91,10 @@ public class RDBMSUpdateActionTest extends RDBMSActionTest
@Test @Test
public void testUpdateEmptyList() throws QException public void testUpdateEmptyList() throws QException
{ {
UpdateRequest updateRequest = initUpdateRequest(); UpdateInput updateInput = initUpdateRequest();
updateRequest.setRecords(Collections.emptyList()); updateInput.setRecords(Collections.emptyList());
new RDBMSUpdateAction().execute(updateRequest); new RDBMSUpdateAction().execute(updateInput);
UpdateResult updateResult = new RDBMSUpdateAction().execute(updateRequest); UpdateOutput updateResult = new RDBMSUpdateAction().execute(updateInput);
assertEquals(0, updateResult.getRecords().size()); assertEquals(0, updateResult.getRecords().size());
} }
@ -106,16 +106,16 @@ public class RDBMSUpdateActionTest extends RDBMSActionTest
@Test @Test
public void testUpdateOne() throws Exception public void testUpdateOne() throws Exception
{ {
UpdateRequest updateRequest = initUpdateRequest(); UpdateInput updateInput = initUpdateRequest();
QRecord record = new QRecord().withTableName("person") QRecord record = new QRecord().withTableName("person")
.withValue("id", 2) .withValue("id", 2)
.withValue("firstName", "James") .withValue("firstName", "James")
.withValue("lastName", "Kirk") .withValue("lastName", "Kirk")
.withValue("email", "jamestk@starfleet.net") .withValue("email", "jamestk@starfleet.net")
.withValue("birthDate", "2210-05-20"); .withValue("birthDate", "2210-05-20");
updateRequest.setRecords(List.of(record)); updateInput.setRecords(List.of(record));
UpdateResult updateResult = new RDBMSUpdateAction().execute(updateRequest); UpdateOutput updateResult = new RDBMSUpdateAction().execute(updateInput);
Map<String, Integer> statistics = QueryManager.getStatistics(); Map<String, Integer> statistics = QueryManager.getStatistics();
assertEquals(1, statistics.get(QueryManager.STAT_QUERIES_RAN)); assertEquals(1, statistics.get(QueryManager.STAT_QUERIES_RAN));
@ -149,7 +149,7 @@ public class RDBMSUpdateActionTest extends RDBMSActionTest
@Test @Test
public void testUpdateManyWithDifferentColumnsAndValues() throws Exception public void testUpdateManyWithDifferentColumnsAndValues() throws Exception
{ {
UpdateRequest updateRequest = initUpdateRequest(); UpdateInput updateInput = initUpdateRequest();
QRecord record1 = new QRecord().withTableName("person") QRecord record1 = new QRecord().withTableName("person")
.withValue("id", 1) .withValue("id", 1)
.withValue("firstName", "Darren") .withValue("firstName", "Darren")
@ -166,9 +166,9 @@ public class RDBMSUpdateActionTest extends RDBMSActionTest
.withValue("firstName", "Richard") .withValue("firstName", "Richard")
.withValue("birthDate", null); .withValue("birthDate", null);
updateRequest.setRecords(List.of(record1, record2, record3)); updateInput.setRecords(List.of(record1, record2, record3));
UpdateResult updateResult = new RDBMSUpdateAction().execute(updateRequest); UpdateOutput updateResult = new RDBMSUpdateAction().execute(updateInput);
// this test runs one batch and one regular query // this test runs one batch and one regular query
Map<String, Integer> statistics = QueryManager.getStatistics(); Map<String, Integer> statistics = QueryManager.getStatistics();
@ -224,7 +224,7 @@ public class RDBMSUpdateActionTest extends RDBMSActionTest
@Test @Test
public void testUpdateManyWithSameColumnsDifferentValues() throws Exception public void testUpdateManyWithSameColumnsDifferentValues() throws Exception
{ {
UpdateRequest updateRequest = initUpdateRequest(); UpdateInput updateInput = initUpdateRequest();
QRecord record1 = new QRecord().withTableName("person") QRecord record1 = new QRecord().withTableName("person")
.withValue("id", 1) .withValue("id", 1)
.withValue("firstName", "Darren") .withValue("firstName", "Darren")
@ -237,9 +237,9 @@ public class RDBMSUpdateActionTest extends RDBMSActionTest
.withValue("lastName", "Tim's Uncle") .withValue("lastName", "Tim's Uncle")
.withValue("birthDate", null); .withValue("birthDate", null);
updateRequest.setRecords(List.of(record1, record2)); updateInput.setRecords(List.of(record1, record2));
UpdateResult updateResult = new RDBMSUpdateAction().execute(updateRequest); UpdateOutput updateResult = new RDBMSUpdateAction().execute(updateInput);
Map<String, Integer> statistics = QueryManager.getStatistics(); Map<String, Integer> statistics = QueryManager.getStatistics();
assertEquals(1, statistics.get(QueryManager.STAT_BATCHES_RAN)); assertEquals(1, statistics.get(QueryManager.STAT_BATCHES_RAN));
@ -281,7 +281,7 @@ public class RDBMSUpdateActionTest extends RDBMSActionTest
@Test @Test
public void testUpdateManyWithSameColumnsSameValues() throws Exception public void testUpdateManyWithSameColumnsSameValues() throws Exception
{ {
UpdateRequest updateRequest = initUpdateRequest(); UpdateInput updateInput = initUpdateRequest();
List<QRecord> records = new ArrayList<>(); List<QRecord> records = new ArrayList<>();
for(int i = 1; i <= 5; i++) for(int i = 1; i <= 5; i++)
{ {
@ -290,9 +290,9 @@ public class RDBMSUpdateActionTest extends RDBMSActionTest
.withValue("birthDate", "1999-09-09")); .withValue("birthDate", "1999-09-09"));
} }
updateRequest.setRecords(records); updateInput.setRecords(records);
UpdateResult updateResult = new RDBMSUpdateAction().execute(updateRequest); UpdateOutput updateResult = new RDBMSUpdateAction().execute(updateInput);
Map<String, Integer> statistics = QueryManager.getStatistics(); Map<String, Integer> statistics = QueryManager.getStatistics();
assertEquals(1, statistics.get(QueryManager.STAT_QUERIES_RAN)); assertEquals(1, statistics.get(QueryManager.STAT_QUERIES_RAN));
@ -314,12 +314,12 @@ public class RDBMSUpdateActionTest extends RDBMSActionTest
/******************************************************************************* /*******************************************************************************
** **
*******************************************************************************/ *******************************************************************************/
private UpdateRequest initUpdateRequest() private UpdateInput initUpdateRequest()
{ {
UpdateRequest updateRequest = new UpdateRequest(); UpdateInput updateInput = new UpdateInput();
updateRequest.setInstance(TestUtils.defineInstance()); updateInput.setInstance(TestUtils.defineInstance());
updateRequest.setTableName(TestUtils.defineTablePerson().getName()); updateInput.setTableName(TestUtils.defineTablePerson().getName());
return updateRequest; return updateInput;
} }
} }

2
src/test/resources/prime-test-database.sql
View File

@ -22,7 +22,7 @@
DROP TABLE IF EXISTS person; DROP TABLE IF EXISTS person;
CREATE TABLE person CREATE TABLE person
( (
id INT AUTO_INCREMENT, id INT AUTO_INCREMENT primary key ,
create_date TIMESTAMP DEFAULT now(), create_date TIMESTAMP DEFAULT now(),
modify_date TIMESTAMP DEFAULT now(), modify_date TIMESTAMP DEFAULT now(),