wisplite/distant-horizons-core-sharded
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace repo query with queryDictionary and improve auto update error checking

Browse Source
This commit is contained in:
James Seibel
2023-10-02 21:24:41 -05:00
parent 1ec06fa94e
commit d1df845e79
4 changed files with 103 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/test/java/testItems/sql/TestDataRepo.java
+6 -18
View File
@@ -19,14 +19,10 @@
package testItems.sql;
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.AbstractDhRepo;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.Map;
public class TestDataRepo extends AbstractDhRepo<TestDto>
{
@@ -38,12 +34,12 @@ public class TestDataRepo extends AbstractDhRepo<TestDto>
// note: this should only ever be done with the test repo.
// All long term tables should be created using a sql Script.
String createTableSql =
"CREATE TABLE "+this.getTableName()+"(\n" +
"CREATE TABLE IF NOT EXISTS "+this.getTableName()+"(\n" +
"Id INT NOT NULL PRIMARY KEY\n" +
"\n" +
",Value TEXT NULL\n" +
");";
this.queryNoResult(createTableSql);
this.queryDictionaryFirst(createTableSql);
}
@@ -55,18 +51,10 @@ public class TestDataRepo extends AbstractDhRepo<TestDto>
@Override
public TestDto convertResultSetToDto(ResultSet resultSet) throws SQLException
public TestDto convertDictionaryToDto(Map<String, Object> objectMap) throws ClassCastException
{
if (!resultSet.next())
{
return null;
}
String idString = resultSet.getString("Id");
int id = Integer.parseInt(idString);
String value = resultSet.getString("Value");
int id = (int) objectMap.get("Id");
String value = (String) objectMap.get("Value");
return new TestDto(id, value);
}
core/src/test/java/tests/DhRepoSqliteTest.java
+8 -3
View File
@@ -26,8 +26,8 @@ import testItems.sql.TestDataRepo;
import testItems.sql.TestDto;
import java.io.File;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.Map;
/**
* Validates {@link com.seibel.distanthorizons.core.sql.AbstractDhRepo} is set up correctly.
@@ -64,12 +64,17 @@ public class DhRepoSqliteTest
// Auto update script tests //
//==========================//
ResultSet autoUpdateTablePresentResult = testDataRepo.query("SELECT name FROM sqlite_master WHERE type='table' AND name='"+DatabaseUpdater.SCHEMA_TABLE_NAME+"';");
if (!autoUpdateTablePresentResult.next() || autoUpdateTablePresentResult.getString(1) == null)
// check that the schema table is created
Map<String, Object> autoUpdateTablePresentResult = testDataRepo.queryDictionaryFirst("SELECT name FROM sqlite_master WHERE type='table' AND name='"+DatabaseUpdater.SCHEMA_TABLE_NAME+"';");
if (autoUpdateTablePresentResult == null || autoUpdateTablePresentResult.get("name") == null)
{
Assert.fail("Auto DB update table missing.");
}
// check that the update scripts aren't run multiple times
TestDataRepo altDataRepoOne = new TestDataRepo(DATABASE_TYPE, dbFileName);
TestDataRepo altDataRepoTwo = new TestDataRepo(DATABASE_TYPE, dbFileName);
//===========//