diff --git a/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/actions/automation/RecordAutomationStatusUpdaterTest.java b/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/actions/automation/RecordAutomationStatusUpdaterTest.java index 81a1a34f..37148173 100644 --- a/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/actions/automation/RecordAutomationStatusUpdaterTest.java +++ b/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/actions/automation/RecordAutomationStatusUpdaterTest.java @@ -81,12 +81,12 @@ class RecordAutomationStatusUpdaterTest extends BaseTest QTableMetaData tableWithInsertTrigger = new QTableMetaData() .withName("tableWithInsertTrigger"); new InsertAction().execute(new InsertInput(TableTrigger.TABLE_NAME) - .withRecordEntity(new TableTrigger().withTableName(tableWithInsertTrigger.getName()).withPostInsert(true).withPostUpdate(false))); + .withRecordEntity(new TableTrigger().withTableName(tableWithInsertTrigger.getName()).withScriptId(-1).withPostInsert(true).withPostUpdate(false))); QTableMetaData tableWithUpdateTrigger = new QTableMetaData() .withName("tableWithUpdateTrigger"); new InsertAction().execute(new InsertInput(TableTrigger.TABLE_NAME) - .withRecordEntity(new TableTrigger().withTableName(tableWithUpdateTrigger.getName()).withPostInsert(false).withPostUpdate(true))); + .withRecordEntity(new TableTrigger().withTableName(tableWithUpdateTrigger.getName()).withScriptId(-1).withPostInsert(false).withPostUpdate(true))); //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // tests for going to PENDING_INSERT. // diff --git a/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/model/data/QRecordEntityTest.java b/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/model/data/QRecordEntityTest.java index f1111aa9..3d5f0994 100644 --- a/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/model/data/QRecordEntityTest.java +++ b/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/model/data/QRecordEntityTest.java @@ -33,6 +33,7 @@ import com.kingsrook.qqq.backend.core.model.data.testentities.Item; import com.kingsrook.qqq.backend.core.model.data.testentities.ItemWithPrimitives; import com.kingsrook.qqq.backend.core.model.data.testentities.LineItem; import com.kingsrook.qqq.backend.core.model.data.testentities.Order; +import com.kingsrook.qqq.backend.core.model.data.testentities.OrderWithoutTableName; import com.kingsrook.qqq.backend.core.model.metadata.fields.DisplayFormat; import com.kingsrook.qqq.backend.core.model.metadata.fields.QFieldMetaData; import com.kingsrook.qqq.backend.core.model.metadata.fields.QFieldType; @@ -582,7 +583,7 @@ class QRecordEntityTest extends BaseTest ////////////////////////////////// // no TABLE_NAME in Order class // ////////////////////////////////// - assertThatThrownBy(() -> Order.getTableName(Order.class)); + assertThatThrownBy(() -> OrderWithoutTableName.getTableName(OrderWithoutTableName.class)); } } \ No newline at end of file diff --git a/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/model/data/testentities/ItemWithPrimitives.java b/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/model/data/testentities/ItemWithPrimitives.java index a57f9e7d..da6726dc 100644 --- a/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/model/data/testentities/ItemWithPrimitives.java +++ b/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/model/data/testentities/ItemWithPrimitives.java @@ -32,6 +32,8 @@ import com.kingsrook.qqq.backend.core.model.data.QRecordEntity; *******************************************************************************/ public class ItemWithPrimitives extends QRecordEntity { + public static final String TABLE_NAME = "item"; + @QField() private String sku; diff --git a/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/model/data/testentities/LineItem.java b/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/model/data/testentities/LineItem.java index 6522c4f9..fb131953 100644 --- a/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/model/data/testentities/LineItem.java +++ b/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/model/data/testentities/LineItem.java @@ -31,6 +31,8 @@ import com.kingsrook.qqq.backend.core.model.data.QRecordEntity; *******************************************************************************/ public class LineItem extends QRecordEntity { + public static final String TABLE_NAME = "lineItem"; + @QField() private String sku; diff --git a/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/model/data/testentities/Order.java b/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/model/data/testentities/Order.java index 10a30ac0..9516943b 100644 --- a/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/model/data/testentities/Order.java +++ b/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/model/data/testentities/Order.java @@ -33,6 +33,8 @@ import com.kingsrook.qqq.backend.core.model.data.QRecordEntity; *******************************************************************************/ public class Order extends QRecordEntity { + public static final String TABLE_NAME = "order"; + @QField() private String orderNo; diff --git a/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/model/data/testentities/OrderWithoutTableName.java b/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/model/data/testentities/OrderWithoutTableName.java new file mode 100644 index 00000000..cc18002b --- /dev/null +++ b/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/model/data/testentities/OrderWithoutTableName.java @@ -0,0 +1,104 @@ +/* + * QQQ - Low-code Application Framework for Engineers. + * Copyright (C) 2021-2022. Kingsrook, LLC + * 651 N Broad St Ste 205 # 6917 | Middletown DE 19709 | United States + * contact@kingsrook.com + * https://github.com/Kingsrook/ + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +package com.kingsrook.qqq.backend.core.model.data.testentities; + + +import java.util.List; +import com.kingsrook.qqq.backend.core.model.data.QAssociation; +import com.kingsrook.qqq.backend.core.model.data.QField; +import com.kingsrook.qqq.backend.core.model.data.QRecordEntity; + + +/******************************************************************************* + ** Sample of an entity that is missing a TABLE_NAME field + *******************************************************************************/ +public class OrderWithoutTableName extends QRecordEntity +{ + @QField() + private String orderNo; + + @QAssociation(name = "lineItems") + private List lineItems; + + + + /******************************************************************************* + ** Getter for orderNo + *******************************************************************************/ + public String getOrderNo() + { + return (this.orderNo); + } + + + + /******************************************************************************* + ** Setter for orderNo + *******************************************************************************/ + public void setOrderNo(String orderNo) + { + this.orderNo = orderNo; + } + + + + /******************************************************************************* + ** Fluent setter for orderNo + *******************************************************************************/ + public OrderWithoutTableName withOrderNo(String orderNo) + { + this.orderNo = orderNo; + return (this); + } + + + + /******************************************************************************* + ** Getter for lineItems + *******************************************************************************/ + public List getLineItems() + { + return (this.lineItems); + } + + + + /******************************************************************************* + ** Setter for lineItems + *******************************************************************************/ + public void setLineItems(List lineItems) + { + this.lineItems = lineItems; + } + + + + /******************************************************************************* + ** Fluent setter for lineItems + *******************************************************************************/ + public OrderWithoutTableName withLineItems(List lineItems) + { + this.lineItems = lineItems; + return (this); + } + +} \ No newline at end of file diff --git a/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/model/data/testentities/Shape.java b/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/model/data/testentities/Shape.java index b9427ce4..086cfbe1 100644 --- a/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/model/data/testentities/Shape.java +++ b/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/model/data/testentities/Shape.java @@ -33,6 +33,8 @@ import com.kingsrook.qqq.backend.core.model.data.QRecordEntity; *******************************************************************************/ public class Shape extends QRecordEntity { + public static final String TABLE_NAME = "shape"; + @QField() private Integer id;