flecomte/postgres-json
1
1
Fork 0
Code Issues 10 Pull Requests 2 Actions Packages Projects Releases 2 Wiki Activity

feature #9: add lock on execute migration

Browse Source
This commit is contained in:
Fabrice Lecomte
2019-07-05 21:09:07 +02:00
parent 9c02fd21ca
commit 6dc5e611aa
4 changed files with 48 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.idea/.gitignore generated vendored
View File

@@ -6,3 +6,4 @@
/compiler.xml
/uiDesigner.xml
/dataSources.xml
/sonarlint/

27
src/main/kotlin/fr/postgresjson/migration/Migrations.kt
View File

@@ -159,7 +159,13 @@ class Migrations(directory: File, private val connection: Connection) {
}
}
fun up(): Map<String, Status> {
private fun lock() {
File(this::class.java.getResource("/sql/migration/lockMigrationTables.sql").toURI()).let {
connection.connect().sendQuery(it.readText()).join()
}
}
internal fun up(): Map<String, Status> {
val list: MutableMap<String, Status> = mutableMapOf()
queries.forEach {
it.value.let { query ->
@@ -184,7 +190,7 @@ class Migrations(directory: File, private val connection: Connection) {
return list.toMap()
}
fun down(force: Boolean = false): Map<String, Status> {
internal fun down(force: Boolean = false): Map<String, Status> {
val list: MutableMap<String, Status> = mutableMapOf()
queries.forEach {
it.value.let { query ->
@@ -209,6 +215,23 @@ class Migrations(directory: File, private val connection: Connection) {
return list.toMap()
}
fun run(): Map<Pair<String, Direction>, Status> {
val list: MutableMap<Pair<String, Direction>, Status> = mutableMapOf()
connection.connect().apply {
sendQuery("BEGIN").join()
lock()
up().map {
list[Pair(it.key, Direction.UP)] = it.value
}
down(true).map {
list[Pair(it.key, Direction.DOWN)] = it.value
}
sendQuery("COMMIT").join()
}
return list.toMap()
}
fun test(): Map<Pair<String, Direction>, Status> {
val list: MutableMap<Pair<String, Direction>, Status> = mutableMapOf()
connection.connect().apply {

5
src/main/resources/sql/migration/lockMigrationTables.sql Normal file
View File

@@ -0,0 +1,5 @@
LOCK TABLE
migration.history,
migration.functions
IN ACCESS EXCLUSIVE MODE
NOWAIT

22
src/test/kotlin/fr/postgresjson/MigrationTest.kt
View File

@@ -16,9 +16,9 @@ class MigrationTest(): TestAbstract() {
fun upQuery() {
val resources = File(this::class.java.getResource("/sql/migrations").toURI())
val m = Migrations(resources, getConnextion())
m.up().let {
it `should contain` Pair("1", Migration.Status.OK)
it.size `should be equal to` 1
m.up().apply {
this `should contain` Pair("1", Migration.Status.OK)
size `should be equal to` 1
}
m.up().size `should be equal to` 0
@@ -37,9 +37,9 @@ class MigrationTest(): TestAbstract() {
val resources = File(this::class.java.getResource("/sql/migrations").toURI())
val m = Migrations(resources, getConnextion())
repeat(3) {
m.down(true).let {
it `should contain` Pair("1", Migration.Status.OK)
it.size `should be equal to` 1
m.down(true).apply {
this `should contain` Pair("1", Migration.Status.OK)
size `should be equal to` 1
}
}
}
@@ -54,4 +54,14 @@ class MigrationTest(): TestAbstract() {
test().size `should be equal to` 2
}
}
@Test
fun `test run migrations`() {
val resources = File(this::class.java.getResource("/sql/real_migrations").toURI())
Migrations(resources, getConnextion()).apply {
run().apply {
size `should be equal to` 2
}
}
}
}