From fbdfa1676a5e61864c4a365dfbe7dec3f61998be Mon Sep 17 00:00:00 2001 From: Rsl1122 Date: Wed, 23 Jan 2019 17:53:57 +0200 Subject: [PATCH] SettingsTable#createTableSQL, Deprecated SettingsTable.Col --- .../plan/db/sql/tables/SettingsTable.java | 35 ++++++++++++------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/SettingsTable.java b/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/SettingsTable.java index 45f8580ed..2116b3f15 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/SettingsTable.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/SettingsTable.java @@ -17,12 +17,13 @@ package com.djrapitops.plan.db.sql.tables; import com.djrapitops.plan.api.exceptions.database.DBInitException; +import com.djrapitops.plan.db.DBType; import com.djrapitops.plan.db.SQLDB; import com.djrapitops.plan.db.access.ExecStatement; import com.djrapitops.plan.db.access.QueryStatement; import com.djrapitops.plan.db.sql.parsing.Column; +import com.djrapitops.plan.db.sql.parsing.CreateTableParser; import com.djrapitops.plan.db.sql.parsing.Sql; -import com.djrapitops.plan.db.sql.parsing.TableSqlParser; import com.djrapitops.plan.system.settings.config.Config; import com.djrapitops.plan.system.settings.config.ConfigReader; import com.djrapitops.plan.system.settings.config.ConfigWriter; @@ -45,20 +46,27 @@ public class SettingsTable extends Table { public static final String TABLE_NAME = "plan_settings"; + public static final String ID = "id"; + public static final String SERVER_UUID = "server_uuid"; + public static final String UPDATED = "updated"; + public static final String CONFIG_CONTENT = "content"; + public SettingsTable(SQLDB db) { super(TABLE_NAME, db); } + public static String createTableSQL(DBType dbType) { + return CreateTableParser.create(TABLE_NAME, dbType) + .column(ID, Sql.INT).primaryKey() + .column(SERVER_UUID, Sql.varchar(39)).notNull().unique() + .column(UPDATED, Sql.LONG).notNull() + .column(CONFIG_CONTENT, "TEXT").notNull() + .toString(); + } + @Override public void createTable() throws DBInitException { - createTable(TableSqlParser.createTable(TABLE_NAME) - .primaryKeyIDColumn(supportsMySQLQueries, Col.ID) - .column(Col.SERVER_UUID, Sql.varchar(39)).notNull().unique() - .column(Col.UPDATED, Sql.LONG).notNull() - .column(Col.CONFIG_CONTENT, "TEXT").notNull() - .primaryKey(supportsMySQLQueries, Col.ID) - .toString() - ); + createTable(createTableSQL(db.getType())); } /** @@ -163,11 +171,12 @@ public class SettingsTable extends Table { })); } + @Deprecated public enum Col implements Column { - ID("id"), - SERVER_UUID("server_uuid"), - UPDATED("updated"), - CONFIG_CONTENT("content"); + @Deprecated ID("id"), + @Deprecated SERVER_UUID("server_uuid"), + @Deprecated UPDATED("updated"), + @Deprecated CONFIG_CONTENT("content"); private final String name;