Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2025-01-12 03:13:46 +01:00
Code Issues Projects Releases Wiki Activity

Added MySQL-Driver to Plan (Velocity support)

Browse Source 
Affects issues:
- Close #739
This commit is contained in:
Rsl1122 2019-07-08 12:16:06 +03:00
parent 9e03a22e12
commit 3a2568d5db
4 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Plan/build.gradle
View File

@ -62,6 +62,7 @@ subprojects {
ext.htmlCompressorVersion = "1.5.2" ext.htmlCompressorVersion = "1.5.2"
ext.caffeineVersion = "2.7.0" ext.caffeineVersion = "2.7.0"
ext.h2Version = "1.4.199" ext.h2Version = "1.4.199"
ext.mysqlVersion = "8.0.16"
ext.hikariVersion = "3.3.1" ext.hikariVersion = "3.3.1"
ext.slf4jVersion = "1.7.26" ext.slf4jVersion = "1.7.26"
ext.geoIpVersion = "2.12.0" ext.geoIpVersion = "2.12.0"
@ -114,7 +115,7 @@ subprojects {
// Testing dependencies required by Plan // Testing dependencies required by Plan
testCompile "org.xerial:sqlite-jdbc:3.28.0" // SQLite testCompile "org.xerial:sqlite-jdbc:3.28.0" // SQLite
testCompile "mysql:mysql-connector-java:8.0.16" // MySQL testCompile "mysql:mysql-connector-java:$mysqlVersion" // MySQL
} }
configurations { configurations {

1
Plan/common/build.gradle
View File

@ -8,6 +8,7 @@ dependencies {
compile "com.googlecode.htmlcompressor:htmlcompressor:$htmlCompressorVersion" compile "com.googlecode.htmlcompressor:htmlcompressor:$htmlCompressorVersion"
compile "com.github.ben-manes.caffeine:caffeine:$caffeineVersion" compile "com.github.ben-manes.caffeine:caffeine:$caffeineVersion"
compile "com.h2database:h2:$h2Version" compile "com.h2database:h2:$h2Version"
compile "mysql:mysql-connector-java:$mysqlVersion"
compile "com.zaxxer:HikariCP:$hikariVersion" compile "com.zaxxer:HikariCP:$hikariVersion"
compile "org.slf4j:slf4j-nop:$slf4jVersion" compile "org.slf4j:slf4j-nop:$slf4jVersion"
compile "org.slf4j:slf4j-api:$slf4jVersion" compile "org.slf4j:slf4j-api:$slf4jVersion"

11
Plan/common/src/main/java/com/djrapitops/plan/db/MySQLDB.java
View File

@ -24,6 +24,7 @@ import com.djrapitops.plan.system.locale.Locale;
import com.djrapitops.plan.system.locale.lang.PluginLang; import com.djrapitops.plan.system.locale.lang.PluginLang;
import com.djrapitops.plan.system.settings.config.PlanConfig; import com.djrapitops.plan.system.settings.config.PlanConfig;
import com.djrapitops.plan.system.settings.paths.DatabaseSettings; import com.djrapitops.plan.system.settings.paths.DatabaseSettings;
import com.djrapitops.plugin.api.Check;
import com.djrapitops.plugin.benchmarking.Timings; import com.djrapitops.plugin.benchmarking.Timings;
import com.djrapitops.plugin.logging.L; import com.djrapitops.plugin.logging.L;
import com.djrapitops.plugin.logging.console.PluginLogger; import com.djrapitops.plugin.logging.console.PluginLogger;
@ -75,12 +76,22 @@ public class MySQLDB extends SQLDB {
return DBType.MYSQL; return DBType.MYSQL;
} }
private void loadMySQLDriver() {
try {
Class.forName("com.mysql.cj.jdbc.Driver");
} catch (ClassNotFoundException e) {
errorHandler.log(L.CRITICAL, this.getClass(), e);
}
}
/** /**
* Setups the {@link HikariDataSource} * Setups the {@link HikariDataSource}
*/ */
@Override @Override
public void setupDataSource() { public void setupDataSource() {
try { try {
if (Check.isVelocityAvailable()) loadMySQLDriver();
HikariConfig hikariConfig = new HikariConfig(); HikariConfig hikariConfig = new HikariConfig();
String host = config.get(DatabaseSettings.MYSQL_HOST); String host = config.get(DatabaseSettings.MYSQL_HOST);

2
Plan/plugin/build.gradle
View File

@ -15,6 +15,8 @@ shadowJar {
configurations = [project.configurations.compile] configurations = [project.configurations.compile]
relocate 'dagger', 'plan.dagger' relocate 'dagger', 'plan.dagger'
relocate 'com.mysql.jdbc', 'plan.com.mysql.jdbc'
relocate 'com.mysql.cj', 'plan.com.mysql.cj'
destinationDir = file("$rootDir/builds/") destinationDir = file("$rootDir/builds/")
baseName = "Plan" baseName = "Plan"