diff --git a/doobie/src/main/scala/za/co/absa/db/fadb/doobie/postgres/circe/implicits/package.scala b/doobie/src/main/scala/za/co/absa/db/fadb/doobie/postgres/circe/implicits/package.scala index b74fe59..eb04d61 100644 --- a/doobie/src/main/scala/za/co/absa/db/fadb/doobie/postgres/circe/implicits/package.scala +++ b/doobie/src/main/scala/za/co/absa/db/fadb/doobie/postgres/circe/implicits/package.scala @@ -43,14 +43,6 @@ package object implicits { } } - implicit val jsonArrayGet: Get[List[Json]] = { - Get.Advanced - .other[PgArray]( - NonEmptyList.of("json[]") - ) - .temap(pgArray => pgArrayToListOfJson(pgArray)) - } - implicit val jsonbArrayPut: Put[List[Json]] = { Put.Advanced .other[PGobject]( @@ -64,6 +56,14 @@ package object implicits { } } + implicit val jsonOrJsonbArrayGet: Get[List[Json]] = { + Get.Advanced + .other[PgArray]( + NonEmptyList.of("json[]") + ) + .temap(pgArray => pgArrayToListOfJson(pgArray)) + } + private def jsonListToPGJsonArrayString(jsonList: List[Json]): String = { val arrayElements = jsonList.map { x => // Convert to compact JSON string and escape inner quotes diff --git a/doobie/src/test/scala/za/co/absa/db/fadb/doobie/JsonArrayIntegrationTests.scala b/doobie/src/test/scala/za/co/absa/db/fadb/doobie/JsonArrayIntegrationTests.scala index 4e79dd9..237a92d 100644 --- a/doobie/src/test/scala/za/co/absa/db/fadb/doobie/JsonArrayIntegrationTests.scala +++ b/doobie/src/test/scala/za/co/absa/db/fadb/doobie/JsonArrayIntegrationTests.scala @@ -26,7 +26,7 @@ import za.co.absa.db.fadb.DBSchema import za.co.absa.db.fadb.doobie.DoobieFunction.{DoobieMultipleResultFunction, DoobieSingleResultFunction} import za.co.absa.db.fadb.testing.classes.DoobieTest -import za.co.absa.db.fadb.doobie.postgres.circe.implicits.jsonArrayGet +import za.co.absa.db.fadb.doobie.postgres.circe.implicits.jsonOrJsonbArrayGet class JsonArrayIntegrationTests extends AnyFunSuite with DoobieTest {