fix #268 when using connection pools

Author: vincentlauvlwj

build.gradle

@@ -16,7 +16,7 @@ buildscript {
 
 allprojects {
     group = "org.ktorm"
-    version = "3.4.0"
+    version = "3.4.1"
 }
 
 subprojects { project ->

ktorm-core/src/main/kotlin/org/ktorm/schema/SqlTypes.kt

@@ -511,7 +511,7 @@ public class EnumSqlType<C : Enum<C>>(public val enumClass: Class<C>) : SqlType<
         if (parameter != null) {
             doSetParameter(ps, index, parameter)
         } else {
-            if (hasPostgresqlDriver && ps is PGStatement) {
+            if (hasPostgresqlDriver && ps.isWrapperFor(PGStatement::class.java)) {
                 ps.setNull(index, Types.OTHER)
             } else {
                 ps.setNull(index, Types.VARCHAR)
@@ -520,7 +520,7 @@ public class EnumSqlType<C : Enum<C>>(public val enumClass: Class<C>) : SqlType<
     }
 
     override fun doSetParameter(ps: PreparedStatement, index: Int, parameter: C) {
-        if (hasPostgresqlDriver && ps is PGStatement) {
+        if (hasPostgresqlDriver && ps.isWrapperFor(PGStatement::class.java)) {
             ps.setObject(index, parameter.name, Types.OTHER)
         } else {
             ps.setString(index, parameter.name)

ktorm-jackson/src/main/kotlin/org/ktorm/jackson/JsonSqlType.kt

@@ -88,7 +88,7 @@ public class JsonSqlType<T : Any>(
         if (parameter != null) {
             doSetParameter(ps, index, parameter)
         } else {
-            if (hasPostgresqlDriver && ps is PGStatement) {
+            if (hasPostgresqlDriver && ps.isWrapperFor(PGStatement::class.java)) {
                 ps.setNull(index, Types.OTHER)
             } else {
                 ps.setNull(index, Types.VARCHAR)
@@ -97,7 +97,7 @@ public class JsonSqlType<T : Any>(
     }
 
     override fun doSetParameter(ps: PreparedStatement, index: Int, parameter: T) {
-        if (hasPostgresqlDriver && ps is PGStatement) {
+        if (hasPostgresqlDriver && ps.isWrapperFor(PGStatement::class.java)) {
             val obj = PGobject()
             obj.type = "json"
             obj.value = objectMapper.writeValueAsString(parameter)

ktorm-support-postgresql/ktorm-support-postgresql.gradle

@@ -6,4 +6,8 @@ dependencies {
     testImplementation project(":ktorm-jackson")
     testImplementation "org.postgresql:postgresql:42.2.5"
     testImplementation "org.testcontainers:postgresql:1.15.1"
+    testImplementation "com.zaxxer:HikariCP:4.0.3"
+    testImplementation "com.mchange:c3p0:0.9.5.5"
+    testImplementation "org.apache.commons:commons-dbcp2:2.8.0"
+    testImplementation "com.alibaba:druid:1.2.6"
 }

ktorm-support-postgresql/src/test/kotlin/org/ktorm/support/postgresql/PostgreSqlTest.kt

@@ -1,5 +1,9 @@
 package org.ktorm.support.postgresql
 
+import com.alibaba.druid.pool.DruidDataSource
+import com.mchange.v2.c3p0.ComboPooledDataSource
+import com.zaxxer.hikari.HikariDataSource
+import org.apache.commons.dbcp2.BasicDataSource
 import org.hamcrest.CoreMatchers.equalTo
 import org.hamcrest.CoreMatchers.nullValue
 import org.hamcrest.MatcherAssert.assertThat
@@ -797,7 +801,59 @@ class PostgreSqlTest : BaseTest() {
     }
 
     @Test
-    fun testJson() {
+    fun testJsonWithDefaultConnection() {
+        testJson(database)
+    }
+
+    @Test
+    fun testJsonWithHikariCP() {
+        val ds = HikariDataSource()
+        ds.jdbcUrl = postgres.jdbcUrl
+        ds.driverClassName = postgres.driverClassName
+        ds.username = postgres.username
+        ds.password = postgres.password
+
+        val database = Database.connect(ds, logger = ConsoleLogger(threshold = LogLevel.TRACE))
+        testJson(database)
+    }
+
+    @Test
+    fun testJsonWithC3P0() {
+        val ds = ComboPooledDataSource()
+        ds.jdbcUrl = postgres.jdbcUrl
+        ds.driverClass = postgres.driverClassName
+        ds.user = postgres.username
+        ds.password = postgres.password
+
+        val database = Database.connect(ds, logger = ConsoleLogger(threshold = LogLevel.TRACE))
+        testJson(database)
+    }
+
+    @Test
+    fun testJsonWithDBCP() {
+        val ds = BasicDataSource()
+        ds.url = postgres.jdbcUrl
+        ds.driverClassName = postgres.driverClassName
+        ds.username = postgres.username
+        ds.password = postgres.password
+
+        val database = Database.connect(ds, logger = ConsoleLogger(threshold = LogLevel.TRACE))
+        testJson(database)
+    }
+
+    @Test
+    fun testJsonWithDruid() {
+        val ds = DruidDataSource()
+        ds.url = postgres.jdbcUrl
+        ds.driverClassName = postgres.driverClassName
+        ds.username = postgres.username
+        ds.password = postgres.password
+
+        val database = Database.connect(ds, logger = ConsoleLogger(threshold = LogLevel.TRACE))
+        testJson(database)
+    }
+
+    private fun testJson(database: Database) {
         val t = object : Table<Nothing>("t_json") {
             val obj = json<Employee>("obj")
             val arr = json<List<Int>>("arr")