diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/automation/RecordAutomationStatusUpdater.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/automation/RecordAutomationStatusUpdater.java index c838eb9e..03a29b07 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/automation/RecordAutomationStatusUpdater.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/automation/RecordAutomationStatusUpdater.java @@ -172,7 +172,7 @@ public class RecordAutomationStatusUpdater CountInput countInput = new CountInput(); countInput.setTableName(TableTrigger.TABLE_NAME); 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) )); CountOutput countOutput = new CountAction().execute(countInput); diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/automation/polling/PollingAutomationPerTableRunner.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/automation/polling/PollingAutomationPerTableRunner.java index 372409a3..ae102131 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/automation/polling/PollingAutomationPerTableRunner.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/automation/polling/PollingAutomationPerTableRunner.java @@ -271,7 +271,7 @@ public class PollingAutomationPerTableRunner implements Runnable QueryInput queryInput = new QueryInput(); queryInput.setTableName(TableTrigger.TABLE_NAME); 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) )); QueryOutput queryOutput = new QueryAction().execute(queryInput); diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/scripts/RecordScriptTestInterface.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/scripts/RecordScriptTestInterface.java index 187560cd..abfd99f3 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/scripts/RecordScriptTestInterface.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/scripts/RecordScriptTestInterface.java @@ -84,7 +84,7 @@ public class RecordScriptTestInterface implements TestScriptActionInterface ////////////////////////////////////////////// // 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); if(table == null) { diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/tables/helpers/QueryStatManager.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/tables/helpers/QueryStatManager.java index 6ec3dc73..cf77c29a 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/tables/helpers/QueryStatManager.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/tables/helpers/QueryStatManager.java @@ -357,8 +357,8 @@ public class QueryStatManager ////////////////////// // set the table id // ////////////////////// - Integer qqqTableId = QQQTableAccessor.getQQQTableId(queryStat.getTableName()); - queryStat.setQqqTableId(qqqTableId); + Integer tableId = QQQTableAccessor.getTableId(queryStat.getTableName()); + queryStat.setTableId(tableId); ////////////////////////////// // build join-table records // @@ -368,7 +368,7 @@ public class QueryStatManager List queryStatJoinTableList = new ArrayList<>(); for(String joinTableName : queryStat.getJoinTableNames()) { - queryStatJoinTableList.add(new QueryStatJoinTable().withQqqTableId(QQQTableAccessor.getQQQTableId(joinTableName))); + queryStatJoinTableList.add(new QueryStatJoinTable().withTableId(QQQTableAccessor.getTableId(joinTableName))); } queryStat.setQueryStatJoinTableList(queryStatJoinTableList); } @@ -379,14 +379,14 @@ public class QueryStatManager if(queryStat.getQueryFilter() != null && queryStat.getQueryFilter().hasAnyCriteria()) { List queryStatCriteriaFieldList = new ArrayList<>(); - processCriteriaFromFilter(qqqTableId, queryStatCriteriaFieldList, queryStat.getQueryFilter()); + processCriteriaFromFilter(tableId, queryStatCriteriaFieldList, queryStat.getQueryFilter()); queryStat.setQueryStatCriteriaFieldList(queryStatCriteriaFieldList); } if(CollectionUtils.nullSafeHasContents(queryStat.getQueryFilter().getOrderBys())) { List queryStatOrderByFieldList = new ArrayList<>(); - processOrderByFromFilter(qqqTableId, queryStatOrderByFieldList, queryStat.getQueryFilter()); + processOrderByFromFilter(tableId, queryStatOrderByFieldList, queryStat.getQueryFilter()); queryStat.setQueryStatOrderByFieldList(queryStatOrderByFieldList); } @@ -428,7 +428,7 @@ public class QueryStatManager /******************************************************************************* ** *******************************************************************************/ - private static void processCriteriaFromFilter(Integer qqqTableId, List queryStatCriteriaFieldList, QQueryFilter queryFilter) throws QException + private static void processCriteriaFromFilter(Integer tableId, List queryStatCriteriaFieldList, QQueryFilter queryFilter) throws QException { for(QFilterCriteria criteria : CollectionUtils.nonNullList(queryFilter.getCriteria())) { @@ -446,13 +446,13 @@ public class QueryStatManager String[] parts = fieldName.split("\\."); if(parts.length > 1) { - queryStatCriteriaField.setQqqTableId(QQQTableAccessor.getQQQTableId(parts[0])); + queryStatCriteriaField.setTableId(QQQTableAccessor.getTableId(parts[0])); queryStatCriteriaField.setName(parts[1]); } } else { - queryStatCriteriaField.setQqqTableId(qqqTableId); + queryStatCriteriaField.setTableId(tableId); queryStatCriteriaField.setName(fieldName); } @@ -461,7 +461,7 @@ public class QueryStatManager 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 queryStatOrderByFieldList, QQueryFilter queryFilter) throws QException + private static void processOrderByFromFilter(Integer tableId, List queryStatOrderByFieldList, QQueryFilter queryFilter) throws QException { for(QFilterOrderBy orderBy : CollectionUtils.nonNullList(queryFilter.getOrderBys())) { @@ -484,13 +484,13 @@ public class QueryStatManager String[] parts = fieldName.split("\\."); if(parts.length > 1) { - queryStatOrderByField.setQqqTableId(QQQTableAccessor.getQQQTableId(parts[0])); + queryStatOrderByField.setTableId(QQQTableAccessor.getTableId(parts[0])); queryStatOrderByField.setName(parts[1]); } } else { - queryStatOrderByField.setQqqTableId(qqqTableId); + queryStatOrderByField.setTableId(tableId); queryStatOrderByField.setName(fieldName); } diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/automation/TableTrigger.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/automation/TableTrigger.java index 496c1a49..8cff75e9 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/automation/TableTrigger.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/automation/TableTrigger.java @@ -49,7 +49,7 @@ public class TableTrigger extends QRecordEntity private Instant modifyDate; @QField(possibleValueSourceName = QQQTable.TABLE_NAME) - private Integer qqqTableId; + private Integer tableId; @QField(possibleValueSourceName = SavedFilter.TABLE_NAME) 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); } diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/querystats/QueryStat.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/querystats/QueryStat.java index a0e5f513..fd60ef8b 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/querystats/QueryStat.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/querystats/QueryStat.java @@ -53,8 +53,8 @@ public class QueryStat extends QRecordEntity @QField() private Integer firstResultMillis; - @QField(label = "Table", possibleValueSourceName = QQQTable.TABLE_NAME) - private Integer qqqTableId; + @QField(possibleValueSourceName = QQQTable.TABLE_NAME) + private Integer tableId; @QField(maxLength = 100, valueTooLongBehavior = ValueTooLongBehavior.TRUNCATE_ELLIPSIS) 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); } diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/querystats/QueryStatCriteriaField.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/querystats/QueryStatCriteriaField.java index bd25a51f..b7d776af 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/querystats/QueryStatCriteriaField.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/querystats/QueryStatCriteriaField.java @@ -42,8 +42,8 @@ public class QueryStatCriteriaField extends QRecordEntity @QField(possibleValueSourceName = QueryStat.TABLE_NAME) private Integer queryStatId; - @QField(label = "Table", possibleValueSourceName = QQQTable.TABLE_NAME) - private Integer qqqTableId; + @QField(possibleValueSourceName = QQQTable.TABLE_NAME) + private Integer tableId; @QField(maxLength = 50, valueTooLongBehavior = ValueTooLongBehavior.TRUNCATE_ELLIPSIS) 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); } diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/querystats/QueryStatJoinTable.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/querystats/QueryStatJoinTable.java index 47686a17..ee357408 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/querystats/QueryStatJoinTable.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/querystats/QueryStatJoinTable.java @@ -42,8 +42,8 @@ public class QueryStatJoinTable extends QRecordEntity @QField(possibleValueSourceName = QueryStat.TABLE_NAME) private Integer queryStatId; - @QField(label = "Table", possibleValueSourceName = QQQTable.TABLE_NAME) - private Integer qqqTableId; + @QField(possibleValueSourceName = QQQTable.TABLE_NAME) + private Integer tableId; @QField(maxLength = 10, valueTooLongBehavior = ValueTooLongBehavior.TRUNCATE_ELLIPSIS) 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); } diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/querystats/QueryStatMetaDataProvider.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/querystats/QueryStatMetaDataProvider.java index f22f5795..095577f9 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/querystats/QueryStatMetaDataProvider.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/querystats/QueryStatMetaDataProvider.java @@ -121,7 +121,7 @@ public class QueryStatMetaDataProvider .withRecordLabelFields("id") .withPrimaryKeyField("id") .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("joins", new QIcon().withName("merge"), Tier.T2).withWidgetName(joinTablesJoinName + "Widget")) .withSection(new QFieldSection("criteria", new QIcon().withName("filter_alt"), Tier.T2).withWidgetName(criteriaFieldsJoinName + "Widget")) diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/querystats/QueryStatOrderByField.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/querystats/QueryStatOrderByField.java index 353221c1..1945daea 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/querystats/QueryStatOrderByField.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/querystats/QueryStatOrderByField.java @@ -42,8 +42,8 @@ public class QueryStatOrderByField extends QRecordEntity @QField(possibleValueSourceName = QueryStat.TABLE_NAME) private Integer queryStatId; - @QField(label = "Table", possibleValueSourceName = QQQTable.TABLE_NAME) - private Integer qqqTableId; + @QField(possibleValueSourceName = QQQTable.TABLE_NAME) + private Integer tableId; @QField(maxLength = 50, valueTooLongBehavior = ValueTooLongBehavior.TRUNCATE_ELLIPSIS) 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); } diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/savedfilters/SavedFilter.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/savedfilters/SavedFilter.java index 94f5e761..6852d1d7 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/savedfilters/SavedFilter.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/savedfilters/SavedFilter.java @@ -50,7 +50,7 @@ public class SavedFilter extends QRecordEntity private String label; @QField(possibleValueSourceName = QQQTable.TABLE_NAME) - private Integer qqqTableId; + private Integer tableId; @QField(isEditable = false) 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); } diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/scripts/Script.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/scripts/Script.java index 10ee712f..09df21f7 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/scripts/Script.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/scripts/Script.java @@ -53,7 +53,7 @@ public class Script extends QRecordEntity private Integer scriptTypeId; @QField(possibleValueSourceName = QQQTable.TABLE_NAME) - private Integer qqqTableId; + private Integer tableId; @QField() 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); } diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/scripts/ScriptsMetaDataProvider.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/scripts/ScriptsMetaDataProvider.java index d52dfca3..2fe0a1c3 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/scripts/ScriptsMetaDataProvider.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/scripts/ScriptsMetaDataProvider.java @@ -188,7 +188,7 @@ public class ScriptsMetaDataProvider .withFormField(new QFieldMetaData("scriptId", QFieldType.INTEGER).withPossibleValueSourceName(Script.TABLE_NAME) .withPossibleValueSourceFilter(new QQueryFilter( 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) .withRecordLabelFields("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"))); tableMetaData.getField("scriptId").withPossibleValueSourceFilter(new QQueryFilter( 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( - new QFilterCriteria("qqqTableId", QCriteriaOperator.EQUALS, "${input.qqqTableId}") + new QFilterCriteria("tableId", QCriteriaOperator.EQUALS, "${input.tableId}") )); return tableMetaData; @@ -422,7 +422,7 @@ public class ScriptsMetaDataProvider { 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("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("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))); diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/tables/QQQTableAccessor.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/tables/QQQTableAccessor.java index 048b9132..e726267c 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/tables/QQQTableAccessor.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/tables/QQQTableAccessor.java @@ -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")); } @@ -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")); } diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/savedfilters/QuerySavedFilterProcess.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/savedfilters/QuerySavedFilterProcess.java index c1a3b17f..b91e0fab 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/savedfilters/QuerySavedFilterProcess.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/savedfilters/QuerySavedFilterProcess.java @@ -101,7 +101,7 @@ public class QuerySavedFilterProcess implements BackendStep QueryInput input = new QueryInput(); input.setTableName(SavedFilter.TABLE_NAME); 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"))); QueryOutput output = new QueryAction().execute(input); diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/savedfilters/StoreSavedFilterProcess.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/savedfilters/StoreSavedFilterProcess.java index f3fe56d8..1df34694 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/savedfilters/StoreSavedFilterProcess.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/savedfilters/StoreSavedFilterProcess.java @@ -83,7 +83,7 @@ public class StoreSavedFilterProcess implements BackendStep QRecord qRecord = new QRecord() .withValue("id", runBackendStepInput.getValueInteger("id")) .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("userId", runBackendStepInput.getSession().getUser().getIdReference()); diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/scripts/RunRecordScriptExtractStep.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/scripts/RunRecordScriptExtractStep.java index b531c19c..195fb3e1 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/scripts/RunRecordScriptExtractStep.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/scripts/RunRecordScriptExtractStep.java @@ -62,7 +62,7 @@ public class RunRecordScriptExtractStep extends ExtractViaQueryStep ///////////////////////////////////////////////////////////////// // 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"); GetInput getInput = new GetInput(); diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/scripts/RunRecordScriptPreStep.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/scripts/RunRecordScriptPreStep.java index 16ebee0b..9c0845c2 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/scripts/RunRecordScriptPreStep.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/scripts/RunRecordScriptPreStep.java @@ -58,7 +58,7 @@ public class RunRecordScriptPreStep implements BackendStep ///////////////////////////////////////////////////////////////// // set this value, for the select-script possible-value filter // ///////////////////////////////////////////////////////////////// - runBackendStepInput.addValue("qqqTableId", QQQTableAccessor.getQQQTableId(tableName)); + runBackendStepInput.addValue("tableId", QQQTableAccessor.getTableId(tableName)); } } diff --git a/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/processes/implementations/scripts/TestScriptProcessStepTest.java b/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/processes/implementations/scripts/TestScriptProcessStepTest.java index 8d7931c3..81880577 100644 --- a/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/processes/implementations/scripts/TestScriptProcessStepTest.java +++ b/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/processes/implementations/scripts/TestScriptProcessStepTest.java @@ -75,7 +75,7 @@ class TestScriptProcessStepTest extends BaseTest insertInput.setRecords(List.of(new Script() .withName("TestScript") .withScriptTypeId(insertOutput.getRecords().get(0).getValueInteger("id")) - .withQqqTableId(QQQTableAccessor.getQQQTableId(TestUtils.TABLE_NAME_SHAPE)) + .withTableId(QQQTableAccessor.getTableId(TestUtils.TABLE_NAME_SHAPE)) .toQRecord())); insertOutput = new InsertAction().execute(insertInput);