From 1b672afcd0b19beec7fa1f70918cb9bd01efc07a Mon Sep 17 00:00:00 2001 From: Darin Kelkhoff Date: Thu, 15 Dec 2022 16:04:46 -0600 Subject: [PATCH] Fixed rdbms delete test --- .../module/rdbms/actions/RDBMSDeleteActionTest.java | 11 +++++++---- .../prime-test-database-parent-child-tables.sql | 3 ++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/qqq-backend-module-rdbms/src/test/java/com/kingsrook/qqq/backend/module/rdbms/actions/RDBMSDeleteActionTest.java b/qqq-backend-module-rdbms/src/test/java/com/kingsrook/qqq/backend/module/rdbms/actions/RDBMSDeleteActionTest.java index 79b19fb9..8f7ee125 100644 --- a/qqq-backend-module-rdbms/src/test/java/com/kingsrook/qqq/backend/module/rdbms/actions/RDBMSDeleteActionTest.java +++ b/qqq-backend-module-rdbms/src/test/java/com/kingsrook/qqq/backend/module/rdbms/actions/RDBMSDeleteActionTest.java @@ -262,12 +262,15 @@ public class RDBMSDeleteActionTest extends RDBMSActionTest DeleteOutput deleteResult = new RDBMSDeleteAction().execute(deleteInput); - /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - // assert that 7 queries ran - the initial delete (which failed), then 1 to look up the ids from that query, and finally 5 deletes by id // - /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + /////////////////////////////////////////////////////////////////////////////////////////////////////// + // assert that 8 queries ran - the initial delete (which failed), then 1 to look up the ids // + // from that query, another to try to delete all those ids (also fails), and finally 5 deletes by id // + // todo - maybe we shouldn't do that 2nd "try to delete 'em all by id"... why would it ever work, // + // but the original filter query didn't (other than malformed SQL)? // + /////////////////////////////////////////////////////////////////////////////////////////////////////// QueryManager.setCollectStatistics(false); Map queryStats = QueryManager.getStatistics(); - assertEquals(7, queryStats.get(QueryManager.STAT_QUERIES_RAN), "Number of queries ran"); + assertEquals(8, queryStats.get(QueryManager.STAT_QUERIES_RAN), "Number of queries ran"); assertEquals(2, deleteResult.getRecordsWithErrors().size(), "Should get back the 2 records with errors"); assertTrue(deleteResult.getRecordsWithErrors().stream().noneMatch(r -> r.getErrors().isEmpty()), "All we got back should have errors"); diff --git a/qqq-backend-module-rdbms/src/test/resources/prime-test-database-parent-child-tables.sql b/qqq-backend-module-rdbms/src/test/resources/prime-test-database-parent-child-tables.sql index 7acb63a0..294a399f 100644 --- a/qqq-backend-module-rdbms/src/test/resources/prime-test-database-parent-child-tables.sql +++ b/qqq-backend-module-rdbms/src/test/resources/prime-test-database-parent-child-tables.sql @@ -19,7 +19,9 @@ -- along with this program. If not, see . -- +DROP TABLE IF EXISTS parent_table; DROP TABLE IF EXISTS child_table; + CREATE TABLE child_table ( id INT AUTO_INCREMENT primary key, @@ -32,7 +34,6 @@ INSERT INTO child_table (id, name) VALUES (3, 'Johnny'); INSERT INTO child_table (id, name) VALUES (4, 'Gracie'); INSERT INTO child_table (id, name) VALUES (5, 'Suzie'); -DROP TABLE IF EXISTS parent_table; CREATE TABLE parent_table ( id INT AUTO_INCREMENT PRIMARY KEY,