Merge branch 'master' into update/sbt-scalafmt-2.5.0

.github/workflows/ci.yml

@@ -50,9 +50,22 @@ jobs:
  - name: Run tests
  run: sbt ++${{ matrix.scala }}! test
 
+ website:
+ runs-on: ubuntu-20.04
+ timeout-minutes: 60
+ steps:
+ - name: Checkout current branch
+ uses: actions/[email protected]
+ - name: Setup Scala and Java
+ uses: olafurpg/setup-scala@v13
+ - name: Cache scala dependencies
+ uses: coursier/cache-action@v6
+ - name: Check Document Generation
+ run: sbt docs/compileDocs
+
  publish:
  runs-on: ubuntu-20.04
- needs: [lint, test]
+ needs: [lint, test, website]
  if: github.event_name != 'pull_request'
  steps:
  - name: Checkout current branch

.github/workflows/site.yml

@@ -0,0 +1,28 @@
+# This file was autogenerated using `zio-sbt` via `sbt generateGithubWorkflow` 
+# task and should be included in the git repository. Please do not edit 
+# it manually. 
+
+name: website
+
+on:
+ release:
+ types: [ published ]
+
+jobs:
+ publish-docs:
+ runs-on: ubuntu-20.04
+ timeout-minutes: 30
+ steps:
+ - uses: actions/[email protected]
+ with:
+ fetch-depth: 0
+ - name: Setup Scala and Java
+ uses: olafurpg/setup-scala@v13
+ - uses: actions/setup-node@v3
+ with:
+ node-version: '16.x'
+ registry-url: 'https://registry.npmjs.org'
+ - name: Publishing Docs to NPM Registry
+ run: sbt docs/publishToNpm
+ env:
+ NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

README.md

@@ -80,5 +80,5 @@ To set up the project follow below steps:
 
 If you want to learn more, please check out:
 
- - [ZIO SQL Homepage](https://zio.github.io/zio-sql)
+ - [ZIO SQL Homepage](https://zio.dev/zio-sql)
  - [ZIO SQL Discord](https://discord.gg/2ccFBr4)

build.sbt

@@ -5,7 +5,7 @@ import sbtcrossproject.CrossPlugin.autoImport.crossProject
 inThisBuild(
  List(
  organization := "dev.zio",
- homepage := Some(url("https://zio.github.io/zio-sql/")),
+ homepage := Some(url("https://zio.dev/zio-sql/")),
  licenses := List("Apache-2.0" -> url("http:https://www.apache.org/licenses/LICENSE-2.0")),
  developers := List(
  Developer("jdegoes", "John De Goes", "[email protected]", url("http:https://degoes.net"))
@@ -38,7 +38,6 @@ lazy val root = project
  .aggregate(
  coreJVM,
  coreJS,
- docs,
  driver,
  examples,
  jdbc,
@@ -82,7 +81,7 @@ lazy val docs = project
  scalacOptions -= "-Xfatal-warnings"
  )
  .dependsOn(postgres)
- .enablePlugins(MdocPlugin, DocusaurusPlugin)
+ .enablePlugins(WebsitePlugin)
 
 lazy val examples = project
  .in(file("examples"))

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)
  }