Merge pull request #18 from Innectic/feature/sqlite-support

Feature/sqlite support

Author: Innectic

API/src/main/java/me/innectic/permissify/api/database/ConnectionInformation.java

@@ -27,6 +27,8 @@
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
+import java.util.Map;
+
 /**
  * @author Innectic
  * @since 6/8/2017
@@ -40,4 +42,5 @@ public class ConnectionInformation {
     @Getter private int port;
     @Getter private String username;
     @Getter private String password;
+    @Getter private Map<String, Object> meta;
 }

API/src/main/java/me/innectic/permissify/api/database/handlers/HandlerType.java

@@ -38,7 +38,7 @@
 @AllArgsConstructor
 public enum HandlerType {
 
-    MYSQL(MySQLHandler.class, "MySQL");
+    MYSQL(SQLHandler.class, "MySQL"), SQLITE(SQLHandler.class, "SQLite");
 
     @Getter private Class<? extends DatabaseHandler> handler;
     @Getter private String displayName;

…/api/database/handlers/MySQLHandler.java …fy/api/database/handlers/SQLHandler.javaAPI/src/main/java/me/innectic/permissify/api/database/handlers/MySQLHandler.java renamed to API/src/main/java/me/innectic/permissify/api/database/handlers/SQLHandler.java API/src/main/java/me/innectic/permissify/api/database/handlers/MySQLHandler.java renamed to API/src/main/java/me/innectic/permissify/api/database/handlers/SQLHandler.java

@@ -40,10 +40,24 @@
  * @author Innectic
  * @since 6/8/2017
  */
-public class MySQLHandler extends DatabaseHandler {
+public class SQLHandler extends DatabaseHandler {
 
-    public MySQLHandler(ConnectionInformation connectionInformation) {
+    private final String baseConnectionURL;
+    private boolean isUsingSqlite = false;
+
+    public SQLHandler(ConnectionInformation connectionInformation) {
         super(connectionInformation);
+        String type = "mysql";
+        String databaseUrl = "//" + connectionInformation.getUrl() + ":" + connectionInformation.getPort();
+
+        if(connectionInformation.getMeta().containsKey("sqlite")) {
+            type = "sqlite";
+            // TODO: It would be nice to give this types...
+            Map sqliteData = (Map) connectionInformation.getMeta().get("sqlite");
+            databaseUrl = (String) sqliteData.get("file");
+            isUsingSqlite = true;
+        }
+        baseConnectionURL = "jdbc:" + type + ":" + databaseUrl;
     }
 
     /**
@@ -54,7 +68,8 @@ public MySQLHandler(ConnectionInformation connectionInformation) {
     private Optional<Connection> getConnection() {
         if (!connectionInformation.isPresent()) return Optional.empty();
         try {
-            String connectionURL = "jdbc:mysql://" + connectionInformation.get().getUrl() + ":" + connectionInformation.get().getPort() + "/" + connectionInformation.get().getDatabase();
+            if (isUsingSqlite) return Optional.ofNullable(DriverManager.getConnection(baseConnectionURL));
+            String connectionURL = baseConnectionURL + "/" + connectionInformation.get().getDatabase();
             return Optional.ofNullable(DriverManager.getConnection(connectionURL, connectionInformation.get().getUsername(), connectionInformation.get().getPassword()));
         } catch (SQLException e) {
             PermissifyAPI.get().ifPresent(api -> api.getDisplayUtil().displayError(ConnectionError.REJECTED, Optional.of(e)));
@@ -70,48 +85,51 @@ public void initialize() {
         if (!connectionInformation.isPresent()) return;
 
         try {
-            String connectionURL = "jdbc:mysql://" + connectionInformation.get().getUrl() + ":" + connectionInformation.get().getPort();
-            Optional<Connection> connection = Optional.ofNullable(DriverManager.getConnection(connectionURL, connectionInformation.get().getUsername(), connectionInformation.get().getPassword()));
+            Optional<Connection> connection;
+            if (isUsingSqlite) connection = Optional.ofNullable(DriverManager.getConnection(baseConnectionURL));
+            else connection = Optional.ofNullable(DriverManager.getConnection(baseConnectionURL, connectionInformation.get().getUsername(), connectionInformation.get().getPassword()));
             if (!connection.isPresent()) return;
             String database = connectionInformation.get().getDatabase();
+            if (!database.equals("")) database += ".";
             // TODO: This should all be prepared statements, but that breaks for some reason
-            PreparedStatement databaseStatement = connection.get().prepareStatement("CREATE DATABASE IF NOT EXISTS " + database);
-            databaseStatement.execute();
-            databaseStatement.close();
+            if (!isUsingSqlite) {
+                PreparedStatement databaseStatement = connection.get().prepareStatement("CREATE DATABASE IF NOT EXISTS " + database);
+                databaseStatement.execute();
+                databaseStatement.close();
+            }
 
-            PreparedStatement groupMembersStatement = connection.get().prepareStatement("CREATE TABLE IF NOT EXISTS " + database + ".groupMembers (uuid VARCHAR(767) NOT NULL, `group` VARCHAR(700) NOT NULL, `primary` TINYINT NOT NULL)");
+            PreparedStatement groupMembersStatement = connection.get().prepareStatement("CREATE TABLE IF NOT EXISTS " + database + "groupMembers (uuid VARCHAR(767) NOT NULL, `group` VARCHAR(700) NOT NULL, `primary` TINYINT NOT NULL)");
             groupMembersStatement.execute();
             groupMembersStatement.close();
 
-            PreparedStatement groupPermissionsStatement = connection.get().prepareStatement("CREATE TABLE IF NOT EXISTS " + database +".groupPermissions (groupName VARCHAR(767) NOT NULL, permission VARCHAR(767) NOT NULL)");
+            PreparedStatement groupPermissionsStatement = connection.get().prepareStatement("CREATE TABLE IF NOT EXISTS " + database +"groupPermissions (groupName VARCHAR(767) NOT NULL, permission VARCHAR(767) NOT NULL)");
             groupPermissionsStatement.execute();
             groupPermissionsStatement.close();
 
-            PreparedStatement groupsStatement = connection.get().prepareStatement("CREATE TABLE IF NOT EXISTS " + database + ".groups (name VARCHAR(100) NOT NULL UNIQUE, prefix VARCHAR(100) NOT NULL, suffix VARCHAR(100) NOT NULL, chatcolor VARCHAR(4) NOT NULL, defaultGroup TINYINT NOT NULL)");
+            PreparedStatement groupsStatement = connection.get().prepareStatement("CREATE TABLE IF NOT EXISTS " + database + "groups (name VARCHAR(100) NOT NULL UNIQUE, prefix VARCHAR(100) NOT NULL, suffix VARCHAR(100) NOT NULL, chatcolor VARCHAR(4) NOT NULL, defaultGroup TINYINT NOT NULL)");
             groupsStatement.execute();
             groupsStatement.close();
 
-            PreparedStatement playerPermissionsStatement = connection.get().prepareStatement("CREATE TABLE IF NOT EXISTS " + database + ".playerPermissions (uuid VARCHAR(767) NOT NULL, permission VARCHAR(767) NOT NULL, granted TINYINT NOT NULL)");
+            PreparedStatement playerPermissionsStatement = connection.get().prepareStatement("CREATE TABLE IF NOT EXISTS " + database + "playerPermissions (uuid VARCHAR(767) NOT NULL, permission VARCHAR(767) NOT NULL, granted TINYINT NOT NULL)");
             playerPermissionsStatement.execute();
             playerPermissionsStatement.close();
 
-            PreparedStatement superAdminStatement = connection.get().prepareStatement("CREATE TABLE IF NOT EXISTS " + database + ".superAdmin (uuid VARCHAR(767) NOT NULL)");
+            PreparedStatement superAdminStatement = connection.get().prepareStatement("CREATE TABLE IF NOT EXISTS " + database + "superAdmin (uuid VARCHAR(767) NOT NULL)");
             superAdminStatement.execute();
             superAdminStatement.close();
 
-            ResultSet results = connection.get().getMetaData().getTables(database, null, "formatting", new String[]{"TABLE"});
-            if (results.next()) {
-                PreparedStatement formattingStatement = connection.get().prepareStatement("CREATE TABLE IF NOT EXISTS " + database + ".formatting (`format` VARCHAR(400) NOT NULL, formatter VARCHAR(200) NOT NULL)");
+            if (!hasFormattingTable(connection.get(), database)) {
+                PreparedStatement formattingStatement = connection.get().prepareStatement("CREATE TABLE IF NOT EXISTS " + database + "formatting (`format` VARCHAR(400) NOT NULL, formatter VARCHAR(200) NOT NULL)");
                 formattingStatement.execute();
                 formattingStatement.close();
 
-                PreparedStatement defaultChatFormat = connection.get().prepareStatement("INSERT INTO " + database + ".formatting (`format`, formatter) VALUES (?,?)");
+                PreparedStatement defaultChatFormat = connection.get().prepareStatement("INSERT INTO " + database + "formatting (`format`, formatter) VALUES (?,?)");
                 defaultChatFormat.setString(1, "{group} {username}: {message}");
                 defaultChatFormat.setString(2, "chat");
                 defaultChatFormat.execute();
                 defaultChatFormat.close();
 
-                PreparedStatement defaultWhisperFormat = connection.get().prepareStatement("INSERT INTO " + database + ".formatting (`format`, formatter) VALUES (?,?)");
+                PreparedStatement defaultWhisperFormat = connection.get().prepareStatement("INSERT INTO " + database + "formatting (`format`, formatter) VALUES (?,?)");
                 defaultWhisperFormat.setString(1, "{senderGroup} {username} > {receiverGroup} {to}: {message}");
                 defaultWhisperFormat.setString(2, "whisper");
                 defaultWhisperFormat.execute();
@@ -339,11 +357,12 @@ public boolean createGroup(String name, String prefix, String suffix, String cha
         }
 
         try {
-            PreparedStatement statement = connection.get().prepareStatement("INSERT INTO groups (name,prefix,suffix,chatcolor) VALUES (?,?,?,?)");
+            PreparedStatement statement = connection.get().prepareStatement("INSERT INTO groups (name,prefix,suffix,chatcolor,defaultGroup) VALUES (?,?,?,?,?)");
             statement.setString(1, name);
             statement.setString(2, prefix);
             statement.setString(3, suffix);
             statement.setString(4, chatColor);
+            statement.setBoolean(5, false);
             // Cleanup
             statement.execute();
             statement.close();
@@ -398,9 +417,10 @@ public boolean addPlayerToGroup(UUID uuid, PermissionGroup group) {
             return false;
         }
         try {
-            PreparedStatement statement = connection.get().prepareStatement("INSERT INTO groupMembers (uuid,`group`) VALUES (?,?)");
+            PreparedStatement statement = connection.get().prepareStatement("INSERT INTO groupMembers (uuid,`group`,`primary`) VALUES (?,?,?)");
             statement.setString(1, uuid.toString());
             statement.setString(2, group.getName());
+            statement.setBoolean(3, false);
             statement.execute();
             statement.close();
             connection.get().close();
@@ -733,4 +753,18 @@ public void setDefaultGroup(PermissionGroup group) {
             e.printStackTrace();
         }
     }
+
+    private boolean hasFormattingTable(Connection connection, String database) {
+        try {
+            if (isUsingSqlite) {
+                PreparedStatement statement = connection.prepareStatement("SELECT name FROM sqlite_master WHERE type='table' AND name=?");
+                statement.setString(1, "formatting");
+                return statement.executeQuery().next();
+            }
+            return connection.getMetaData().getTables(database, null, "formatting", new String[]{"TABLE"}).next();
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+        return false;
+    }
 }

Spigot/src/main/java/me/innectic/permissify/spigot/PermissifyMain.java

@@ -121,11 +121,13 @@ private void registerCommands() {
         playerCommand = new PlayerCommand();
         formatCommand = new FormatCommand();
         cacheCommand = new CacheCommand();
+
         getCommand("permissify").setExecutor(new PermissifyCommand());
     }
 
     private void registerListeners() {
         PluginManager pluginManager = Bukkit.getPluginManager();
+
         pluginManager.registerEvents(new PlayerJoin(), this);
         pluginManager.registerEvents(new PlayerChat(), this);
         pluginManager.registerEvents(new PreProcess(), this);

Spigot/src/main/java/me/innectic/permissify/spigot/events/PlayerChat.java

@@ -49,7 +49,9 @@ public void onPlayerChat(AsyncPlayerChatEvent e) {
         if (!plugin.getPermissifyAPI().getDatabaseHandler().isPresent()) return;
         Player player = e.getPlayer();
         if (player == null) return;
-        Optional<PermissionGroup> group = plugin.getPermissifyAPI().getDatabaseHandler().get().getGroups().stream().filter(permissionGroup -> permissionGroup.hasPlayer(player.getUniqueId())).findFirst();
+        Optional<PermissionGroup> group = plugin.getPermissifyAPI().getDatabaseHandler().get().getGroups().stream()
+                .filter(permissionGroup -> permissionGroup.hasPlayer(player.getUniqueId()))
+                .filter(permissionGroup -> permissionGroup.isPrimaryGroup(player.getUniqueId())).findFirst();
         group.ifPresent(permissionGroup -> {
             e.setCancelled(true);
             Bukkit.broadcastMessage(ColorUtil.makeReadable(ChatFormatter.formatChat(player.getUniqueId(), player.getName(), e.getMessage())));

Spigot/src/main/java/me/innectic/permissify/spigot/utils/ConfigVerifier.java

@@ -28,9 +28,11 @@
 import me.innectic.permissify.api.database.ConnectionInformation;
 import me.innectic.permissify.api.database.handlers.FullHandler;
 import me.innectic.permissify.api.database.handlers.HandlerType;
-import me.innectic.permissify.api.database.handlers.MySQLHandler;
+import me.innectic.permissify.api.database.handlers.SQLHandler;
 import me.innectic.permissify.api.util.VerifyConfig;
 
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Optional;
 
 /**
@@ -57,19 +59,32 @@ public Optional<FullHandler> verifyConnectionInformation() {
         if (plugin.getConfig().get("handleChat") == null) return Optional.empty();
 
         Optional<ConnectionInformation> connectionInformation = Optional.empty();
-        if (type.get().getHandler() == MySQLHandler.class) {
-            if (plugin.getConfig().getString("connection.host") == null) return Optional.empty();
-            if (plugin.getConfig().getString("connection.database") == null) return Optional.empty();
-            if (plugin.getConfig().getString("connection.port") == null) return Optional.empty();
-            if (plugin.getConfig().getString("connection.username") == null) return Optional.empty();
-            if (plugin.getConfig().getString("connection.password") == null) return Optional.empty();
+        if (type.get().getHandler() == SQLHandler.class) {
+            if (type.get().getDisplayName().equalsIgnoreCase("mysql")) {
+                if (plugin.getConfig().getString("connection.host") == null) return Optional.empty();
+                if (plugin.getConfig().getString("connection.database") == null) return Optional.empty();
+                if (plugin.getConfig().getString("connection.port") == null) return Optional.empty();
+                if (plugin.getConfig().getString("connection.username") == null) return Optional.empty();
+                if (plugin.getConfig().getString("connection.password") == null) return Optional.empty();
 
-            connectionInformation = Optional.of(new ConnectionInformation(
-                    plugin.getConfig().getString("connection.host"),
-                    plugin.getConfig().getString("connection.database"),
-                    plugin.getConfig().getInt("connection.port"),
-                    plugin.getConfig().getString("connection.username"),
-                    plugin.getConfig().getString("connection.password")));
+                connectionInformation = Optional.of(new ConnectionInformation(
+                        plugin.getConfig().getString("connection.host"),
+                        plugin.getConfig().getString("connection.database"),
+                        plugin.getConfig().getInt("connection.port"),
+                        plugin.getConfig().getString("connection.username"),
+                        plugin.getConfig().getString("connection.password"),
+                        new HashMap<>())
+                );
+            } else if (type.get().getDisplayName().equalsIgnoreCase("sqlite")) {
+                if (plugin.getConfig().getString("connection.file") == null) return Optional.empty();
+
+                Map<String, Object> sqliteMeta = new HashMap<>();
+                sqliteMeta.put("file", plugin.getDataFolder() + "/" + plugin.getConfig().getString("connection.file") + ".db");
+                Map<String, Object> meta = new HashMap<>();
+                meta.put("sqlite", sqliteMeta);
+
+                connectionInformation = Optional.of(new ConnectionInformation("", "", 0, "", "", meta));
+            }
         }
         return Optional.of(new FullHandler(type, connectionInformation));
     }

Spigot/src/main/resources/config.yml

@@ -5,4 +5,5 @@ connection:
   port: 3306
   database: permissify
   username: permissify
-  password: magicalpassword
+  password: magicalpassword
+  file: test.db

Sponge/src/main/java/me/innectic/permissify/sponge/config/PermissifyConfig.java

@@ -8,6 +8,7 @@
 import ninja.leaping.configurate.loader.ConfigurationLoader;
 
 import java.io.IOException;
+import java.util.HashMap;
 
 /**
  * @author Innectic
@@ -52,7 +53,7 @@ private void verifyConfiguration() {
             String password = checkNode(configuration.getNode("connection.password", ""), "", "The password for the database").getString();
             String database = checkNode(configuration.getNode("connection.database", ""), "", "The database to connect to").getString();
             int port = checkNode(configuration.getNode("connection.port", ""), "", "The port to connect to").getInt();
-            connectionInformation = new ConnectionInformation(host, database, port, username, password);
+            connectionInformation = new ConnectionInformation(host, database, port, username, password, new HashMap<>());
         });
     }