-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
0cd6077
commit 56889c0
Showing
8 changed files
with
279 additions
and
2 deletions.
There are no files selected for viewing
21 changes: 21 additions & 0 deletions
21
demo_database/src/main/postgres/integration/V1.2.15__actors_json_seq.ddl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
/* | ||
* Copyright 2022 ABSA Group Limited | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
CREATE TABLE IF NOT EXISTS integration.actors_json_seq ( | ||
id SERIAL PRIMARY KEY, | ||
actors_json JSON[], | ||
actors_jsonb JSONB[] | ||
); |
23 changes: 23 additions & 0 deletions
23
demo_database/src/main/postgres/integration/V1.2.16__insert_actors_json.sql
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
/* | ||
* Copyright 2022 ABSA Group Limited | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
CREATE OR REPLACE FUNCTION integration.insert_actors_json(actorsJson JSON[], actorsJsonb JSONB[]) | ||
RETURNS void AS $$ | ||
BEGIN | ||
INSERT INTO integration.actors_json_seq (actors_json, actors_jsonb) | ||
VALUES (actorsJson, actorsJsonb); | ||
END; | ||
$$ LANGUAGE plpgsql; |
22 changes: 22 additions & 0 deletions
22
demo_database/src/main/postgres/integration/V1.2.17__retrieve_actors_json.sql
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
/* | ||
* Copyright 2022 ABSA Group Limited | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
CREATE OR REPLACE FUNCTION integration.retrieve_actors_json(idUntil INT) | ||
RETURNS TABLE(actors_json JSON[]) AS $$ | ||
BEGIN | ||
RETURN QUERY SELECT a.actors_json FROM integration.actors_json_seq AS a WHERE id <= idUntil; | ||
END; | ||
$$ LANGUAGE plpgsql; |
22 changes: 22 additions & 0 deletions
22
demo_database/src/main/postgres/integration/V1.2.18__retrieve_actors_jsonb.sql
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
/* | ||
* Copyright 2022 ABSA Group Limited | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
CREATE OR REPLACE FUNCTION integration.retrieve_actors_jsonb(idUntil INT) | ||
RETURNS TABLE(actors_jsonb JSONB[]) AS $$ | ||
BEGIN | ||
RETURN QUERY SELECT a.actors_jsonb FROM integration.actors_json_seq AS a WHERE id <= idUntil; | ||
END; | ||
$$ LANGUAGE plpgsql; |
96 changes: 96 additions & 0 deletions
96
doobie/src/main/scala/za/co/absa/db/fadb/doobie/postgres/implicits/package.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,96 @@ | ||
package za.co.absa.db.fadb.doobie.postgres | ||
|
||
import cats.Show | ||
import cats.data.NonEmptyList | ||
import doobie.postgres.implicits._ | ||
import doobie.{Get, Put} | ||
import io.circe.{Json => CirceJson} | ||
import org.postgresql.jdbc.PgArray | ||
import org.postgresql.util.PGobject | ||
import io.circe.parser._ | ||
|
||
import scala.util.Try | ||
|
||
package object implicits { | ||
|
||
private implicit val showPgArray: Show[PgArray] = Show.fromToString | ||
|
||
implicit val getMapWithOptionStringValues: Get[Map[String, Option[String]]] = Get[Map[String, String]] | ||
.tmap(map => map.map { case (k, v) => k -> Option(v) }) | ||
|
||
private def circeJsonListToPGJsonArrayString(jsonList: List[CirceJson]): String = { | ||
val arrayElements = jsonList.map { x => | ||
// Convert to compact JSON string and escape inner quotes | ||
val escapedJsonString = x.noSpaces.replace("\"", "\\\"") | ||
// Wrap in double quotes for the array element | ||
s""""$escapedJsonString"""" | ||
} | ||
|
||
arrayElements.mkString("{", ",", "}") | ||
} | ||
|
||
private def pgArrayToListOfCirceJson(pgArray: PgArray): Either[String, List[CirceJson]] = { | ||
Try { | ||
Option(pgArray.getArray) match { | ||
case Some(array: Array[_]) => array.collect { | ||
case str: String => parse(str).toTry.get | ||
case other => parse(other.toString).toTry.get | ||
}.toList | ||
case None => List.empty[CirceJson] | ||
case _ => throw new IllegalArgumentException("Unexpected type encountered.") | ||
} | ||
} | ||
.toEither | ||
.left.map(_.getMessage) | ||
} | ||
|
||
object Sequence { | ||
|
||
implicit val get: Get[Seq[String]] = Get[List[String]].map(_.toSeq) | ||
implicit val put: Put[Seq[String]] = Put[List[String]].contramap(_.toList) | ||
|
||
} | ||
|
||
object Json { | ||
|
||
implicit val jsonArrayPut: Put[List[CirceJson]] = { | ||
Put.Advanced | ||
.other[PGobject]( | ||
NonEmptyList.of("json[]") | ||
) | ||
.tcontramap { a => | ||
val o = new PGobject | ||
o.setType("json[]") | ||
o.setValue(circeJsonListToPGJsonArrayString(a)) | ||
o | ||
} | ||
} | ||
|
||
implicit val jsonArrayGet: Get[List[CirceJson]] = { | ||
Get.Advanced | ||
.other[PgArray]( | ||
NonEmptyList.of("json[]") | ||
) | ||
.temap(pgArray => pgArrayToListOfCirceJson(pgArray)) | ||
} | ||
|
||
} | ||
|
||
object Jsonb { | ||
|
||
implicit val jsonbArrayPut: Put[List[CirceJson]] = { | ||
Put.Advanced | ||
.other[PGobject]( | ||
NonEmptyList.of("jsonb[]") | ||
) | ||
.tcontramap { a => | ||
val o = new PGobject | ||
o.setType("jsonb[]") | ||
o.setValue(circeJsonListToPGJsonArrayString(a)) | ||
o | ||
} | ||
} | ||
|
||
} | ||
|
||
} |
75 changes: 75 additions & 0 deletions
75
doobie/src/test/scala/za/co/absa/db/fadb/doobie/JsonArrayTests.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,75 @@ | ||
/* | ||
* Copyright 2022 ABSA Group Limited | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package za.co.absa.db.fadb.doobie | ||
|
||
import cats.effect.IO | ||
import cats.effect.unsafe.implicits.global | ||
import doobie.implicits.toSqlInterpolator | ||
import io.circe.Json | ||
import io.circe.syntax.EncoderOps | ||
import org.scalatest.funsuite.AnyFunSuite | ||
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.implicits.Json.jsonArrayGet | ||
|
||
class JsonArrayTests extends AnyFunSuite with DoobieTest { | ||
|
||
class InsertActorsJson(implicit schema: DBSchema, dbEngine: DoobieEngine[IO]) | ||
extends DoobieSingleResultFunction[List[Actor], Unit, IO] ( | ||
values => { | ||
val actorsAsJsonList = values.map(_.asJson) | ||
Seq( | ||
{ | ||
import za.co.absa.db.fadb.doobie.postgres.implicits.Json.jsonArrayPut | ||
fr"$actorsAsJsonList" | ||
}, | ||
{ | ||
import za.co.absa.db.fadb.doobie.postgres.implicits.Jsonb.jsonbArrayPut | ||
fr"$actorsAsJsonList" | ||
} | ||
) | ||
} | ||
) | ||
|
||
class RetrieveActorsJson(implicit schema: DBSchema, dbEngine: DoobieEngine[IO]) | ||
extends DoobieMultipleResultFunction[Int, List[Json], IO] ( | ||
values => Seq(fr"$values") | ||
) | ||
|
||
class RetrieveActorsJsonb(implicit schema: DBSchema, dbEngine: DoobieEngine[IO]) | ||
extends DoobieMultipleResultFunction[Int, List[Json], IO] ( | ||
values => Seq(fr"$values") | ||
) | ||
|
||
private val insertActorsJson = new InsertActorsJson()(Integration, new DoobieEngine(transactor)) | ||
|
||
test("Retrieve Actors from json[] and jsonb[] columns"){ | ||
val expectedActors = List(Actor(1, "John", "Doe"), Actor(2, "Jane", "Doe")) | ||
insertActorsJson(expectedActors).unsafeRunSync() | ||
|
||
val retrieveActorsJson = new RetrieveActorsJson()(Integration, new DoobieEngine(transactor)) | ||
val actualActorsJson = retrieveActorsJson(2).unsafeRunSync() | ||
assert(expectedActors == actualActorsJson.head.map(_.as[Actor]).map(_.toTry.get)) | ||
|
||
val retrieveActorsJsonb = new RetrieveActorsJsonb()(Integration, new DoobieEngine(transactor)) | ||
val actualActorsJsonb = retrieveActorsJsonb(2).unsafeRunSync() | ||
assert(expectedActors == actualActorsJsonb.head.map(_.as[Actor]).map(_.toTry.get)) | ||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters