Merge pull request '1.2.0 release' (#2) from develop into main

Reviewed-on: Infendro/migration-kt#2

.gitea/workflows/main.yaml

@@ -1,34 +0,0 @@
-on:
-  push:
-    branches:
-      - main
-
-env:
-  GIT__TOKEN: ${{ secrets.TOKEN }}
-
-jobs:
-  publish:
-    runs-on: linux
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: actions/cache/restore@v4
-        with:
-          key: gradle
-          path: |
-            ~/.gradle/caches/
-            ~/.gradle/wrapper/
-
-      - uses: actions/setup-java@v4
-        with:
-          java-version: '24'
-          distribution: 'temurin'
-
-      - run: ./gradlew publish
-
-      - uses: actions/cache/save@v4
-        with:
-          key: gradle
-          path: |
-            ~/.gradle/caches/
-            ~/.gradle/wrapper/

.gitea/workflows/publish.yaml

@@ -0,0 +1,30 @@
+on:
+  push:
+    branches: [ main ]
+
+jobs:
+  publish:
+    runs-on: linux
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          java-version: '24'
+          distribution: 'temurin'
+
+      - name: Cache Gradle
+        uses: actions/cache@v4
+        with:
+          key: gradle-${{ hashFiles('**/libs.versions.toml') }}
+          restore-keys: gradle
+          path: |
+            ~/.gradle/caches/
+            ~/.gradle/wrapper/
+
+      - name: Publish
+        run: ./gradlew publish
+        env:
+          INFENDRO__TOKEN: ${{ secrets.TOKEN }}

README.md

@@ -1,12 +1,6 @@
-# Kotlin Database Migration
+# migration-kt
 
-This library enables code-based database migrations in Kotlin.
+`migration-kt` is a Kotlin library that enables code-based migrations.
-
-## Features
-
-* Declare database migrations (identified by a unique name).
-    * Migrations are executed in the order they are declared in.
-* Executed migrations are tracked in a database table and skipped on subsequent runs.
 
 ## Installation
 
@@ -18,16 +12,13 @@ repositories {
 }
 
 dependencies {
-    implementation("com.infendro:migration:1.1.0")
+    implementation("com.infendro:migration:1.2.0")
 }
 ```
 
 ## Usage
 
 ```kotlin
-import com.infendro.migration.migrate
-import org.jetbrains.exposed.sql.Database
-
 fun configureDatabase() {
     // connect to a database
     Database.connect(/* parameters */)

build.gradle.kts

@@ -1,53 +1,35 @@
+import com.infendro.plugin.infendro
+import com.infendro.plugin.token
+
 group = "com.infendro"
-version = "1.1.0"
+version = "1.2.0"
+
+plugins {
+    alias(libs.plugins.infendro)
+    alias(libs.plugins.kotlin)
+    id("maven-publish")
+}
 
 repositories {
     mavenCentral()
 }
 
-plugins {
-    alias(libs.plugins.kotlin)
-    id("maven-publish")
-}
-
 dependencies {
     implementation(libs.exposed)
     implementation(libs.exposed.dao)
+    implementation(libs.exposed.jdbc)
 }
 
 publishing {
     publications {
         create<MavenPublication>("JVM") {
             from(components["java"])
-            groupId = group as String
+            groupId = project.group as String
             artifactId = project.name
-            version = version
+            version = project.version as String
         }
     }
     repositories {
-        maven {
+        infendro(token)
-            url = uri("https://git.infendro.com/api/packages/Infendro/maven")
-            authentication.create("header", HttpHeaderAuthentication::class)
-            credentials(HttpHeaderCredentials::class) {
-                val token = secret("git.token") ?: throw GradleException()
-
-                name = "Authorization"
-                value = "token $token"
-            }
-        }
     }
 }
-
-fun secret(
-    key: String,
-): String? {
-    val property = key
-    val environment = key
-        .uppercase()
-        .replace(".", "__")
-
-    val prop = properties[property] as String?
-    val env = System.getenv(environment)
-
-    return prop ?: env
-}

gradle/libs.versions.toml

@@ -1,10 +1,13 @@
 [versions]
-kotlin = "2.2.10"
+infendro = "1.1.0"
-exposed = "0.61.0"
+kotlin = "2.3.0"
+exposed = "1.0.0"
 
 [plugins]
+infendro = { id = "com.infendro.plugin", version.ref = "infendro" }
 kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 
 [libraries]
 exposed = { module = "org.jetbrains.exposed:exposed-core", version.ref = "exposed" }
 exposed-dao = { module = "org.jetbrains.exposed:exposed-dao", version.ref = "exposed" }
+exposed-jdbc = { module = "org.jetbrains.exposed:exposed-jdbc", version.ref = "exposed" }

settings.gradle.kts

@@ -1 +1,6 @@
 rootProject.name = "migration"
+
+pluginManagement.repositories {
+    maven("https://git.infendro.com/api/packages/Infendro/maven")
+    mavenCentral()
+}

src/main/kotlin/com/infendro/migration/Migration.kt

@@ -3,66 +3,53 @@ package com.infendro.migration
 import com.infendro.migration.exception.DuplicateMigrationException
 import com.infendro.migration.model.MigrationRepository
 import com.infendro.migration.model.MigrationTable
-import org.jetbrains.exposed.sql.SchemaUtils
+import org.jetbrains.exposed.v1.jdbc.JdbcTransaction
-import org.jetbrains.exposed.sql.Transaction
+import org.jetbrains.exposed.v1.jdbc.SchemaUtils
-import org.jetbrains.exposed.sql.transactions.transaction
+import org.jetbrains.exposed.v1.jdbc.transactions.transaction
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 
 internal val logger: Logger = LoggerFactory.getLogger("Database")
 
-fun migrate(
+class MigrationConfig {
-    config: Config
-) {
-    transaction {
-        SchemaUtils.create(MigrationTable)
-    }
-
-    for ((name, migrate) in config.migrations) {
-        if (MigrationRepository.exists(name)) {
-            continue
-        }
-
-        transaction {
-            try {
-                migrate()
-                logger.info("""Migration "$name" successful""")
-            } catch (e: Exception) {
-                logger.error("""Migration "$name" failed""")
-                throw e
-            }
-        }
-
-        MigrationRepository.insert(name)
-    }
-}
-
-@Suppress("UNUSED")
-fun migrate(
-    configure: Config.() -> Unit
-) {
-    val config = Config()
-    config.configure()
-    migrate(config)
-}
-
-class Config {
     internal val migrations: MutableList<Migration> = mutableListOf()
 
-    @Suppress("UNUSED")
+    fun migration(name: String, migrate: JdbcTransaction.() -> Unit) {
-    fun migration(
+        if (migrations.any { it.name == name })
-        name: String,
-        migrate: Transaction.() -> Unit,
-    ) {
-        if (migrations.any { it.name == name }) {
             throw DuplicateMigrationException(name)
-        }
 
         migrations += Migration(name, migrate)
     }
 
     data class Migration(
         val name: String,
-        val migrate: Transaction.() -> Unit
+        val migrate: JdbcTransaction.() -> Unit,
     )
 }
+
+fun migrate(config: MigrationConfig) {
+    transaction {
+        SchemaUtils.create(MigrationTable)
+    }
+
+    for ((name, migrate) in config.migrations) {
+        if (MigrationRepository.exists(name))
+            continue
+
+        try {
+            transaction { migrate() }
+            logger.info("""Migration "$name" successful""")
+        } catch (e: Exception) {
+            logger.error("""Migration "$name" failed""")
+            throw e
+        }
+
+        MigrationRepository.insert(name)
+    }
+}
+
+fun migrate(configure: MigrationConfig.() -> Unit) {
+    val config = MigrationConfig()
+    config.configure()
+    migrate(config)
+}

src/main/kotlin/com/infendro/migration/exception/DuplicateMigrationException.kt

@@ -2,4 +2,7 @@ package com.infendro.migration.exception
 
 class DuplicateMigrationException(
     val name: String,
-) : Exception()
+) : Exception() {
+    override val message: String
+        get() = """duplicate migration "$name""""
+}

src/main/kotlin/com/infendro/migration/model/Migration.kt

@@ -1,9 +1,9 @@
 package com.infendro.migration.model
 
-import org.jetbrains.exposed.dao.LongEntity
+import org.jetbrains.exposed.v1.core.dao.id.EntityID
-import org.jetbrains.exposed.dao.LongEntityClass
+import org.jetbrains.exposed.v1.core.dao.id.LongIdTable
-import org.jetbrains.exposed.dao.id.EntityID
+import org.jetbrains.exposed.v1.dao.LongEntity
-import org.jetbrains.exposed.dao.id.LongIdTable
+import org.jetbrains.exposed.v1.dao.LongEntityClass
 
 object MigrationTable : LongIdTable("migration", "id") {
     val name = text("name")

src/main/kotlin/com/infendro/migration/model/MigrationRepository.kt

@@ -1,22 +1,17 @@
 package com.infendro.migration.model
 
-import org.jetbrains.exposed.sql.transactions.transaction
+import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.v1.jdbc.transactions.transaction
 
 object MigrationRepository {
-    fun exists(
+    fun exists(name: String): Boolean = transaction {
-        name: String,
-    ): Boolean = transaction {
         MigrationEntity
             .find { MigrationTable.name eq name }
             .any()
     }
 
-    fun insert(
+    fun insert(name: String): Unit = transaction {
-        name: String,
-    ): Unit = transaction {
         MigrationEntity
-            .new {
+            .new { this.name = name }
-                this.name = name
-            }
     }
 }