mirror of
https://github.com/amalthea-mc/ShopChest.git
synced 2024-11-22 10:22:29 +00:00
Use more prepared statements
+ Removed quotation marks and semi colons from queries
This commit is contained in:
parent
508baf4f6b
commit
f6a7f5e3ba
@ -58,38 +58,38 @@ public abstract class Database {
|
||||
|
||||
String queryCreateTableShopList =
|
||||
"CREATE TABLE IF NOT EXISTS shops (" +
|
||||
"`id` INTEGER PRIMARY KEY " + (Database.this instanceof SQLite ? "AUTOINCREMENT" : "AUTO_INCREMENT") + "," +
|
||||
"`vendor` TINYTEXT NOT NULL," +
|
||||
"`product` TEXT NOT NULL," +
|
||||
"`world` TINYTEXT NOT NULL," +
|
||||
"`x` INTEGER NOT NULL," +
|
||||
"`y` INTEGER NOT NULL," +
|
||||
"`z` INTEGER NOT NULL," +
|
||||
"`buyprice` FLOAT NOT NULL," +
|
||||
"`sellprice` FLOAT NOT NULL," +
|
||||
"`shoptype` TINYTEXT NOT NULL" +
|
||||
");";
|
||||
"id INTEGER PRIMARY KEY " + (Database.this instanceof SQLite ? "AUTOINCREMENT" : "AUTO_INCREMENT") + "," +
|
||||
"vendor TINYTEXT NOT NULL," +
|
||||
"product TEXT NOT NULL," +
|
||||
"world TINYTEXT NOT NULL," +
|
||||
"x INTEGER NOT NULL," +
|
||||
"y INTEGER NOT NULL," +
|
||||
"z INTEGER NOT NULL," +
|
||||
"buyprice FLOAT NOT NULL," +
|
||||
"sellprice FLOAT NOT NULL," +
|
||||
"shoptype TINYTEXT NOT NULL" +
|
||||
")";
|
||||
|
||||
String queryCreateTableShopLog =
|
||||
"CREATE TABLE IF NOT EXISTS shop_log (" +
|
||||
"`id` INTEGER PRIMARY KEY " + (Database.this instanceof SQLite ? "AUTOINCREMENT" : "AUTO_INCREMENT") + "," +
|
||||
"`timestamp` TINYTEXT NOT NULL," +
|
||||
"`executor` TINYTEXT NOT NULL," +
|
||||
"`product` TINYTEXT NOT NULL," +
|
||||
"`vendor` TINYTEXT NOT NULL," +
|
||||
"`world` TINYTEXT NOT NULL," +
|
||||
"`x` INTEGER NOT NULL," +
|
||||
"`y` INTEGER NOT NULL," +
|
||||
"`z` INTEGER NOT NULL," +
|
||||
"`price` FLOAT NOT NULL," +
|
||||
"`type` TINYTEXT NOT NULL" +
|
||||
");";
|
||||
"CREATE TABLE IF NOT EXISTS `shop_log` (" +
|
||||
"id INTEGER PRIMARY KEY " + (Database.this instanceof SQLite ? "AUTOINCREMENT" : "AUTO_INCREMENT") + "," +
|
||||
"timestamp TINYTEXT NOT NULL," +
|
||||
"executor TINYTEXT NOT NULL," +
|
||||
"product TINYTEXT NOT NULL," +
|
||||
"vendor TINYTEXT NOT NULL," +
|
||||
"world TINYTEXT NOT NULL," +
|
||||
"x INTEGER NOT NULL," +
|
||||
"y INTEGER NOT NULL," +
|
||||
"z INTEGER NOT NULL," +
|
||||
"price FLOAT NOT NULL," +
|
||||
"type TINYTEXT NOT NULL" +
|
||||
")";
|
||||
|
||||
String queryCreateTablePlayerLogout =
|
||||
"CREATE TABLE IF NOT EXISTS player_logout (" +
|
||||
"`player` VARCHAR(36) PRIMARY KEY NOT NULL," +
|
||||
"`time` LONG NOT NULL" +
|
||||
");";
|
||||
"player VARCHAR(36) PRIMARY KEY NOT NULL," +
|
||||
"time LONG NOT NULL" +
|
||||
")";
|
||||
|
||||
String queryCheckIfTableExists =
|
||||
(Database.this instanceof SQLite ?
|
||||
@ -171,9 +171,11 @@ public abstract class Database {
|
||||
PreparedStatement ps = null;
|
||||
|
||||
try {
|
||||
ps = connection.prepareStatement("DELETE FROM shops WHERE id = " + shop.getID() + ";");
|
||||
plugin.debug("Removing shop from database (#" + shop.getID() + ")");
|
||||
ps = connection.prepareStatement("DELETE FROM shops WHERE id = ?");
|
||||
ps.setInt(1, shop.getID());
|
||||
ps.executeUpdate();
|
||||
|
||||
plugin.debug("Removing shop from database (#" + shop.getID() + ")");
|
||||
if (callback != null) callback.callSyncResult(null);
|
||||
} catch (SQLException ex) {
|
||||
if (callback != null) callback.callSyncError(ex);
|
||||
@ -199,7 +201,8 @@ public abstract class Database {
|
||||
ResultSet rs = null;
|
||||
|
||||
try {
|
||||
ps = connection.prepareStatement("SELECT * FROM shops WHERE id = " + id + ";");
|
||||
ps = connection.prepareStatement("SELECT * FROM shops WHERE id = ?");
|
||||
ps.setInt(1, id);
|
||||
rs = ps.executeQuery();
|
||||
|
||||
while (rs.next()) {
|
||||
|
Loading…
Reference in New Issue
Block a user