diff --git a/src/main/java/me/cobeine/sqlava/connection/database/query/impl/DeleteQuery.java b/src/main/java/me/cobeine/sqlava/connection/database/query/impl/DeleteQuery.java index eff12e3..b6d4f26 100644 --- a/src/main/java/me/cobeine/sqlava/connection/database/query/impl/DeleteQuery.java +++ b/src/main/java/me/cobeine/sqlava/connection/database/query/impl/DeleteQuery.java @@ -12,8 +12,9 @@ public class DeleteQuery implements Query { private final String table; private final List wheres = new ArrayList<>(); + public DeleteQuery(String table) { - this.table = table; + this.table = '`' + table + '`';; } public DeleteQuery where(String expression) { diff --git a/src/main/java/me/cobeine/sqlava/connection/database/query/impl/InsertQuery.java b/src/main/java/me/cobeine/sqlava/connection/database/query/impl/InsertQuery.java index 355ed1c..3d7600d 100644 --- a/src/main/java/me/cobeine/sqlava/connection/database/query/impl/InsertQuery.java +++ b/src/main/java/me/cobeine/sqlava/connection/database/query/impl/InsertQuery.java @@ -16,10 +16,9 @@ public class InsertQuery implements Query { private boolean onDuplicateKey = false; public InsertQuery(String table) { - this.table = table; + this.table = '`' + table + '`';; } - public InsertQuery value(String column, String value) { values.put(column, value); return this; diff --git a/src/main/java/me/cobeine/sqlava/connection/database/query/impl/SelectQuery.java b/src/main/java/me/cobeine/sqlava/connection/database/query/impl/SelectQuery.java index 23c2517..948b2c8 100644 --- a/src/main/java/me/cobeine/sqlava/connection/database/query/impl/SelectQuery.java +++ b/src/main/java/me/cobeine/sqlava/connection/database/query/impl/SelectQuery.java @@ -20,10 +20,9 @@ public class SelectQuery implements Query { private int limitRowCount = 0; public SelectQuery(String table) { - this.table = table; + this.table = '`' + table + '`';; } - public SelectQuery column(String column) { columns.add(column); return this; @@ -34,12 +33,12 @@ public SelectQuery column(String... column) { } public SelectQuery where(String expression) { - wheres.add(expression + "=?"); + wheres.add(expression + "= ?"); return this; } public SelectQuery where(String... expression) { for (String s : expression) { - wheres.add(s + "=?"); + wheres.add(s + "= ?"); } return this; } @@ -83,7 +82,7 @@ public String build() { else builder.append("SELECT ").append(separate(columns)).append(" FROM ").append(table); - if (wheres.size() > 0) + if (!wheres.isEmpty()) builder.append(" WHERE ").append(separate(wheres, " AND ")); if (orderBy != null) @@ -92,7 +91,6 @@ public String build() { if (limitRowCount > 0) builder.append(" LIMIT ").append(limitOffset).append(",").append(limitRowCount); - return builder.toString(); } diff --git a/src/main/java/me/cobeine/sqlava/connection/database/query/impl/UpdateQuery.java b/src/main/java/me/cobeine/sqlava/connection/database/query/impl/UpdateQuery.java index 01ea170..42b163f 100644 --- a/src/main/java/me/cobeine/sqlava/connection/database/query/impl/UpdateQuery.java +++ b/src/main/java/me/cobeine/sqlava/connection/database/query/impl/UpdateQuery.java @@ -17,7 +17,7 @@ public class UpdateQuery implements Query { private final List wheres = new ArrayList<>(); public UpdateQuery(String table) { - this.table = table; + this.table = '`' + table + '`'; } public UpdateQuery setMultiple(String... column) { @@ -65,7 +65,6 @@ public String build() { String seperator = ""; for (Map.Entry entry : values.entrySet()) { - String column = entry.getKey(); String value = entry.getValue(); builder.append(seperator)