Added support for SumInt(Int), SumDec(BigDecimal) and AvgDec(BigDecimal)

apolloisggg · Oct 28, 2022 · 53ac997 · 53ac997
1 parent 2ff7dee
commit 53ac997
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 3 deletions.
diff --git a/core/jvm/src/main/scala/zio/sql/expr.scala b/core/jvm/src/main/scala/zio/sql/expr.scala
@@ -277,7 +277,10 @@ trait ExprModule extends NewtypesModule with FeaturesModule with OpsModule {
  object AggregationDef {
  val Count = AggregationDef[Any, Long](FunctionName("count"))
  val Sum = AggregationDef[Double, Double](FunctionName("sum"))
+ val SumInt = AggregationDef[Int, Int](FunctionName("sum"))
+ val SumDec = AggregationDef[BigDecimal, BigDecimal](FunctionName("sum"))
  val Avg = AggregationDef[Double, Double](FunctionName("avg"))
+ val AvgDec = AggregationDef[BigDecimal, BigDecimal](FunctionName("avg"))
  def Min[F, A, B: TypeTag](expr: Expr[F, A, B]) = AggregationDef[B, B](FunctionName("min"))(expr)
  def Max[F, A, B: TypeTag](expr: Expr[F, A, B]) = AggregationDef[B, B](FunctionName("max"))(expr)
  }

diff --git a/core/jvm/src/test/scala/zio/sql/ExprSpec.scala b/core/jvm/src/test/scala/zio/sql/ExprSpec.scala
@@ -0,0 +1,17 @@
+package zio.sql
+
+import zio.test.Assertion.anything
+import zio.test.{ZIOSpecDefault, assert}
+
+object ExprSpec extends ZIOSpecDefault {
+ import ProductSchema._
+
+ def spec = suite("Aggregate Expression")(
+ test("+ works on integer, Double and BigDecimal columns") {
+ val query = agSelect
+ assert(query)(anything)
+ }
+
+ )
+}
+
diff --git a/core/jvm/src/test/scala/zio/sql/ProductSchema.scala b/core/jvm/src/test/scala/zio/sql/ProductSchema.scala
@@ -12,17 +12,22 @@ object ProductSchema {
  }
  import sql.ColumnSet._
  import sql._
+ import AggregationDef._
 
  val productTable = (
  string("id") ++
  localDate("last_updated") ++
  string("name") ++
  int("base_amount") ++
  int("final_amount") ++
+ double("vat_amount") ++
+ bigDecimal("total_amount") ++
  boolean("deleted")
- ).table("product")
-
- val (id, lastUpdated, name, baseAmount, finalAmount, deleted) = productTable.columns
+ ).table("product")
 
+ val (id, lastUpdated, name, baseAmount, finalAmount, vatAmount, totalAmount, deleted) = productTable.columns
  val selectAll = select(id, lastUpdated, baseAmount, deleted) from productTable
+ val agSelect = select(id, (SumInt(baseAmount) as "sumBaseAmount"), (Sum(vatAmount) as "sumVatAmount")
+ , (Avg(vatAmount) as "avgVatAmount"), (SumDec(totalAmount) as "sumTotalAmount")
+ , (AvgDec(totalAmount) as "avgTotalAmount")) from productTable groupBy(id)
 }