Merge pull request #541 from Lapzupi/database-multiple

Refactored Database, Fixed Migrations

even-more-fish-database-extras/build.gradle.kts

@@ -0,0 +1,11 @@
+plugins {
+    id("com.oheers.evenmorefish.java-conventions")
+}
+
+
+dependencies {
+    compileOnly(libs.jooq)
+    compileOnly(libs.jooq.codegen)
+
+    implementation(libs.annotations)
+}

even-more-fish-database-extras/src/main/java/com/oheers/fish/database/extras/PrefixNamingStrategy.java

@@ -0,0 +1,32 @@
+package com.oheers.fish.database.extras;
+
+import org.jetbrains.annotations.NotNull;
+import org.jooq.codegen.DefaultGeneratorStrategy;
+import org.jooq.meta.Definition;
+import org.jooq.tools.StringUtils;
+
+// This is needed to ensure prefix placeholders don't stay during code generation.
+public class PrefixNamingStrategy extends DefaultGeneratorStrategy {
+
+    @Override
+    public String getJavaClassName(final Definition definition, final Mode mode) {
+        String name = replacePrefix(super.getJavaClassName(definition, mode));
+
+        return StringUtils.toUC(name);
+    }
+
+    @Override
+    public String getJavaIdentifier(final Definition definition) {
+        return replacePrefix(super.getJavaIdentifier(definition));
+    }
+
+    private @NotNull String replacePrefix(final @NotNull String name) {
+        return name
+                .replaceAll("\\$\\{(TABLEPREFIX|tablePrefix|table_Prefix|TABLE_PREFIX)}", "")  // Matches variations of ${TABLEPREFIX}
+                .replaceAll("\\$_7b(TABLEPREFIX|tablePrefix|table_Prefix|TABLE_PREFIX)_7d", "") // Matches variations of $_7bTABLEPREFIX_7d
+                .replaceAll("\\$\\{.*?}", "") // Generic fallback for any unmatched ${PLACEHOLDER}
+                .replaceAll("\\$_7b.*?_7d", ""); // Generic fallback for any unmatched $_7bPLACEHOLDER_7d
+    }
+
+
+}

even-more-fish-plugin/build.gradle.kts

@@ -1,15 +1,19 @@
 import net.minecrell.pluginyml.bukkit.BukkitPluginDescription
+import nu.studer.gradle.jooq.JooqExtension
+import org.jooq.meta.jaxb.Property
 import java.time.Instant
 import java.time.ZoneId
 import java.time.format.DateTimeFormatter
 import java.util.*
 
+
 plugins {
     `java-library`
     `maven-publish`
     alias(libs.plugins.bukkit.yml)
     alias(libs.plugins.shadow)
     alias(libs.plugins.grgit)
+    alias(libs.plugins.jooq)
 }
 
 group = "com.oheers.evenmorefish"
@@ -87,7 +91,6 @@ dependencies {
     implementation(libs.vanishchecker)
     implementation(libs.boostedyaml)
 
-    library(libs.maven.artifact)
     library(libs.friendlyid)
     library(libs.flyway.core)
     library(libs.flyway.mysql)
@@ -96,6 +99,17 @@ dependencies {
     library(libs.commons.lang3)
     library(libs.commons.codec)
     library(libs.json.simple)
+
+    library(libs.jooq)
+    library(libs.jooq.codegen)
+    library(libs.jooq.meta)
+    library(libs.connectors.h2)
+
+    library(libs.maven.artifact)
+
+    jooqGenerator(project(":even-more-fish-database-extras"))
+    jooqGenerator(libs.jooq.meta.extensions)
+    jooqGenerator(libs.connectors.mysql)
 }
 
 bukkit {
@@ -193,15 +207,38 @@ bukkit {
 
     }
 }
+sourceSets {
+    main {
+        java.srcDirs.add(File("src/main/generated"))
+    }
+}
+tasks.named("compileJava") {
+    dependsOn(":even-more-fish-plugin:generateMysqlJooq")
+}
 
 tasks {
     build {
-        dependsOn(shadowJar)
+        dependsOn(
+            shadowJar
+        )
 
         doLast {
             val file = project.layout.buildDirectory.file("libs/even-more-fish-plugin-${version}.jar").get()
             file.asFile.delete()
         }
+
+
+    }
+
+    jooq {
+        version.set(libs.versions.jooq)
+
+        val dialects = listOf("mysql")
+        val latestSchema = "V7_1__Create_Tables.sql"
+        dialects.forEach { dialect ->
+            val schemaPath = "src/main/resources/db/migrations/${dialect}/${latestSchema}"
+            configureDialect(dialect, schemaPath)
+        }
     }
 
     clean {
@@ -227,6 +264,7 @@ tasks {
             attributes["Specification-Version"] = project.version
             attributes["Implementation-Title"] = grgit.branch.current().name
             attributes["Implementation-Version"] = buildNumberOrDate
+            attributes["Database-Baseline-Version"] = "7.0"
         }
 
         minimize {
@@ -291,6 +329,14 @@ java {
     }
 }
 
+sourceSets {
+    main {
+        java {
+            srcDir("src/main/generated")
+        }
+    }
+}
+
 fun getBuildNumberOrDate(): String? {
     val currentBranch = grgit.branch.current().name
     if (currentBranch.equals("head", ignoreCase = true) || currentBranch.equals("master", ignoreCase = true)) {
@@ -308,3 +354,30 @@ fun getBuildNumberOrDate(): String? {
     return time
 }
 
+fun JooqExtension.configureDialect(dialect: String, latestSchema: String) {
+    configurations {
+        create(dialect) {
+            generateSchemaSourceOnCompilation.set(false)
+            jooqConfiguration.apply {
+                jdbc = null
+                generator.apply {
+                    //https://www.jooq.org/doc/latest/manual/sql-building/dsl-context/custom-settings/settings-parser/
+                    strategy.name = "com.oheers.fish.database.extras.PrefixNamingStrategy"
+                    database.apply {
+                        name = "org.jooq.meta.extensions.ddl.DDLDatabase"
+                        properties.add(Property().withKey("scripts").withValue(latestSchema))
+                        properties.add(Property().withKey("dialect").withValue(dialect.uppercase()))
+                        properties.add(Property().withKey("sort").withValue("flyway"))
+                        properties.add(Property().withKey("unqualifiedSchema").withValue("none"))
+                    }
+                    target.apply {
+                        packageName = "com.oheers.fish.database.generated.${dialect}"
+                        directory = "src/main/generated/"
+                    }
+                }
+            }
+        }
+    }
+}
+
+