Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Add 'format' function to PostgresModule #184 #415

Merged
merged 3 commits into from
Apr 26, 2021
Merged

Add 'format' function to PostgresModule #184 #415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6aec4a2
Add 'format' function to PostgresModule #184
TobiasPfeifer Mar 28, 2021
b1671e5
fix formatting
TobiasPfeifer Mar 28, 2021
74af977
Merge branch 'master' into feature/postgres-format-function
jczuchnowski Apr 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions postgres/src/main/scala/zio/sql/postgresql/PostgresModule.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,12 @@ trait PostgresModule extends Jdbc { self =>
FunctionDef[Timestampz, Timestampz](FunctionName("make_timestamptz"))
val Encode = FunctionDef[(Chunk[Byte], String), String](FunctionName("encode"))
val Decode = FunctionDef[(String, String), Chunk[Byte]](FunctionName("decode"))
val Format0 = FunctionDef[String, String](FunctionName("format")) // TODO: varargs
val Format1 = FunctionDef[(String, Any), String](FunctionName("format"))
val Format2 = FunctionDef[(String, Any, Any), String](FunctionName("format"))
val Format3 = FunctionDef[(String, Any, Any, Any), String](FunctionName("format"))
val Format4 = FunctionDef[(String, Any, Any, Any, Any), String](FunctionName("format"))
val Format5 = FunctionDef[(String, Any, Any, Any, Any, Any), String](FunctionName("format"))
}

override def renderRead(read: self.Read[_]): String = {
Expand Down
121 changes: 119 additions & 2 deletions postgres/src/test/scala/zio/sql/postgresql/FunctionDefSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,124 @@ object FunctionDefSpec extends PostgresRunnableSpec with ShopSchema {
} yield assert(r.head)(equalTo(expected))

assertion.mapErrorCause(cause => Cause.stackless(cause.untraced))
}
},
suite("format function")(
testM("format0") {
import Expr._

val query = select(Format0("Person")) from customers

val expected = Seq(
"Person",
"Person",
"Person",
"Person",
"Person"
)

val testResult = execute(query.to[String, String](identity))
collectAndCompare(expected, testResult)
},
testM("format1") {
import Expr._

val query = select(Format1("Person: %s", Customers.fName)) from customers

val expected = Seq(
"Person: Ronald",
"Person: Terrence",
"Person: Mila",
"Person: Alana",
"Person: Jose"
)

val testResult = execute(query.to[String, String](identity))
collectAndCompare(expected, testResult)
},
testM("format2") {
import Expr._

val query = select(Format2("Person: %s %s", Customers.fName, Customers.lName)) from customers

val expected = Seq(
"Person: Ronald Russell",
"Person: Terrence Noel",
"Person: Mila Paterso",
"Person: Alana Murray",
"Person: Jose Wiggins"
)

val testResult = execute(query.to[String, String](identity))
collectAndCompare(expected, testResult)
},
testM("format3") {
import Expr._

val query = select(
Format3("Person: %s %s with double quoted %I ", Customers.fName, Customers.lName, "identi fier")
) from customers

val expected = Seq(
s"""Person: Ronald Russell with double quoted "identi fier" """,
s"""Person: Terrence Noel with double quoted "identi fier" """,
s"""Person: Mila Paterso with double quoted "identi fier" """,
s"""Person: Alana Murray with double quoted "identi fier" """,
s"""Person: Jose Wiggins with double quoted "identi fier" """
)

val testResult = execute(query.to[String, String](identity))
collectAndCompare(expected, testResult)
},
testM("format4") {
import Expr._

val query = select(
Format4(
"Person: %s %s with null-literal %L and non-null-literal %L ",
Customers.fName,
Customers.lName,
"FIXME: NULL",
"literal"
)
) from customers

val expected = Seq(
s"""Person: Ronald Russell with null-literal 'FIXME: NULL' and non-null-literal 'literal' """,
s"""Person: Terrence Noel with null-literal 'FIXME: NULL' and non-null-literal 'literal' """,
s"""Person: Mila Paterso with null-literal 'FIXME: NULL' and non-null-literal 'literal' """,
s"""Person: Alana Murray with null-literal 'FIXME: NULL' and non-null-literal 'literal' """,
s"""Person: Jose Wiggins with null-literal 'FIXME: NULL' and non-null-literal 'literal' """
)

val testResult = execute(query.to[String, String](identity))
collectAndCompare(expected, testResult)
},
testM("format5") {
import Expr._

val query = select(
Format5(
"Person: %s %s with more arguments than placeholders: %I %L ",
Customers.fName,
Customers.lName,
"identifier",
Reverse(Customers.fName),
"unused"
)
) from customers

val expected = Seq(
s"""Person: Ronald Russell with more arguments than placeholders: identifier 'dlanoR' """,
s"""Person: Terrence Noel with more arguments than placeholders: identifier 'ecnerreT' """,
s"""Person: Mila Paterso with more arguments than placeholders: identifier 'aliM' """,
s"""Person: Alana Murray with more arguments than placeholders: identifier 'analA' """,
s"""Person: Jose Wiggins with more arguments than placeholders: identifier 'esoJ' """
)

val testResult = execute(query.to[String, String](identity))
collectAndCompare(expected, testResult)
}
)
),
testM("abs") {
val query = select(Abs(-3.14159)) from customers
Expand Down Expand Up @@ -358,7 +475,7 @@ object FunctionDefSpec extends PostgresRunnableSpec with ShopSchema {
r <- testResult.runCollect
} yield assert(r.head)(
matchesRegex(
"[A-Za-z]{3}\\s[A-Za-z]{3}\\s[0-9]{2}\\s(2[0-3]|[01][0-9]):[0-5][0-9]:[0-5][0-9].[0-9]{6}\\s[0-9]{4}\\s[A-Za-z]{3}"
"[A-Za-z]{3}\\s[A-Za-z]{3}\\s[0-9]{2}\\s(2[0-3]|[01][0-9]):[0-5][0-9]:[0-5][0-9].[0-9]{6}\\s[0-9]{4}\\s[A-Za-z]{3,4}"
)
)
assertion.mapErrorCause(cause => Cause.stackless(cause.untraced))
Expand Down