From b70230fd4cf972bae3177a0025dafe52f653cd5c Mon Sep 17 00:00:00 2001 From: Fabrice Lecomte Date: Wed, 14 Jul 2021 23:45:10 +0200 Subject: [PATCH] remove useless Migration.status() --- .../kotlin/fr/postgresjson/migration/Function.kt | 12 +----------- .../fr/postgresjson/migration/MigrationScript.kt | 12 +----------- .../kotlin/fr/postgresjson/migration/Migrations.kt | 1 - src/test/kotlin/fr/postgresjson/RequesterTest.kt | 10 ++++++++++ 4 files changed, 12 insertions(+), 23 deletions(-) diff --git a/src/main/kotlin/fr/postgresjson/migration/Function.kt b/src/main/kotlin/fr/postgresjson/migration/Function.kt index 71c5a3e..7395f54 100644 --- a/src/main/kotlin/fr/postgresjson/migration/Function.kt +++ b/src/main/kotlin/fr/postgresjson/migration/Function.kt @@ -71,17 +71,7 @@ data class Function( it.sendQuery("ROLLBACK") }.join() - return Status.OK // TODO - } - - override fun status(): Status { - connection.inTransaction { - up() - down() - it.sendQuery("ROLLBACK") - }.join() - - return Status.OK // TODO + return Status.OK } fun copy(): Function { diff --git a/src/main/kotlin/fr/postgresjson/migration/MigrationScript.kt b/src/main/kotlin/fr/postgresjson/migration/MigrationScript.kt index 80a72c2..fccd0dd 100644 --- a/src/main/kotlin/fr/postgresjson/migration/MigrationScript.kt +++ b/src/main/kotlin/fr/postgresjson/migration/MigrationScript.kt @@ -44,17 +44,7 @@ data class MigrationScript( it.sendQuery("ROLLBACK") }.join() - return Migration.Status.OK // TODO - } - - override fun status(): Migration.Status { - connection.inTransaction { - up() - down() - it.sendQuery("ROLLBACK") - }.join() - - return Migration.Status.OK // TODO + return Migration.Status.OK } fun copy(): MigrationScript { diff --git a/src/main/kotlin/fr/postgresjson/migration/Migrations.kt b/src/main/kotlin/fr/postgresjson/migration/Migrations.kt index 984fe0a..751018f 100644 --- a/src/main/kotlin/fr/postgresjson/migration/Migrations.kt +++ b/src/main/kotlin/fr/postgresjson/migration/Migrations.kt @@ -28,7 +28,6 @@ interface Migration { fun up(): Status fun down(): Status fun test(): Status - fun status(): Status enum class Status(i: Int) { OK(2), UP_FAIL(0), DOWN_FAIL(1) } enum class Action { OK, UP, DOWN } diff --git a/src/test/kotlin/fr/postgresjson/RequesterTest.kt b/src/test/kotlin/fr/postgresjson/RequesterTest.kt index 7522c3b..0879d90 100644 --- a/src/test/kotlin/fr/postgresjson/RequesterTest.kt +++ b/src/test/kotlin/fr/postgresjson/RequesterTest.kt @@ -45,6 +45,16 @@ class RequesterTest : TestAbstract() { assertEquals("DeleteTest", name) } + @Test + fun `function toString`() { + val resources = this::class.java.getResource("/sql/function/Test").toURI() + val name: String = Requester(connection, functionsDirectory = resources) + .getFunction("test_function") + .toString() + + assertEquals("test_function", name) + } + @Test fun `add function as string`() { val sql = """