zio#341 - Implement Ltrim2 and Rtrim2 for Postgres and Oracle

oracle/src/main/scala/zio/sql/oracle/OracleSqlModule.scala

@@ -33,6 +33,7 @@ trait OracleSqlModule extends Sql { self =>
  }
 
  object OracleFunctionDef {
- val Sind = FunctionDef[Double, Double](FunctionName("sind"))
+ val Ltrim2 = FunctionDef[(String, String), String](FunctionName("ltrim"))
+ val Rtrim2 = FunctionDef[(String, String), String](FunctionName("rtrim"))
  }
 }

oracle/src/test/scala/zio/sql/oracle/CommonFunctionDefSpec.scala

@@ -4,17 +4,11 @@ import zio.Cause
 import zio.stream.ZStream
 import zio.test.Assertion._
 import zio.test._
-import zio.schema.DeriveSchema
 import zio.sql.expr.FunctionDef.{ CharLength => _, _ }
-import zio.sql.table._
 
-object CommonFunctionDefSpec extends OracleRunnableSpec with ShopSchema {
+object CommonFunctionDefSpec extends OracleRunnableSpec with ShopSchema with DualSchema {
  import Customers._
-
- case class Dual(dummy: String)
- implicit val dummySchema = DeriveSchema.gen[Dual]
- val dual = Table.defineTable[Dual]
- val dommy = dual.columns
+ import Dual._
 
  private def collectAndCompare[R, E](
  expected: Seq[String],

oracle/src/test/scala/zio/sql/oracle/CustomFunctionDefSpec.scala

@@ -0,0 +1,25 @@
+package zio.sql.oracle
+
+import zio.test.Assertion._
+import zio.test.TestAspect.timeout
+import zio.test._
+import zio._
+
+object CustomFunctionDefSpec extends OracleRunnableSpec with DualSchema {
+ import OracleFunctionDef._
+
+ import Dual._
+
+ override def specLayered = suite("Oracle FunctionDef")(
+ test("ltrim2") {
+ assertZIO(execute(select(Ltrim2("$## foo$#", "#$")).from(dual)).runHead.some)(
+ equalTo(" foo$#")
+ )
+ },
+ test("rtrim2") {
+ assertZIO(execute(select(Rtrim2("$#foo $##", "#$")).from(dual)).runHead.some)(
+ equalTo("$#foo ")
+ )
+ }
+ ) @@ timeout(5.minutes)
+}

oracle/src/test/scala/zio/sql/oracle/DualSchema.scala

@@ -0,0 +1,14 @@
+package zio.sql.oracle
+
+import zio.schema.DeriveSchema
+import zio.sql.table._
+
+trait DualSchema {
+ object Dual {
+ case class Dual(dummy: String)
+
+ implicit val dummySchema = DeriveSchema.gen[Dual]
+ val dual = Table.defineTable[Dual]
+ val dummy = dual.columns
+ }
+}

postgres/src/main/scala/zio/sql/postgresql/PostgresSqlModule.scala

@@ -250,6 +250,7 @@ trait PostgresSqlModule extends Sql { self =>
  val LocaltimestampWithPrecision = FunctionDef[Int, Instant](FunctionName("localtimestamp"))
  val LocaltimeWithPrecision = FunctionDef[Int, LocalTime](FunctionName("localtime"))
  val LPad = FunctionDef[(String, Int, String), String](FunctionName("lpad"))
+ val Ltrim2 = FunctionDef[(String, String), String](FunctionName("ltrim"))
  val MakeDate = FunctionDef[(Int, Int, Int), LocalDate](FunctionName("make_date"))
  val MakeInterval = FunctionDef[Interval, Interval](FunctionName("make_interval"))
  val MakeTime = FunctionDef[(Int, Int, Double), LocalTime](FunctionName("make_time"))
@@ -271,6 +272,7 @@ trait PostgresSqlModule extends Sql { self =>
  val Reverse = FunctionDef[String, String](FunctionName("reverse"))
  val Right = FunctionDef[(String, Int), String](FunctionName("right"))
  val RPad = FunctionDef[(String, Int, String), String](FunctionName("rpad"))
+ val Rtrim2 = FunctionDef[(String, String), String](FunctionName("rtrim"))
  val SetSeed = FunctionDef[Double, Unit](FunctionName("setseed"))
  val Sind = FunctionDef[Double, Double](FunctionName("sind"))
  val SplitPart = FunctionDef[(String, String, Int), String](FunctionName("split_part"))

postgres/src/test/scala/zio/sql/postgresql/CustomFunctionDefSpec.scala

@@ -145,7 +145,17 @@ object CustomFunctionDefSpec extends PostgresRunnableSpec with DbSchema {
  val testResult = execute(query)
  collectAndCompare(expected, testResult)
  }
- )
+ ),
+ test("ltrim2") {
+ assertZIO(execute(select(Ltrim2("$## foo$#", "#$"))).runHead.some)(
+ equalTo(" foo$#")
+ )
+ },
+ test("rtrim2") {
+ assertZIO(execute(select(Rtrim2("$#foo $##", "#$"))).runHead.some)(
+ equalTo("$#foo ")
+ )
+ }
  ),
  test("repeat") {
  assertZIO(execute(select(Repeat("Zio", 3))).runHead.some)(equalTo("ZioZioZio"))