Drop function if already exists and conflict
This commit is contained in:
@@ -1,9 +1,11 @@
|
||||
package fr.postgresjson.migration
|
||||
|
||||
import com.github.jasync.sql.db.postgresql.exceptions.GenericDatabaseException
|
||||
import fr.postgresjson.connexion.Connection
|
||||
import fr.postgresjson.migration.Migration.Action
|
||||
import fr.postgresjson.migration.Migration.Status
|
||||
import java.util.*
|
||||
import java.util.concurrent.CompletionException
|
||||
import fr.postgresjson.definition.Function as DefinitionFunction
|
||||
|
||||
data class Function(
|
||||
@@ -34,7 +36,15 @@ data class Function(
|
||||
)
|
||||
|
||||
override fun up(): Status {
|
||||
connection.sendQuery(up.script)
|
||||
try {
|
||||
connection.sendQuery(up.script)
|
||||
} catch (e: CompletionException) {
|
||||
val cause = e.cause
|
||||
if (cause is GenericDatabaseException && cause.errorMessage.fields['C'] == "42P13") {
|
||||
connection.sendQuery("drop function ${down.getDefinition()}")
|
||||
connection.sendQuery(up.script)
|
||||
}
|
||||
}
|
||||
|
||||
this::class.java.classLoader.getResource("sql/migration/insertFunction.sql")!!.readText().let {
|
||||
connection.selectOne<MigrationEntity>(it, listOf(up.name, up.getDefinition(), up.script, down.script))?.let { function ->
|
||||
|
||||
@@ -137,7 +137,8 @@ data class Migrations private constructor(
|
||||
fun addFunction(newDefinition: DefinitionFunction, callback: (Function) -> Unit = {}): Migrations {
|
||||
val currentFunction = functions[newDefinition.name]
|
||||
if (currentFunction === null || currentFunction `is different from` newDefinition) {
|
||||
functions[newDefinition.name] = Function(newDefinition, newDefinition, connection).apply {
|
||||
val oldDefinition = functions[newDefinition.name]?.up ?: newDefinition
|
||||
functions[newDefinition.name] = Function(newDefinition, oldDefinition, connection).apply {
|
||||
doExecute = Action.UP
|
||||
}
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user