SRSoftware/Umbrella
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

working on hamonization of db implementations

Browse Source 
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
This commit is contained in:
Stephan Richter
2025-08-01 22:18:44 +02:00
parent 64e925c83f
commit eed0ce0e8e
8 changed files with 97 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
task/src/main/java/de/srsoftware/umbrella/task/SqliteDb.java
View File

@@ -14,6 +14,7 @@ import static java.lang.System.Logger.Level.ERROR;
import static java.text.MessageFormat.format;
import de.srsoftware.tools.jdbc.Query;
import de.srsoftware.umbrella.core.BaseDb;
import de.srsoftware.umbrella.core.exceptions.UmbrellaException;
import de.srsoftware.umbrella.core.model.*;
import java.sql.Connection;
@@ -23,76 +24,52 @@ import java.util.HashMap;
import java.util.Map;
public class SqliteDb implements TaskDb {
public class SqliteDb extends BaseDb implements TaskDb {
private static final System.Logger LOG = System.getLogger("TaskDb");
private final Connection db;
private static final int INITIAL_DB_VERSION = 1;
public SqliteDb(Connection connection) {
db = connection;
init();
super(connection);
}
private int createSettingsTable() {
var createTable = """
CREATE TABLE IF NOT EXISTS {0} ( {1} VARCHAR(255) PRIMARY KEY, {2} VARCHAR(255) NOT NULL);
""";
try {
var stmt = db.prepareStatement(format(createTable,TABLE_SETTINGS, KEY, VALUE));
stmt.execute();
stmt.close();
} catch (SQLException e) {
LOG.log(ERROR,ERROR_FAILED_CREATE_TABLE,TABLE_SETTINGS,e);
throw new RuntimeException(e);
protected int createTables() {
int currentVersion = createSettingsTable();
switch (currentVersion){
case 0:
createTaskTables();
createTasksUsersTable();
}
Integer version = null;
try {
var rs = Query.select(VALUE).from(TABLE_SETTINGS).where(KEY, equal(DB_VERSION)).exec(db);
if (rs.next()) version = rs.getInt(VALUE);
rs.close();
if (version == null) {
version = INITIAL_DB_VERSION;
insertInto(TABLE_SETTINGS, KEY, VALUE).values(DB_VERSION,version).execute(db).close();
}
return version;
} catch (SQLException e) {
LOG.log(ERROR,ERROR_READ_TABLE,DB_VERSION,TABLE_SETTINGS,e);
throw new RuntimeException(e);
}
}
private int createTables() {
createTaskTables();
return createSettingsTable();
return setCurrentVersion(1);
}
private void createTaskTables() {
var createTable = """
CREATE TABLE IF NOT EXISTS "{0}" (
{1} INTEGER PRIMARY KEY,
{2} INTEGER NOT NULL,
{3} INTEGER DEFAULT NULL,
{4} VARCHAR(255) NOT NULL,
{5} TEXT,
{6} INT DEFAULT {7},
{8} DOUBLE DEFAULT NULL,
{9} DATE,
{10} DATE,
{11} BOOLEAN DEFAULT FALSE,
{12} BOOLEAN DEFAULT FALSE
)""";
CREATE TABLE IF NOT EXISTS "{0}" (
{1} INTEGER PRIMARY KEY,
{2} INTEGER NOT NULL,
{3} INTEGER DEFAULT NULL,
{4} VARCHAR(255) NOT NULL,
{5} TEXT,
{6} INT DEFAULT {7},
{8} DOUBLE DEFAULT NULL,
{9} DATE,
{10} DATE,
{11} BOOLEAN DEFAULT FALSE,
{12} BOOLEAN DEFAULT FALSE
)""";
try {
var stmt = db.prepareStatement(format(createTable,TABLE_TASKS, ID, PROJECT_ID, PARENT_TASK_ID, NAME, DESCRIPTION,STATUS, OPEN.code(), EST_TIME, START_DATE,DUE_DATE,SHOW_CLOSED,NO_INDEX));
var stmt = db.prepareStatement(format(createTable, TABLE_TASKS, ID, PROJECT_ID, PARENT_TASK_ID, NAME, DESCRIPTION, STATUS, OPEN.code(), EST_TIME, START_DATE, DUE_DATE, SHOW_CLOSED, NO_INDEX));
stmt.execute();
stmt.close();
} catch (SQLException e) {
LOG.log(ERROR,ERROR_FAILED_CREATE_TABLE,TABLE_PROJECTS ,e);
LOG.log(ERROR, ERROR_FAILED_CREATE_TABLE, TABLE_PROJECTS, e);
throw new RuntimeException(e);
}
}
createTable = """
private void createTasksUsersTable(){
var createTable = """
CREATE TABLE IF NOT EXISTS {0} (
{1} INT NOT NULL,
{2} INT NOT NULL,