-
Notifications
You must be signed in to change notification settings - Fork 0
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
json array implicits for doobie #132
Changes from 11 commits
56889c0
f16a2ff
aa24a0a
487d18c
bfb5d70
e8d8372
f0cb4a6
5493ab5
e425aff
f7b6bdd
b02ef12
4f516ab
d255f6e
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
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[] | ||
); |
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; |
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; |
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; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I like the |
||
END; | ||
$$ LANGUAGE plpgsql; |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,97 @@ | ||
/* | ||
* 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.postgres.circe | ||
|
||
import cats.Show | ||
import cats.data.NonEmptyList | ||
import doobie.{Get, Put} | ||
import io.circe.Json | ||
import org.postgresql.jdbc.PgArray | ||
import org.postgresql.util.PGobject | ||
import io.circe.parser._ | ||
|
||
import scala.util.{Failure, Success, Try} | ||
|
||
package object implicits { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. also, what about JSON/JSONB put and get? (these here are List of JSON/JSONB, so I'm talking about the non-array variant) There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. the non-array variant is already available, see the docs https://github.com/tpolecat/doobie/blob/v1.0.0-RC2/modules/docs/src/main/mdoc/docs/15-Extensions-PostgreSQL.md There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. hmm okay! Thanks There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I've made it available also in the implicits object so we can import everything from the same place. |
||
|
||
private implicit val showPgArray: Show[PgArray] = Show.fromToString | ||
|
||
implicit val jsonArrayPut: Put[List[Json]] = { | ||
Put.Advanced | ||
.other[PGobject]( | ||
NonEmptyList.of("json[]") | ||
) | ||
.tcontramap { a => | ||
val o = new PGobject | ||
o.setType("json[]") | ||
o.setValue(jsonListToPGJsonArrayString(a)) | ||
o | ||
} | ||
} | ||
|
||
implicit val jsonbArrayPut: Put[List[Json]] = { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. what about JSONB get utils? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It seems to work for both :D There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. really? because the GET implements implicit val jsonArrayGet: Get[List[Json]] = {
Get.Advanced
.other[PgArray](
NonEmptyList.of("json[]")
)
.temap(pgArray => pgArrayToListOfJson(pgArray))
} perhaps for the sake of consistency in the naming we should either: implement the second one with There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. or just something like this :D implicit val jsonbArrayGet: Get[List[Json]] = jsonArrayGet There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I would just mention it in the comments (documentation) of the classes. Which btw, is missing somewhat 👼 There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. discussed on a call There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. implemented like this after discussion on a call // to be used for both json[] and jsonb[] as it handles well both and we want to avoid collision
// when resolving implicits
implicit val jsonOrJsonbArrayGet: Get[List[Json]] = {
Get.Advanced
.other[PgArray](
NonEmptyList.of("json[]")
)
.temap(pgArray => pgArrayToListOfJson(pgArray))
} There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Somwhat longer but acceptable, IMHO. |
||
Put.Advanced | ||
.other[PGobject]( | ||
NonEmptyList.of("jsonb[]") | ||
) | ||
.tcontramap { a => | ||
val o = new PGobject | ||
o.setType("jsonb[]") | ||
o.setValue(jsonListToPGJsonArrayString(a)) | ||
o | ||
} | ||
} | ||
|
||
// to be used for both json[] and jsonb[] as it handles well both and we want to avoid collision | ||
// when resolving 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 | ||
val escapedJsonString = x.noSpaces.replace("\"", "\\\"") | ||
// Wrap in double quotes for the array element | ||
s""""$escapedJsonString"""" | ||
} | ||
|
||
arrayElements.mkString("{", ",", "}") | ||
} | ||
|
||
private def pgArrayToListOfJson(pgArray: PgArray): Either[String, List[Json]] = { | ||
Try(Option(pgArray.getArray)) match { | ||
case Success(Some(array: Array[_])) => | ||
val results = array.toList.map { | ||
case str: String => parse(str).left.map(_.getMessage) | ||
case other => parse(other.toString).left.map(_.getMessage) | ||
} | ||
results.partition(_.isLeft) match { | ||
case (Nil, rights) => Right(rights.collect { case Right(json) => json }) | ||
case (lefts, _) => Left("Failed to parse JSON: " + lefts.collect { case Left(err) => err }.mkString(", ")) | ||
} | ||
case Success(Some(_)) => Left("Unexpected type encountered. Expected an Array.") | ||
case Success(None) => Right(Nil) | ||
case Failure(exception) => Left(exception.getMessage) | ||
} | ||
} | ||
|
||
} |
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.circe.implicits.jsonOrJsonbArrayGet | ||
|
||
class JsonArrayIntegrationTests 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.circe.implicits.jsonArrayPut | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Isn't it enough now, to import once and on the top level? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It would be enough to import it once on the top of the file alongside other imports had we had only json[] or jsonb[]. In this case though we have both and given the way implicits are resolved by their types the compiler is unable to figure out which one to use. That's why in this particular case the imports have to be scope using the curly braces for individual query fragments. Maybe that's also the reason why doobie doesn't support the array variants by default... There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Ooh, I missed that they a different import (the one letter difference). 😊 |
||
fr"$actorsAsJsonList" | ||
}, | ||
{ | ||
import za.co.absa.db.fadb.doobie.postgres.circe.implicits.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)) | ||
} | ||
|
||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for this fix, good boy scout 👍