Merge branch 'feature/13-queryresultrow-conversion-for-product-types'…

… of https://github.com/AbsaOSS/balta into feature/13-queryresultrow-conversion-for-product-types
AbsaOSS · Oct 4, 2024 · 87177d8 · 87177d8
2 parents fa0d06d + 8c9fcd4
commit 87177d8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/balta/src/main/scala/za/co/absa/db/balta/classes/setter/AllowedParamTypes.scala b/balta/src/main/scala/za/co/absa/db/balta/classes/setter/AllowedParamTypes.scala
@@ -16,7 +16,7 @@
 
 package za.co.absa.db.balta.classes.setter
 
-import za.co.absa.db.balta.classes.simple.JsonBString
+import za.co.absa.db.balta.classes.simple.{JsonBString, SimpleJsonString}
 
 import java.time.{Instant, LocalDate, LocalTime, OffsetDateTime}
 import java.util.UUID
@@ -52,6 +52,8 @@ object AllowedParamTypes {
 
   implicit object JsonBParamType extends AllowedParamTypes[JsonBString]
 
+  implicit object SimpleJsonStringParamType extends AllowedParamTypes[SimpleJsonString]
+
   implicit object InstantParamType extends AllowedParamTypes[Instant]
 
   implicit object OffsetDateTimeParamType extends AllowedParamTypes[OffsetDateTime]

diff --git a/balta/src/main/scala/za/co/absa/db/balta/classes/setter/SetterFnc.scala b/balta/src/main/scala/za/co/absa/db/balta/classes/setter/SetterFnc.scala
@@ -19,7 +19,7 @@ package za.co.absa.db.balta.classes.setter
 import java.sql.{Date, PreparedStatement, Time, Types => SqlTypes}
 import java.util.UUID
 import org.postgresql.util.PGobject
-import za.co.absa.db.balta.classes.simple.JsonBString
+import za.co.absa.db.balta.classes.simple.{JsonBString, SimpleJsonString}
 
 import java.time.{Instant, LocalDate, LocalTime, OffsetDateTime, ZoneOffset}
 
@@ -50,7 +50,8 @@ object SetterFnc {
       case ch: Char                    => simple((prep: PreparedStatement, position: Int) => {prep.setString(position, ch.toString)})
       case s: String                   => simple((prep: PreparedStatement, position: Int) => {prep.setString(position, s)})
       case u: UUID                     => new UuidSetterFnc(u)
-      case js: JsonBString             => new JsonBSetterFnc(js)
+      case js: JsonBString             => new JsonSetterFnc(js.value)
+      case js: SimpleJsonString        => new JsonSetterFnc(js.value)
       case i: Instant                  => simple((prep: PreparedStatement, position: Int) => {prep.setObject(position, OffsetDateTime.ofInstant(i, ZoneOffset.UTC))})
       case ts: OffsetDateTime          => simple((prep: PreparedStatement, position: Int) => {prep.setObject(position, ts)})
       case lt: LocalTime               => simple((prep: PreparedStatement, position: Int) => {prep.setTime(position, Time.valueOf(lt))})
@@ -73,10 +74,10 @@ object SetterFnc {
     }
   }
 
-  private class JsonBSetterFnc(value: JsonBString) extends SetterFnc {
+  private class JsonSetterFnc(jsonString: String) extends SetterFnc {
     private val jsonObject = new PGobject()
     jsonObject.setType("jsonb")
-    jsonObject.setValue(value.value)
+    jsonObject.setValue(jsonString)
 
     def apply(prep: PreparedStatement, position: Int): Unit = {
       prep.setObject(position, jsonObject)