From 8e5bcdd5eaa8d1f6ce78932e0febbeef9a2a9b68 Mon Sep 17 00:00:00 2001 From: Luck Date: Fri, 20 Apr 2018 14:56:37 +0100 Subject: [PATCH] Move schema files to a namespaced package (#899) --- .../java/me/lucko/luckperms/common/storage/dao/sql/SqlDao.java | 2 +- .../src/main/resources/{ => me/lucko/luckperms}/schema/h2.sql | 0 .../main/resources/{ => me/lucko/luckperms}/schema/mariadb.sql | 0 .../main/resources/{ => me/lucko/luckperms}/schema/mysql.sql | 0 .../resources/{ => me/lucko/luckperms}/schema/postgresql.sql | 0 .../main/resources/{ => me/lucko/luckperms}/schema/sqlite.sql | 0 6 files changed, 1 insertion(+), 1 deletion(-) rename common/src/main/resources/{ => me/lucko/luckperms}/schema/h2.sql (100%) rename common/src/main/resources/{ => me/lucko/luckperms}/schema/mariadb.sql (100%) rename common/src/main/resources/{ => me/lucko/luckperms}/schema/mysql.sql (100%) rename common/src/main/resources/{ => me/lucko/luckperms}/schema/postgresql.sql (100%) rename common/src/main/resources/{ => me/lucko/luckperms}/schema/sqlite.sql (100%) diff --git a/common/src/main/java/me/lucko/luckperms/common/storage/dao/sql/SqlDao.java b/common/src/main/java/me/lucko/luckperms/common/storage/dao/sql/SqlDao.java index 428d7b82a..2248621d0 100644 --- a/common/src/main/java/me/lucko/luckperms/common/storage/dao/sql/SqlDao.java +++ b/common/src/main/java/me/lucko/luckperms/common/storage/dao/sql/SqlDao.java @@ -157,7 +157,7 @@ public class SqlDao extends AbstractDao { // Init tables if (!tableExists(this.prefix.apply("{prefix}user_permissions"))) { - String schemaFileName = "schema/" + this.provider.getName().toLowerCase() + ".sql"; + String schemaFileName = "me/lucko/luckperms/schema/" + this.provider.getName().toLowerCase() + ".sql"; try (InputStream is = this.plugin.getBootstrap().getResourceStream(schemaFileName)) { if (is == null) { throw new Exception("Couldn't locate schema file for " + this.provider.getName()); diff --git a/common/src/main/resources/schema/h2.sql b/common/src/main/resources/me/lucko/luckperms/schema/h2.sql similarity index 100% rename from common/src/main/resources/schema/h2.sql rename to common/src/main/resources/me/lucko/luckperms/schema/h2.sql diff --git a/common/src/main/resources/schema/mariadb.sql b/common/src/main/resources/me/lucko/luckperms/schema/mariadb.sql similarity index 100% rename from common/src/main/resources/schema/mariadb.sql rename to common/src/main/resources/me/lucko/luckperms/schema/mariadb.sql diff --git a/common/src/main/resources/schema/mysql.sql b/common/src/main/resources/me/lucko/luckperms/schema/mysql.sql similarity index 100% rename from common/src/main/resources/schema/mysql.sql rename to common/src/main/resources/me/lucko/luckperms/schema/mysql.sql diff --git a/common/src/main/resources/schema/postgresql.sql b/common/src/main/resources/me/lucko/luckperms/schema/postgresql.sql similarity index 100% rename from common/src/main/resources/schema/postgresql.sql rename to common/src/main/resources/me/lucko/luckperms/schema/postgresql.sql diff --git a/common/src/main/resources/schema/sqlite.sql b/common/src/main/resources/me/lucko/luckperms/schema/sqlite.sql similarity index 100% rename from common/src/main/resources/schema/sqlite.sql rename to common/src/main/resources/me/lucko/luckperms/schema/sqlite.sql