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

Rename fields from qqqTableId to just tableId...

Browse Source
This commit is contained in:
darin.kelkhoff
2023-08-05 19:46:19 -05:00
parent 1d309afbea
commit 7a56d1ae22
19 changed files with 102 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/automation/RecordAutomationStatusUpdater.java
View File

@ -172,7 +172,7 @@ public class RecordAutomationStatusUpdater
CountInput countInput = new CountInput(); CountInput countInput = new CountInput();
countInput.setTableName(TableTrigger.TABLE_NAME); countInput.setTableName(TableTrigger.TABLE_NAME);
countInput.setFilter(new QQueryFilter( countInput.setFilter(new QQueryFilter(
new QFilterCriteria("qqqTableId", QCriteriaOperator.EQUALS, QQQTableAccessor.getQQQTableId(table.getName())), new QFilterCriteria("tableId", QCriteriaOperator.EQUALS, QQQTableAccessor.getTableId(table.getName())),
new QFilterCriteria(triggerEvent.equals(TriggerEvent.POST_INSERT) ? "postInsert" : "postUpdate", QCriteriaOperator.EQUALS, true) new QFilterCriteria(triggerEvent.equals(TriggerEvent.POST_INSERT) ? "postInsert" : "postUpdate", QCriteriaOperator.EQUALS, true)
)); ));
CountOutput countOutput = new CountAction().execute(countInput); CountOutput countOutput = new CountAction().execute(countInput);

2
qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/automation/polling/PollingAutomationPerTableRunner.java
View File

@ -271,7 +271,7 @@ public class PollingAutomationPerTableRunner implements Runnable
QueryInput queryInput = new QueryInput(); QueryInput queryInput = new QueryInput();
queryInput.setTableName(TableTrigger.TABLE_NAME); queryInput.setTableName(TableTrigger.TABLE_NAME);
queryInput.setFilter(new QQueryFilter( queryInput.setFilter(new QQueryFilter(
new QFilterCriteria("qqqTableId", QCriteriaOperator.EQUALS, QQQTableAccessor.getQQQTableId(table.getName())), new QFilterCriteria("tableId", QCriteriaOperator.EQUALS, QQQTableAccessor.getTableId(table.getName())),
new QFilterCriteria(triggerEvent.equals(TriggerEvent.POST_INSERT) ? "postInsert" : "postUpdate", QCriteriaOperator.EQUALS, true) new QFilterCriteria(triggerEvent.equals(TriggerEvent.POST_INSERT) ? "postInsert" : "postUpdate", QCriteriaOperator.EQUALS, true)
)); ));
QueryOutput queryOutput = new QueryAction().execute(queryInput); QueryOutput queryOutput = new QueryAction().execute(queryInput);

2
qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/scripts/RecordScriptTestInterface.java
View File

@ -84,7 +84,7 @@ public class RecordScriptTestInterface implements TestScriptActionInterface
////////////////////////////////////////////// //////////////////////////////////////////////
// look up the records being tested against // // look up the records being tested against //
////////////////////////////////////////////// //////////////////////////////////////////////
String tableName = QQQTableAccessor.getQQQTableName(script.getValueInteger("qqqTableId")); String tableName = QQQTableAccessor.getTableName(script.getValueInteger("tableId"));
QTableMetaData table = QContext.getQInstance().getTable(tableName); QTableMetaData table = QContext.getQInstance().getTable(tableName);
if(table == null) if(table == null)
{ {

24
qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/tables/helpers/QueryStatManager.java
View File

@ -357,8 +357,8 @@ public class QueryStatManager
////////////////////// //////////////////////
// set the table id // // set the table id //
////////////////////// //////////////////////
Integer qqqTableId = QQQTableAccessor.getQQQTableId(queryStat.getTableName()); Integer tableId = QQQTableAccessor.getTableId(queryStat.getTableName());
queryStat.setQqqTableId(qqqTableId); queryStat.setTableId(tableId);
////////////////////////////// //////////////////////////////
// build join-table records // // build join-table records //
@ -368,7 +368,7 @@ public class QueryStatManager
List<QueryStatJoinTable> queryStatJoinTableList = new ArrayList<>(); List<QueryStatJoinTable> queryStatJoinTableList = new ArrayList<>();
for(String joinTableName : queryStat.getJoinTableNames()) for(String joinTableName : queryStat.getJoinTableNames())
{ {
queryStatJoinTableList.add(new QueryStatJoinTable().withQqqTableId(QQQTableAccessor.getQQQTableId(joinTableName))); queryStatJoinTableList.add(new QueryStatJoinTable().withTableId(QQQTableAccessor.getTableId(joinTableName)));
} }
queryStat.setQueryStatJoinTableList(queryStatJoinTableList); queryStat.setQueryStatJoinTableList(queryStatJoinTableList);
} }
@ -379,14 +379,14 @@ public class QueryStatManager
if(queryStat.getQueryFilter() != null && queryStat.getQueryFilter().hasAnyCriteria()) if(queryStat.getQueryFilter() != null && queryStat.getQueryFilter().hasAnyCriteria())
{ {
List<QueryStatCriteriaField> queryStatCriteriaFieldList = new ArrayList<>(); List<QueryStatCriteriaField> queryStatCriteriaFieldList = new ArrayList<>();
processCriteriaFromFilter(qqqTableId, queryStatCriteriaFieldList, queryStat.getQueryFilter()); processCriteriaFromFilter(tableId, queryStatCriteriaFieldList, queryStat.getQueryFilter());
queryStat.setQueryStatCriteriaFieldList(queryStatCriteriaFieldList); queryStat.setQueryStatCriteriaFieldList(queryStatCriteriaFieldList);
} }
if(CollectionUtils.nullSafeHasContents(queryStat.getQueryFilter().getOrderBys())) if(CollectionUtils.nullSafeHasContents(queryStat.getQueryFilter().getOrderBys()))
{ {
List<QueryStatOrderByField> queryStatOrderByFieldList = new ArrayList<>(); List<QueryStatOrderByField> queryStatOrderByFieldList = new ArrayList<>();
processOrderByFromFilter(qqqTableId, queryStatOrderByFieldList, queryStat.getQueryFilter()); processOrderByFromFilter(tableId, queryStatOrderByFieldList, queryStat.getQueryFilter());
queryStat.setQueryStatOrderByFieldList(queryStatOrderByFieldList); queryStat.setQueryStatOrderByFieldList(queryStatOrderByFieldList);
} }
@ -428,7 +428,7 @@ public class QueryStatManager
/******************************************************************************* /*******************************************************************************
** **
*******************************************************************************/ *******************************************************************************/
private static void processCriteriaFromFilter(Integer qqqTableId, List<QueryStatCriteriaField> queryStatCriteriaFieldList, QQueryFilter queryFilter) throws QException private static void processCriteriaFromFilter(Integer tableId, List<QueryStatCriteriaField> queryStatCriteriaFieldList, QQueryFilter queryFilter) throws QException
{ {
for(QFilterCriteria criteria : CollectionUtils.nonNullList(queryFilter.getCriteria())) for(QFilterCriteria criteria : CollectionUtils.nonNullList(queryFilter.getCriteria()))
{ {
@ -446,13 +446,13 @@ public class QueryStatManager
String[] parts = fieldName.split("\\."); String[] parts = fieldName.split("\\.");
if(parts.length > 1) if(parts.length > 1)
{ {
queryStatCriteriaField.setQqqTableId(QQQTableAccessor.getQQQTableId(parts[0])); queryStatCriteriaField.setTableId(QQQTableAccessor.getTableId(parts[0]));
queryStatCriteriaField.setName(parts[1]); queryStatCriteriaField.setName(parts[1]);
} }
} }
else else
{ {
queryStatCriteriaField.setQqqTableId(qqqTableId); queryStatCriteriaField.setTableId(tableId);
queryStatCriteriaField.setName(fieldName); queryStatCriteriaField.setName(fieldName);
} }
@ -461,7 +461,7 @@ public class QueryStatManager
for(QQueryFilter subFilter : CollectionUtils.nonNullList(queryFilter.getSubFilters())) for(QQueryFilter subFilter : CollectionUtils.nonNullList(queryFilter.getSubFilters()))
{ {
processCriteriaFromFilter(qqqTableId, queryStatCriteriaFieldList, subFilter); processCriteriaFromFilter(tableId, queryStatCriteriaFieldList, subFilter);
} }
} }
@ -470,7 +470,7 @@ public class QueryStatManager
/******************************************************************************* /*******************************************************************************
** **
*******************************************************************************/ *******************************************************************************/
private static void processOrderByFromFilter(Integer qqqTableId, List<QueryStatOrderByField> queryStatOrderByFieldList, QQueryFilter queryFilter) throws QException private static void processOrderByFromFilter(Integer tableId, List<QueryStatOrderByField> queryStatOrderByFieldList, QQueryFilter queryFilter) throws QException
{ {
for(QFilterOrderBy orderBy : CollectionUtils.nonNullList(queryFilter.getOrderBys())) for(QFilterOrderBy orderBy : CollectionUtils.nonNullList(queryFilter.getOrderBys()))
{ {
@ -484,13 +484,13 @@ public class QueryStatManager
String[] parts = fieldName.split("\\."); String[] parts = fieldName.split("\\.");
if(parts.length > 1) if(parts.length > 1)
{ {
queryStatOrderByField.setQqqTableId(QQQTableAccessor.getQQQTableId(parts[0])); queryStatOrderByField.setTableId(QQQTableAccessor.getTableId(parts[0]));
queryStatOrderByField.setName(parts[1]); queryStatOrderByField.setName(parts[1]);
} }
} }
else else
{ {
queryStatOrderByField.setQqqTableId(qqqTableId); queryStatOrderByField.setTableId(tableId);
queryStatOrderByField.setName(fieldName); queryStatOrderByField.setName(fieldName);
} }

20
qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/automation/TableTrigger.java
View File

@ -49,7 +49,7 @@ public class TableTrigger extends QRecordEntity
private Instant modifyDate; private Instant modifyDate;
@QField(possibleValueSourceName = QQQTable.TABLE_NAME) @QField(possibleValueSourceName = QQQTable.TABLE_NAME)
private Integer qqqTableId; private Integer tableId;
@QField(possibleValueSourceName = SavedFilter.TABLE_NAME) @QField(possibleValueSourceName = SavedFilter.TABLE_NAME)
private Integer filterId; private Integer filterId;
@ -359,31 +359,31 @@ public class TableTrigger extends QRecordEntity
/******************************************************************************* /*******************************************************************************
** Getter for qqqTableId ** Getter for tableId
*******************************************************************************/ *******************************************************************************/
public Integer getQqqTableId() public Integer getTableId()
{ {
return (this.qqqTableId); return (this.tableId);
} }
/******************************************************************************* /*******************************************************************************
** Setter for qqqTableId ** Setter for tableId
*******************************************************************************/ *******************************************************************************/
public void setQqqTableId(Integer qqqTableId) public void setTableId(Integer tableId)
{ {
this.qqqTableId = qqqTableId; this.tableId = tableId;
} }
/******************************************************************************* /*******************************************************************************
** Fluent setter for qqqTableId ** Fluent setter for tableId
*******************************************************************************/ *******************************************************************************/
public TableTrigger withQqqTableId(Integer qqqTableId) public TableTrigger withTableId(Integer tableId)
{ {
this.qqqTableId = qqqTableId; this.tableId = tableId;
return (this); return (this);
} }

22
qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/querystats/QueryStat.java
View File

@ -53,8 +53,8 @@ public class QueryStat extends QRecordEntity
@QField() @QField()
private Integer firstResultMillis; private Integer firstResultMillis;
@QField(label = "Table", possibleValueSourceName = QQQTable.TABLE_NAME) @QField(possibleValueSourceName = QQQTable.TABLE_NAME)
private Integer qqqTableId; private Integer tableId;
@QField(maxLength = 100, valueTooLongBehavior = ValueTooLongBehavior.TRUNCATE_ELLIPSIS) @QField(maxLength = 100, valueTooLongBehavior = ValueTooLongBehavior.TRUNCATE_ELLIPSIS)
private String action; private String action;
@ -413,31 +413,31 @@ public class QueryStat extends QRecordEntity
/******************************************************************************* /*******************************************************************************
** Getter for qqqTableId ** Getter for tableId
*******************************************************************************/ *******************************************************************************/
public Integer getQqqTableId() public Integer getTableId()
{ {
return (this.qqqTableId); return (this.tableId);
} }
/******************************************************************************* /*******************************************************************************
** Setter for qqqTableId ** Setter for tableId
*******************************************************************************/ *******************************************************************************/
public void setQqqTableId(Integer qqqTableId) public void setTableId(Integer tableId)
{ {
this.qqqTableId = qqqTableId; this.tableId = tableId;
} }
/******************************************************************************* /*******************************************************************************
** Fluent setter for qqqTableId ** Fluent setter for tableId
*******************************************************************************/ *******************************************************************************/
public QueryStat withQqqTableId(Integer qqqTableId) public QueryStat withTableId(Integer tableId)
{ {
this.qqqTableId = qqqTableId; this.tableId = tableId;
return (this); return (this);
} }

22
qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/querystats/QueryStatCriteriaField.java
View File

@ -42,8 +42,8 @@ public class QueryStatCriteriaField extends QRecordEntity
@QField(possibleValueSourceName = QueryStat.TABLE_NAME) @QField(possibleValueSourceName = QueryStat.TABLE_NAME)
private Integer queryStatId; private Integer queryStatId;
@QField(label = "Table", possibleValueSourceName = QQQTable.TABLE_NAME) @QField(possibleValueSourceName = QQQTable.TABLE_NAME)
private Integer qqqTableId; private Integer tableId;
@QField(maxLength = 50, valueTooLongBehavior = ValueTooLongBehavior.TRUNCATE_ELLIPSIS) @QField(maxLength = 50, valueTooLongBehavior = ValueTooLongBehavior.TRUNCATE_ELLIPSIS)
private String name; private String name;
@ -138,31 +138,31 @@ public class QueryStatCriteriaField extends QRecordEntity
/******************************************************************************* /*******************************************************************************
** Getter for qqqTableId ** Getter for tableId
*******************************************************************************/ *******************************************************************************/
public Integer getQqqTableId() public Integer getTableId()
{ {
return (this.qqqTableId); return (this.tableId);
} }
/******************************************************************************* /*******************************************************************************
** Setter for qqqTableId ** Setter for tableId
*******************************************************************************/ *******************************************************************************/
public void setQqqTableId(Integer qqqTableId) public void setTableId(Integer tableId)
{ {
this.qqqTableId = qqqTableId; this.tableId = tableId;
} }
/******************************************************************************* /*******************************************************************************
** Fluent setter for qqqTableId ** Fluent setter for tableId
*******************************************************************************/ *******************************************************************************/
public QueryStatCriteriaField withQqqTableId(Integer qqqTableId) public QueryStatCriteriaField withTableId(Integer tableId)
{ {
this.qqqTableId = qqqTableId; this.tableId = tableId;
return (this); return (this);
} }

22
qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/querystats/QueryStatJoinTable.java
View File

@ -42,8 +42,8 @@ public class QueryStatJoinTable extends QRecordEntity
@QField(possibleValueSourceName = QueryStat.TABLE_NAME) @QField(possibleValueSourceName = QueryStat.TABLE_NAME)
private Integer queryStatId; private Integer queryStatId;
@QField(label = "Table", possibleValueSourceName = QQQTable.TABLE_NAME) @QField(possibleValueSourceName = QQQTable.TABLE_NAME)
private Integer qqqTableId; private Integer tableId;
@QField(maxLength = 10, valueTooLongBehavior = ValueTooLongBehavior.TRUNCATE_ELLIPSIS) @QField(maxLength = 10, valueTooLongBehavior = ValueTooLongBehavior.TRUNCATE_ELLIPSIS)
private String type; private String type;
@ -132,31 +132,31 @@ public class QueryStatJoinTable extends QRecordEntity
/******************************************************************************* /*******************************************************************************
** Getter for qqqTableId ** Getter for tableId
*******************************************************************************/ *******************************************************************************/
public Integer getQqqTableId() public Integer getTableId()
{ {
return (this.qqqTableId); return (this.tableId);
} }
/******************************************************************************* /*******************************************************************************
** Setter for qqqTableId ** Setter for tableId
*******************************************************************************/ *******************************************************************************/
public void setQqqTableId(Integer qqqTableId) public void setTableId(Integer tableId)
{ {
this.qqqTableId = qqqTableId; this.tableId = tableId;
} }
/******************************************************************************* /*******************************************************************************
** Fluent setter for qqqTableId ** Fluent setter for tableId
*******************************************************************************/ *******************************************************************************/
public QueryStatJoinTable withQqqTableId(Integer qqqTableId) public QueryStatJoinTable withTableId(Integer tableId)
{ {
this.qqqTableId = qqqTableId; this.tableId = tableId;
return (this); return (this);
} }

2
qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/querystats/QueryStatMetaDataProvider.java
View File

@ -121,7 +121,7 @@ public class QueryStatMetaDataProvider
.withRecordLabelFields("id") .withRecordLabelFields("id")
.withPrimaryKeyField("id") .withPrimaryKeyField("id")
.withFieldsFromEntity(QueryStat.class) .withFieldsFromEntity(QueryStat.class)
.withSection(new QFieldSection("identity", new QIcon().withName("badge"), Tier.T1, List.of("id", "action", "qqqTableId", "sessionId"))) .withSection(new QFieldSection("identity", new QIcon().withName("badge"), Tier.T1, List.of("id", "action", "tableId", "sessionId")))
.withSection(new QFieldSection("data", new QIcon().withName("dataset"), Tier.T2, List.of("queryText", "startTimestamp", "firstResultTimestamp", "firstResultMillis"))) .withSection(new QFieldSection("data", new QIcon().withName("dataset"), Tier.T2, List.of("queryText", "startTimestamp", "firstResultTimestamp", "firstResultMillis")))
.withSection(new QFieldSection("joins", new QIcon().withName("merge"), Tier.T2).withWidgetName(joinTablesJoinName + "Widget")) .withSection(new QFieldSection("joins", new QIcon().withName("merge"), Tier.T2).withWidgetName(joinTablesJoinName + "Widget"))
.withSection(new QFieldSection("criteria", new QIcon().withName("filter_alt"), Tier.T2).withWidgetName(criteriaFieldsJoinName + "Widget")) .withSection(new QFieldSection("criteria", new QIcon().withName("filter_alt"), Tier.T2).withWidgetName(criteriaFieldsJoinName + "Widget"))

22
qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/querystats/QueryStatOrderByField.java
View File

@ -42,8 +42,8 @@ public class QueryStatOrderByField extends QRecordEntity
@QField(possibleValueSourceName = QueryStat.TABLE_NAME) @QField(possibleValueSourceName = QueryStat.TABLE_NAME)
private Integer queryStatId; private Integer queryStatId;
@QField(label = "Table", possibleValueSourceName = QQQTable.TABLE_NAME) @QField(possibleValueSourceName = QQQTable.TABLE_NAME)
private Integer qqqTableId; private Integer tableId;
@QField(maxLength = 50, valueTooLongBehavior = ValueTooLongBehavior.TRUNCATE_ELLIPSIS) @QField(maxLength = 50, valueTooLongBehavior = ValueTooLongBehavior.TRUNCATE_ELLIPSIS)
private String name; private String name;
@ -132,31 +132,31 @@ public class QueryStatOrderByField extends QRecordEntity
/******************************************************************************* /*******************************************************************************
** Getter for qqqTableId ** Getter for tableId
*******************************************************************************/ *******************************************************************************/
public Integer getQqqTableId() public Integer getTableId()
{ {
return (this.qqqTableId); return (this.tableId);
} }
/******************************************************************************* /*******************************************************************************
** Setter for qqqTableId ** Setter for tableId
*******************************************************************************/ *******************************************************************************/
public void setQqqTableId(Integer qqqTableId) public void setTableId(Integer tableId)
{ {
this.qqqTableId = qqqTableId; this.tableId = tableId;
} }
/******************************************************************************* /*******************************************************************************
** Fluent setter for qqqTableId ** Fluent setter for tableId
*******************************************************************************/ *******************************************************************************/
public QueryStatOrderByField withQqqTableId(Integer qqqTableId) public QueryStatOrderByField withTableId(Integer tableId)
{ {
this.qqqTableId = qqqTableId; this.tableId = tableId;
return (this); return (this);
} }

20
qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/savedfilters/SavedFilter.java
View File

@ -50,7 +50,7 @@ public class SavedFilter extends QRecordEntity
private String label; private String label;
@QField(possibleValueSourceName = QQQTable.TABLE_NAME) @QField(possibleValueSourceName = QQQTable.TABLE_NAME)
private Integer qqqTableId; private Integer tableId;
@QField(isEditable = false) @QField(isEditable = false)
private String userId; private String userId;
@ -250,31 +250,31 @@ public class SavedFilter extends QRecordEntity
/******************************************************************************* /*******************************************************************************
** Getter for qqqTableId ** Getter for tableId
*******************************************************************************/ *******************************************************************************/
public Integer getQqqTableId() public Integer getTableId()
{ {
return (this.qqqTableId); return (this.tableId);
} }
/******************************************************************************* /*******************************************************************************
** Setter for qqqTableId ** Setter for tableId
*******************************************************************************/ *******************************************************************************/
public void setQqqTableId(Integer qqqTableId) public void setTableId(Integer tableId)
{ {
this.qqqTableId = qqqTableId; this.tableId = tableId;
} }
/******************************************************************************* /*******************************************************************************
** Fluent setter for qqqTableId ** Fluent setter for tableId
*******************************************************************************/ *******************************************************************************/
public SavedFilter withQqqTableId(Integer qqqTableId) public SavedFilter withTableId(Integer tableId)
{ {
this.qqqTableId = qqqTableId; this.tableId = tableId;
return (this); return (this);
} }

20
qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/scripts/Script.java
View File

@ -53,7 +53,7 @@ public class Script extends QRecordEntity
private Integer scriptTypeId; private Integer scriptTypeId;
@QField(possibleValueSourceName = QQQTable.TABLE_NAME) @QField(possibleValueSourceName = QQQTable.TABLE_NAME)
private Integer qqqTableId; private Integer tableId;
@QField() @QField()
private Integer maxBatchSize; private Integer maxBatchSize;
@ -320,31 +320,31 @@ public class Script extends QRecordEntity
/******************************************************************************* /*******************************************************************************
** Getter for qqqTableId ** Getter for tableId
*******************************************************************************/ *******************************************************************************/
public Integer getQqqTableId() public Integer getTableId()
{ {
return (this.qqqTableId); return (this.tableId);
} }
/******************************************************************************* /*******************************************************************************
** Setter for qqqTableId ** Setter for tableId
*******************************************************************************/ *******************************************************************************/
public void setQqqTableId(Integer qqqTableId) public void setTableId(Integer tableId)
{ {
this.qqqTableId = qqqTableId; this.tableId = tableId;
} }
/******************************************************************************* /*******************************************************************************
** Fluent setter for qqqTableId ** Fluent setter for tableId
*******************************************************************************/ *******************************************************************************/
public Script withQqqTableId(Integer qqqTableId) public Script withTableId(Integer tableId)
{ {
this.qqqTableId = qqqTableId; this.tableId = tableId;
return (this); return (this);
} }

10
qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/scripts/ScriptsMetaDataProvider.java
View File

@ -188,7 +188,7 @@ public class ScriptsMetaDataProvider
.withFormField(new QFieldMetaData("scriptId", QFieldType.INTEGER).withPossibleValueSourceName(Script.TABLE_NAME) .withFormField(new QFieldMetaData("scriptId", QFieldType.INTEGER).withPossibleValueSourceName(Script.TABLE_NAME)
.withPossibleValueSourceFilter(new QQueryFilter( .withPossibleValueSourceFilter(new QQueryFilter(
new QFilterCriteria("scriptType.name", QCriteriaOperator.EQUALS, SCRIPT_TYPE_NAME_RECORD), new QFilterCriteria("scriptType.name", QCriteriaOperator.EQUALS, SCRIPT_TYPE_NAME_RECORD),
new QFilterCriteria("qqqTableId", QCriteriaOperator.EQUALS, "${input.qqqTableId}") new QFilterCriteria("tableId", QCriteriaOperator.EQUALS, "${input.tableId}")
)))); ))));
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
@ -398,16 +398,16 @@ public class ScriptsMetaDataProvider
QTableMetaData tableMetaData = defineStandardTable(backendName, TableTrigger.TABLE_NAME, TableTrigger.class) QTableMetaData tableMetaData = defineStandardTable(backendName, TableTrigger.TABLE_NAME, TableTrigger.class)
.withRecordLabelFields("id") .withRecordLabelFields("id")
.withSection(new QFieldSection("identity", new QIcon().withName("badge"), Tier.T1, List.of("id"))) .withSection(new QFieldSection("identity", new QIcon().withName("badge"), Tier.T1, List.of("id")))
.withSection(new QFieldSection("contents", new QIcon().withName("data_object"), Tier.T2, List.of("qqqTableId", "filterId", "scriptId", "priority", "postInsert", "postUpdate"))) .withSection(new QFieldSection("contents", new QIcon().withName("data_object"), Tier.T2, List.of("tableId", "filterId", "scriptId", "priority", "postInsert", "postUpdate")))
.withSection(new QFieldSection("dates", new QIcon().withName("calendar_month"), Tier.T3, List.of("createDate", "modifyDate"))); .withSection(new QFieldSection("dates", new QIcon().withName("calendar_month"), Tier.T3, List.of("createDate", "modifyDate")));
tableMetaData.getField("scriptId").withPossibleValueSourceFilter(new QQueryFilter( tableMetaData.getField("scriptId").withPossibleValueSourceFilter(new QQueryFilter(
new QFilterCriteria("scriptType.name", QCriteriaOperator.EQUALS, SCRIPT_TYPE_NAME_RECORD), new QFilterCriteria("scriptType.name", QCriteriaOperator.EQUALS, SCRIPT_TYPE_NAME_RECORD),
new QFilterCriteria("script.qqqTableId", QCriteriaOperator.EQUALS, "${input.qqqTableId}") new QFilterCriteria("script.tableId", QCriteriaOperator.EQUALS, "${input.tableId}")
)); ));
tableMetaData.getField("filterId").withPossibleValueSourceFilter(new QQueryFilter( tableMetaData.getField("filterId").withPossibleValueSourceFilter(new QQueryFilter(
new QFilterCriteria("qqqTableId", QCriteriaOperator.EQUALS, "${input.qqqTableId}") new QFilterCriteria("tableId", QCriteriaOperator.EQUALS, "${input.tableId}")
)); ));
return tableMetaData; return tableMetaData;
@ -422,7 +422,7 @@ public class ScriptsMetaDataProvider
{ {
QTableMetaData tableMetaData = defineStandardTable(backendName, Script.TABLE_NAME, Script.class) QTableMetaData tableMetaData = defineStandardTable(backendName, Script.TABLE_NAME, Script.class)
.withSection(new QFieldSection("identity", new QIcon().withName("badge"), Tier.T1, List.of("id", "name", "scriptTypeId", "currentScriptRevisionId"))) .withSection(new QFieldSection("identity", new QIcon().withName("badge"), Tier.T1, List.of("id", "name", "scriptTypeId", "currentScriptRevisionId")))
.withSection(new QFieldSection("recordScriptSettings", new QIcon().withName("table_rows"), Tier.T2, List.of("qqqTableId", "maxBatchSize"))) .withSection(new QFieldSection("recordScriptSettings", new QIcon().withName("table_rows"), Tier.T2, List.of("tableId", "maxBatchSize")))
.withSection(new QFieldSection("contents", new QIcon().withName("data_object"), Tier.T2).withWidgetName("scriptViewer")) .withSection(new QFieldSection("contents", new QIcon().withName("data_object"), Tier.T2).withWidgetName("scriptViewer"))
.withSection(new QFieldSection("dates", new QIcon().withName("calendar_month"), Tier.T3, List.of("createDate", "modifyDate"))) .withSection(new QFieldSection("dates", new QIcon().withName("calendar_month"), Tier.T3, List.of("createDate", "modifyDate")))
.withSection(new QFieldSection("lines", new QIcon().withName("horizontal_rule"), Tier.T2).withWidgetName(QJoinMetaData.makeInferredJoinName(Script.TABLE_NAME, ScriptLog.TABLE_NAME))); .withSection(new QFieldSection("lines", new QIcon().withName("horizontal_rule"), Tier.T2).withWidgetName(QJoinMetaData.makeInferredJoinName(Script.TABLE_NAME, ScriptLog.TABLE_NAME)));

4
qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/tables/QQQTableAccessor.java
View File

@ -119,7 +119,7 @@ public class QQQTableAccessor
/******************************************************************************* /*******************************************************************************
** **
*******************************************************************************/ *******************************************************************************/
public static Integer getQQQTableId(String tableName) throws QException public static Integer getTableId(String tableName) throws QException
{ {
return (getQQQTableRecord(tableName).getValueInteger("id")); return (getQQQTableRecord(tableName).getValueInteger("id"));
} }
@ -129,7 +129,7 @@ public class QQQTableAccessor
/******************************************************************************* /*******************************************************************************
** **
*******************************************************************************/ *******************************************************************************/
public static String getQQQTableName(Integer id) throws QException public static String getTableName(Integer id) throws QException
{ {
return (getQQQTableRecord(id).getValueString("name")); return (getQQQTableRecord(id).getValueString("name"));
} }

2
qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/savedfilters/QuerySavedFilterProcess.java
View File

@ -101,7 +101,7 @@ public class QuerySavedFilterProcess implements BackendStep
QueryInput input = new QueryInput(); QueryInput input = new QueryInput();
input.setTableName(SavedFilter.TABLE_NAME); input.setTableName(SavedFilter.TABLE_NAME);
input.setFilter(new QQueryFilter() input.setFilter(new QQueryFilter()
.withCriteria(new QFilterCriteria("qqqTableId", QCriteriaOperator.EQUALS, QQQTableAccessor.getQQQTableId(tableName))) .withCriteria(new QFilterCriteria("tableId", QCriteriaOperator.EQUALS, QQQTableAccessor.getTableId(tableName)))
.withOrderBy(new QFilterOrderBy("label"))); .withOrderBy(new QFilterOrderBy("label")));
QueryOutput output = new QueryAction().execute(input); QueryOutput output = new QueryAction().execute(input);

2
qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/savedfilters/StoreSavedFilterProcess.java
View File

@ -83,7 +83,7 @@ public class StoreSavedFilterProcess implements BackendStep
QRecord qRecord = new QRecord() QRecord qRecord = new QRecord()
.withValue("id", runBackendStepInput.getValueInteger("id")) .withValue("id", runBackendStepInput.getValueInteger("id"))
.withValue("label", runBackendStepInput.getValueString("label")) .withValue("label", runBackendStepInput.getValueString("label"))
.withValue("qqqTableId", QQQTableAccessor.getQQQTableId(runBackendStepInput.getValueString("tableName"))) .withValue("tableId", QQQTableAccessor.getTableId(runBackendStepInput.getValueString("tableName")))
.withValue("filterJson", runBackendStepInput.getValueString("filterJson")) .withValue("filterJson", runBackendStepInput.getValueString("filterJson"))
.withValue("userId", runBackendStepInput.getSession().getUser().getIdReference()); .withValue("userId", runBackendStepInput.getSession().getUser().getIdReference());

2
qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/scripts/RunRecordScriptExtractStep.java
View File

@ -62,7 +62,7 @@ public class RunRecordScriptExtractStep extends ExtractViaQueryStep
///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////
// set this value, for the select-script possible-value filter // // set this value, for the select-script possible-value filter //
///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////
runBackendStepInput.addValue("qqqTableId", QQQTableAccessor.getQQQTableId(tableName)); runBackendStepInput.addValue("tableId", QQQTableAccessor.getTableId(tableName));
Integer scriptId = runBackendStepInput.getValueInteger("scriptId"); Integer scriptId = runBackendStepInput.getValueInteger("scriptId");
GetInput getInput = new GetInput(); GetInput getInput = new GetInput();

2
qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/scripts/RunRecordScriptPreStep.java
View File

@ -58,7 +58,7 @@ public class RunRecordScriptPreStep implements BackendStep
///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////
// set this value, for the select-script possible-value filter // // set this value, for the select-script possible-value filter //
///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////
runBackendStepInput.addValue("qqqTableId", QQQTableAccessor.getQQQTableId(tableName)); runBackendStepInput.addValue("tableId", QQQTableAccessor.getTableId(tableName));
} }
} }

2
qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/processes/implementations/scripts/TestScriptProcessStepTest.java
View File

@ -75,7 +75,7 @@ class TestScriptProcessStepTest extends BaseTest
insertInput.setRecords(List.of(new Script() insertInput.setRecords(List.of(new Script()
.withName("TestScript") .withName("TestScript")
.withScriptTypeId(insertOutput.getRecords().get(0).getValueInteger("id")) .withScriptTypeId(insertOutput.getRecords().get(0).getValueInteger("id"))
.withQqqTableId(QQQTableAccessor.getQQQTableId(TestUtils.TABLE_NAME_SHAPE)) .withTableId(QQQTableAccessor.getTableId(TestUtils.TABLE_NAME_SHAPE))
.toQRecord())); .toQRecord()));
insertOutput = new InsertAction().execute(insertInput); insertOutput = new InsertAction().execute(insertInput);