From d63cff8c5bab1d0bb56a340a628fdc9c1497e7e6 Mon Sep 17 00:00:00 2001 From: Darin Kelkhoff Date: Mon, 6 Jan 2025 11:15:10 -0600 Subject: [PATCH] Switch tests to use SQLiteTableBackendDetails (and update it to extend RDBMS's version) --- .../model/metadata/SQLiteTableBackendDetails.java | 4 ++-- .../qqq/backend/module/sqlite/TestUtils.java | 14 ++------------ 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/qqq-backend-module-sqlite/src/main/java/com/kingsrook/qqq/backend/module/sqlite/model/metadata/SQLiteTableBackendDetails.java b/qqq-backend-module-sqlite/src/main/java/com/kingsrook/qqq/backend/module/sqlite/model/metadata/SQLiteTableBackendDetails.java index 3150e605..7d1d86c6 100644 --- a/qqq-backend-module-sqlite/src/main/java/com/kingsrook/qqq/backend/module/sqlite/model/metadata/SQLiteTableBackendDetails.java +++ b/qqq-backend-module-sqlite/src/main/java/com/kingsrook/qqq/backend/module/sqlite/model/metadata/SQLiteTableBackendDetails.java @@ -22,13 +22,13 @@ package com.kingsrook.qqq.backend.module.sqlite.model.metadata; -import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableBackendDetails; +import com.kingsrook.qqq.backend.module.rdbms.model.metadata.RDBMSTableBackendDetails; /******************************************************************************* ** *******************************************************************************/ -public class SQLiteTableBackendDetails extends QTableBackendDetails +public class SQLiteTableBackendDetails extends RDBMSTableBackendDetails { private String tableName; diff --git a/qqq-backend-module-sqlite/src/test/java/com/kingsrook/qqq/backend/module/sqlite/TestUtils.java b/qqq-backend-module-sqlite/src/test/java/com/kingsrook/qqq/backend/module/sqlite/TestUtils.java index c22d448d..7fb9feb4 100644 --- a/qqq-backend-module-sqlite/src/test/java/com/kingsrook/qqq/backend/module/sqlite/TestUtils.java +++ b/qqq-backend-module-sqlite/src/test/java/com/kingsrook/qqq/backend/module/sqlite/TestUtils.java @@ -55,6 +55,7 @@ import com.kingsrook.qqq.backend.module.rdbms.jdbc.ConnectionManager; import com.kingsrook.qqq.backend.module.rdbms.jdbc.QueryManager; import com.kingsrook.qqq.backend.module.rdbms.model.metadata.RDBMSTableBackendDetails; import com.kingsrook.qqq.backend.module.sqlite.model.metadata.SQLiteBackendMetaData; +import com.kingsrook.qqq.backend.module.sqlite.model.metadata.SQLiteTableBackendDetails; import org.apache.commons.io.IOUtils; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -91,17 +92,6 @@ public class TestUtils SQLiteBackendMetaData backend = TestUtils.defineBackend(); File file = new File(backend.getPath()); - - /* - if(file.exists()) - { - if(!file.delete()) - { - throw (new Exception("SQLite database at [" + file.getAbsolutePath() + "] exists, and could not be deleted before (re)priming the database.")); - } - } - */ - file.getParentFile().mkdirs(); try(Connection connection = ConnectionManager.getConnection(backend)) @@ -211,7 +201,7 @@ public class TestUtils .withField(new QFieldMetaData("daysWorked", QFieldType.INTEGER).withBackendName("days_worked")) .withField(new QFieldMetaData("homeTown", QFieldType.STRING).withBackendName("home_town")) .withField(new QFieldMetaData("startTime", QFieldType.TIME).withBackendName("start_time")) - .withBackendDetails(new RDBMSTableBackendDetails() + .withBackendDetails(new SQLiteTableBackendDetails() .withTableName("person")); }