From 41b85d2461e4b921cefacbdde8a45334d65b42b9 Mon Sep 17 00:00:00 2001 From: Karel Fajkus Date: Tue, 23 Feb 2021 12:26:40 +0100 Subject: [PATCH 1/2] added autoCommit flag to hikari config --- .../main/scala/com/avast/sst/doobie/DoobieHikariConfig.scala | 3 ++- .../main/scala/com/avast/sst/doobie/DoobieHikariModule.scala | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/doobie-hikari/src/main/scala/com/avast/sst/doobie/DoobieHikariConfig.scala b/doobie-hikari/src/main/scala/com/avast/sst/doobie/DoobieHikariConfig.scala index f592638cd..afd090be7 100644 --- a/doobie-hikari/src/main/scala/com/avast/sst/doobie/DoobieHikariConfig.scala +++ b/doobie-hikari/src/main/scala/com/avast/sst/doobie/DoobieHikariConfig.scala @@ -24,5 +24,6 @@ final case class DoobieHikariConfig( registerMBeans: Boolean = false, validationTimeout: Option[FiniteDuration] = None, transactionIsolation: Option[TransactionIsolation] = None, - dataSourceProperties: Map[String, String] = Map.empty + dataSourceProperties: Map[String, String] = Map.empty, + autoCommit: Boolean = true ) diff --git a/doobie-hikari/src/main/scala/com/avast/sst/doobie/DoobieHikariModule.scala b/doobie-hikari/src/main/scala/com/avast/sst/doobie/DoobieHikariModule.scala index d8cce1a3e..20707beec 100644 --- a/doobie-hikari/src/main/scala/com/avast/sst/doobie/DoobieHikariModule.scala +++ b/doobie-hikari/src/main/scala/com/avast/sst/doobie/DoobieHikariModule.scala @@ -59,6 +59,7 @@ object DoobieHikariModule { c.setAllowPoolSuspension(config.allowPoolSuspension) c.setIsolateInternalQueries(config.isolateInternalQueries) c.setRegisterMbeans(config.registerMBeans) + c.setAutoCommit(config.autoCommit) val dataSourceProperties = new Properties() config.dataSourceProperties.foreach { case (k, v) => dataSourceProperties.put(k, v) } c.setDataSourceProperties(dataSourceProperties) From d0fcbf332858033df649c0ea4bb7c1a7cc34a53e Mon Sep 17 00:00:00 2001 From: Karel Fajkus Date: Tue, 23 Feb 2021 14:35:20 +0100 Subject: [PATCH 2/2] changed default value to false --- .../main/scala/com/avast/sst/doobie/DoobieHikariConfig.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doobie-hikari/src/main/scala/com/avast/sst/doobie/DoobieHikariConfig.scala b/doobie-hikari/src/main/scala/com/avast/sst/doobie/DoobieHikariConfig.scala index afd090be7..f1b30f55a 100644 --- a/doobie-hikari/src/main/scala/com/avast/sst/doobie/DoobieHikariConfig.scala +++ b/doobie-hikari/src/main/scala/com/avast/sst/doobie/DoobieHikariConfig.scala @@ -25,5 +25,5 @@ final case class DoobieHikariConfig( validationTimeout: Option[FiniteDuration] = None, transactionIsolation: Option[TransactionIsolation] = None, dataSourceProperties: Map[String, String] = Map.empty, - autoCommit: Boolean = true + autoCommit: Boolean = false )