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

refactoring: symplify generics

Browse Source
This commit is contained in:
Fabrice Lecomte
2019-07-15 22:32:41 +02:00
parent e6b8e66b28
commit ea4dac5d97
7 changed files with 45 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/kotlin/fr/postgresjson/migration/Function.kt
View File

@@ -38,7 +38,7 @@ data class Function(
connection.exec(up.script)
File(this::class.java.getResource("/sql/migration/insertFunction.sql").toURI()).let {
connection.selectOne<String, MigrationEntity?>(it.readText(), listOf(up))?.let { function ->
connection.selectOne<MigrationEntity>(it.readText(), listOf(up))?.let { function ->
executedAt = function.executedAt
doExecute = Action.OK
}

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

@@ -59,14 +59,14 @@ data class Migrations private constructor(
*/
private fun getMigrationFromDB() {
File(this::class.java.getResource("/sql/migration/findAllFunction.sql").toURI()).let {
connection.select<String, List<MigrationEntity?>>(it.readText())
connection.select<List<MigrationEntity>>(it.readText())
.filterNotNull().map { function ->
functions[function.filename] = Function(function.up, function.down, connection, function.executedAt)
}
}
File(this::class.java.getResource("/sql/migration/findAllHistory.sql").toURI()).let {
connection.select<String, List<MigrationEntity?>>(it.readText())
connection.select<List<MigrationEntity>>(it.readText())
.filterNotNull().map { query ->
queries[query.filename] = Query(query.filename, query.up, query.down, connection, query.executedAt)
}

2
src/main/kotlin/fr/postgresjson/migration/Query.kt
View File

@@ -19,7 +19,7 @@ data class Query(
connection.exec(up).join()
File(this::class.java.getResource("/sql/migration/insertHistory.sql").toURI()).let {
connection.selectOne<String, MigrationEntity?>(it.readText(), listOf(name, up, down))?.let { query ->
connection.selectOne<MigrationEntity>(it.readText(), listOf(name, up, down))?.let { query ->
executedAt = query.executedAt
doExecute = Action.OK
}