From 05349beb8d1e8cb99c745e78bf6acaa957075f64 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Mon, 2 Oct 2023 07:16:42 -0500 Subject: [PATCH] Add Sqlite delete DTO --- .../distanthorizons/core/sql/AbstractDhRepo.java | 5 +++++ core/src/test/java/testItems/sql/TestDataRepo.java | 6 ++++++ core/src/test/java/tests/DhRepoSqliteTest.java | 13 ++++++++----- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/core/src/main/java/com/seibel/distanthorizons/core/sql/AbstractDhRepo.java b/core/src/main/java/com/seibel/distanthorizons/core/sql/AbstractDhRepo.java index 93af0230c..b932b9561 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/sql/AbstractDhRepo.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/sql/AbstractDhRepo.java @@ -102,6 +102,7 @@ public abstract class AbstractDhRepo // high level DB // + public TDTO get(TDTO dto) { return this.getByPrimaryKey(dto.getPrimaryKeyString()); } public TDTO getByPrimaryKey(String primaryKey) { TDTO dto = null; @@ -133,6 +134,8 @@ public abstract class AbstractDhRepo private void insert(TDTO dto) { this.queryNoResult(this.createInsertSql(dto)); } private void update(TDTO dto) { this.queryNoResult(this.createUpdateSql(dto)); } + public void delete(TDTO dto) { this.queryNoResult(this.createDeleteSql(dto)); } + // low level DB // @@ -208,4 +211,6 @@ public abstract class AbstractDhRepo public abstract String createInsertSql(TDTO dto); public abstract String createUpdateSql(TDTO dto); + public abstract String createDeleteSql(TDTO dto); + } diff --git a/core/src/test/java/testItems/sql/TestDataRepo.java b/core/src/test/java/testItems/sql/TestDataRepo.java index b07433966..2b8741358 100644 --- a/core/src/test/java/testItems/sql/TestDataRepo.java +++ b/core/src/test/java/testItems/sql/TestDataRepo.java @@ -94,4 +94,10 @@ public class TestDataRepo extends AbstractDhRepo "WHERE Id = "+id; } + @Override + public String createDeleteSql(TestDto dto) + { + return "DELETE FROM "+this.getTableName()+" WHERE Id = '"+dto.id+"'"; + } + } diff --git a/core/src/test/java/tests/DhRepoSqliteTest.java b/core/src/test/java/tests/DhRepoSqliteTest.java index e781006c0..bf3ee22e1 100644 --- a/core/src/test/java/tests/DhRepoSqliteTest.java +++ b/core/src/test/java/tests/DhRepoSqliteTest.java @@ -19,11 +19,6 @@ package tests; -import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiWorldGenerationStep; -import com.seibel.distanthorizons.core.file.fullDatafile.FullDataMetaFile; -import com.seibel.distanthorizons.core.file.metaData.BaseMetaData; -import com.seibel.distanthorizons.core.pos.DhSectionPos; -import com.seibel.distanthorizons.core.sql.FullMetaDataRepo; import org.junit.Assert; import org.junit.Test; import testItems.sql.TestDataRepo; @@ -83,6 +78,14 @@ public class DhRepoSqliteTest Assert.assertEquals("get/insert failed, not equal", updateMetaFile.id, getDto.id); Assert.assertEquals("get/insert failed, not equal", updateMetaFile.value, getDto.value); + + // delete + testDataRepo.delete(updateMetaFile); + + // get + getDto = testDataRepo.getByPrimaryKey("0"); + Assert.assertNull("delete failed, not null returned", getDto); + } catch (SQLException e) {