Added database properties to configuration (#25)

* Added database properties to configuration

* Gradle fix for non-target network

gradle/libs.versions.toml

@@ -1,20 +1,20 @@
 [versions]
-kotlin = "1.8.10"
+kotlin = "1.9.0"
 
 kotlinLogging = "3.0.5"
 
-versionsPlugin = "0.46.0"
+versionsPlugin = "0.47.0"
 nexusPublishPlugin = "1.3.0"
 
 hikariCP = "5.0.1"
 healthMonitorInterface = "1.2.0"
 
 jupiter = "5.9.2"
-kotest = "5.5.5"
-mockk = "1.13.4"
-testContainers = "1.17.6"
-postgresql = "42.5.4"
-h2 = "2.1.214"
+kotest = "5.6.2"
+mockk = "1.13.5"
+testContainers = "1.18.3"
+postgresql = "42.6.0"
+h2 = "2.2.220"
 
 [libraries]
 kotlinLogging = { module = "io.github.microutils:kotlin-logging-jvm", version.ref = "kotlinLogging" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,22 +130,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,6 +197,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in
@@ -205,6 +213,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

src/main/kotlin/com/target/liteforjdbc/DataSourceProperty.kt

@@ -0,0 +1,6 @@
+package com.target.liteforjdbc
+
+data class DataSourceProperty(
+    val propertyName: String,
+    val propertyValue: String,
+)

src/main/kotlin/com/target/liteforjdbc/DbConfig.kt

@@ -21,4 +21,5 @@ data class DbConfig(
     val maxLifetime: Long = 300_000,
     val minimumIdle: Int = 1,
     val maximumPoolSize: Int = 5,
+    val dataSourceProperties: List<DataSourceProperty> = listOf(),
 )

src/main/kotlin/com/target/liteforjdbc/HikariDataSourceBuilder.kt

@@ -23,5 +23,11 @@ fun buildHikariDataSource(config: DbConfig): HikariDataSource {
     dataSource.username = config.username
     dataSource.password = config.password
 
+    config.dataSourceProperties.forEach { dataSourceProperty ->
+        dataSourceProperty.apply {
+            dataSource.addDataSourceProperty(propertyName, propertyValue)
+        }
+    }
+
     return dataSource
 }

src/test/kotlin/com/target/liteforjdbc/HikariDataSourceFactoryTest.kt

@@ -19,7 +19,11 @@ class HikariDataSourceFactoryTest {
             keepAliveTime = 3000,
             maxLifetime = 4000,
             minimumIdle = 1,
-            maximumPoolSize = 10
+            maximumPoolSize = 10,
+            dataSourceProperties = listOf(
+                DataSourceProperty("propName", "propValue"),
+                DataSourceProperty("otherPropName", "otherPropValue")
+            )
         )
 
         val result = buildHikariDataSource(config)
@@ -34,6 +38,9 @@ class HikariDataSourceFactoryTest {
 
         result.username shouldBe "user"
         result.password shouldBe "password"
+        result.dataSourceProperties.size shouldBe 2
+        result.dataSourceProperties.getProperty("propName") shouldBe "propValue"
+        result.dataSourceProperties.getProperty("otherPropName") shouldBe "otherPropValue"
     }
 
 }