diff --git a/settings.gradle.kts b/settings.gradle.kts index 4d00214..1611c78 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,5 +1,4 @@ plugins { id("org.gradle.toolchains.foojay-resolver-convention") version "0.5.0" } -//var REPO_NAME = "template" -rootProject.name = "${REPO_NAME}" +rootProject.name = "{{.RepoName}}" diff --git a/src/jvmMain/kotlin/tmpl/Main.kt b/src/jvmMain/kotlin/tmpl/Main.kt index 3133194..c3cb028 100644 --- a/src/jvmMain/kotlin/tmpl/Main.kt +++ b/src/jvmMain/kotlin/tmpl/Main.kt @@ -25,7 +25,7 @@ fun main() { Class.forName("nl.astraeus.jdbc.Driver") Database.initialize(HikariConfig().apply { driverClassName = "nl.astraeus.jdbc.Driver" - jdbcUrl = "jdbc:stat:webServerPort=6001:jdbc:sqlite:data/${REPO_NAME}.db" + jdbcUrl = "jdbc:stat:webServerPort=6001:jdbc:sqlite:data/{{.RepoName}}.db" username = "sa" password = "" maximumPoolSize = 25 diff --git a/src/jvmMain/kotlin/tmpl/db/Database.kt b/src/jvmMain/kotlin/tmpl/db/Database.kt index b00ec1f..eec7b94 100644 --- a/src/jvmMain/kotlin/tmpl/db/Database.kt +++ b/src/jvmMain/kotlin/tmpl/db/Database.kt @@ -18,12 +18,6 @@ fun transaction( if (!hasConnection) { currentConnection.set(Database.getConnection()) -/* - } else if (scope == TxScope.REQUIRES_NEW) { - oldConnection = currentConnection.get() - - currentConnection.set(Database.getConnection()) -*/ } val connection = currentConnection.get() @@ -76,26 +70,4 @@ object Database { ds?.close() } - init { - val properties = Properties() - properties["journal_mode"] = "WAL" - - val config = HikariConfig().apply { - driverClassName = "nl.astraeus.jdbc.Driver" - jdbcUrl = "jdbc:stat:webServerPort=6001:jdbc:sqlite:data/daw3.db" - username = "sa" - password = "" - maximumPoolSize = 25 - isAutoCommit = false - dataSourceProperties = properties - validate() - } - - config.addDataSourceProperty("cachePrepStmts", "true") - config.addDataSourceProperty("prepStmtCacheSize", "250") - config.addDataSourceProperty("prepStmtCacheSqlLimit", "2048") - - ds = HikariDataSource(config) - } - }