diff --git a/Plan/common/src/main/java/com/djrapitops/plan/db/sql/parsing/Column.java b/Plan/common/src/main/java/com/djrapitops/plan/db/sql/parsing/Column.java deleted file mode 100644 index ac80b9498..000000000 --- a/Plan/common/src/main/java/com/djrapitops/plan/db/sql/parsing/Column.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * This file is part of Player Analytics (Plan). - * - * Plan is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License v3 as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Plan is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Plan. If not, see . - */ -package com.djrapitops.plan.db.sql.parsing; - -/** - * Interface for SQL column enum compatibility. - * - * @author Rsl1122 - */ -@Deprecated -public interface Column { - - default String get() { - return toString(); - } - - String toString(); - -} diff --git a/Plan/common/src/main/java/com/djrapitops/plan/db/sql/parsing/Insert.java b/Plan/common/src/main/java/com/djrapitops/plan/db/sql/parsing/Insert.java index d605574a6..f8e45b59e 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/db/sql/parsing/Insert.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/db/sql/parsing/Insert.java @@ -16,8 +16,6 @@ */ package com.djrapitops.plan.db.sql.parsing; -import java.util.Arrays; - public class Insert extends SqlParser { public Insert(String table) { @@ -25,11 +23,6 @@ public class Insert extends SqlParser { addSpace(); } - public static String values(String table, Column... columns) { - String[] cols = Arrays.stream(columns).map(Column::get).toArray(String[]::new); - return values(table, cols); - } - public static String values(String table, String... columns) { Insert parser = new Insert(table); parser.append("("); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/db/sql/parsing/Select.java b/Plan/common/src/main/java/com/djrapitops/plan/db/sql/parsing/Select.java index a9bb12702..15988c29f 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/db/sql/parsing/Select.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/db/sql/parsing/Select.java @@ -16,19 +16,12 @@ */ package com.djrapitops.plan.db.sql.parsing; -import java.util.Arrays; - public class Select extends WhereParser { public Select(String start) { super(start); } - public static Select from(String table, Column... columns) { - String[] cols = Arrays.stream(columns).map(Column::get).toArray(String[]::new); - return from(table, cols); - } - public static Select from(String table, String... columns) { Select parser = new Select("SELECT "); int size = columns.length; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/db/sql/parsing/TableSqlParser.java b/Plan/common/src/main/java/com/djrapitops/plan/db/sql/parsing/TableSqlParser.java deleted file mode 100644 index 588338afe..000000000 --- a/Plan/common/src/main/java/com/djrapitops/plan/db/sql/parsing/TableSqlParser.java +++ /dev/null @@ -1,150 +0,0 @@ -/* - * This file is part of Player Analytics (Plan). - * - * Plan is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License v3 as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Plan is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Plan. If not, see . - */ -package com.djrapitops.plan.db.sql.parsing; - -/** - * SqlParser Class for parsing table creation, removal and modification statements. - * - * @author Rsl1122 - */ -@Deprecated -public class TableSqlParser extends SqlParser { - - private int columns = 0; - - public TableSqlParser(String start) { - super(start); - } - - public static TableSqlParser createTable(String tableName) { - return new TableSqlParser("CREATE TABLE IF NOT EXISTS " + tableName + " ("); - } - - public static String dropTable(String tableName) { - return "DROP TABLE IF EXISTS " + tableName; - } - - /** - * Used for ALTER TABLE sql statements. - * - * @param column column to modify - * @return TableSqlParser object - */ - public static TableSqlParser newColumn(String column, String type) { - return new TableSqlParser("").column(column, type); - } - - public TableSqlParser column(Column column, String type) { - return column(column.get(), type); - } - - public TableSqlParser column(String column, String type) { - if (columns > 0) { - append(", "); - } - append(column).addSpace(); - append(type); - - columns++; - return this; - } - - public TableSqlParser foreignKey(Column column, String refrencedTable, Column referencedColumn) { - return foreignKey(column.get(), refrencedTable, referencedColumn.get()); - } - - public TableSqlParser foreignKey(String column, String refrencedTable, String referencedColumn) { - if (columns > 0) { - append(", "); - } - append("FOREIGN KEY(") - .append(column) - .append(") REFERENCES ") - .append(refrencedTable) - .append("(") - .append(referencedColumn) - .append(")"); - columns++; - return this; - } - - public TableSqlParser notNull() { - addSpace(); - append("NOT NULL"); - return this; - } - - public TableSqlParser unique() { - addSpace(); - append("UNIQUE"); - return this; - } - - public TableSqlParser defaultValue(boolean value) { - return defaultValue(value ? "1" : "0"); - } - - public TableSqlParser defaultValue(String value) { - addSpace(); - append("DEFAULT ").append(value); - return this; - } - - public TableSqlParser primaryKeyIDColumn(boolean supportsMySQLQueries, Column column) { - return primaryKeyIDColumn(supportsMySQLQueries, column.get()); - } - - public TableSqlParser primaryKeyIDColumn(boolean supportsMySQLQueries, String column) { - if (columns > 0) { - append(", "); - } - append(column).addSpace(); - append(Sql.INT).addSpace(); - append((supportsMySQLQueries) ? "NOT NULL AUTO_INCREMENT" : "PRIMARY KEY"); - columns++; - return this; - } - - public TableSqlParser primaryKey(boolean supportsMySQLQueries, Column column) { - return primaryKey(supportsMySQLQueries, column.get()); - } - - public TableSqlParser primaryKey(boolean supportsMySQLQueries, String column) { - if (supportsMySQLQueries) { - if (columns > 0) { - append(", "); - } - append("PRIMARY KEY (").append(column).append(")"); - columns++; - } - return this; - } - - public TableSqlParser charSetUTF8(boolean mySQL) { - if (mySQL) { - addSpace(); - append("CHARACTER SET utf8 COLLATE utf8mb4_general_ci"); - } - return this; - } - - @Override - public String toString() { - append(")"); - return super.toString(); - } -} diff --git a/Plan/common/src/main/java/com/djrapitops/plan/db/sql/parsing/Update.java b/Plan/common/src/main/java/com/djrapitops/plan/db/sql/parsing/Update.java index fe25a529c..affea8122 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/db/sql/parsing/Update.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/db/sql/parsing/Update.java @@ -16,8 +16,6 @@ */ package com.djrapitops.plan.db.sql.parsing; -import java.util.Arrays; - /** * @author Fuzzlemann */ @@ -28,10 +26,6 @@ public class Update extends WhereParser { addSpace(); } - public static Update values(String table, Column... values) { - String[] cols = Arrays.stream(values).map(Column::get).toArray(String[]::new); - return values(table, cols); - } public static Update values(String table, String... values) { Update parser = new Update(table);