Merge branch 'master' into slick-query-builder

3 files changed, 182 insertions, 4 deletions

diff --git a/src/main/scala/xyz/driver/pdsuicommon/db/MySqlContext.scala b/src/main/scala/xyz/driver/pdsuicommon/db/MySqlContext.scala
index c547bf4..9d2664d 100644
--- a/src/main/scala/xyz/driver/pdsuicommon/db/MySqlContext.scala
+++ b/src/main/scala/xyz/driver/pdsuicommon/db/MySqlContext.scala
@@ -28,10 +28,7 @@ object MySqlContext extends PhiLogging {
                                  connectionParams: String,
                                  url: String)
 
-  final case class Settings(credentials: DbCredentials,
-                            connection: Config,
-                            connectionAttemptsOnStartup: Int,
-                            threadPoolSize: Int)
+  final case class Settings(credentials: DbCredentials, connection: Config, threadPoolSize: Int)
 
   def apply(settings: Settings): MySqlContext = {
     // Prevent leaking credentials to a log
diff --git a/src/main/scala/xyz/driver/pdsuicommon/db/PostgresContext.scala b/src/main/scala/xyz/driver/pdsuicommon/db/PostgresContext.scala
new file mode 100644
index 0000000..7bdfd1b
--- /dev/null
+++ b/src/main/scala/xyz/driver/pdsuicommon/db/PostgresContext.scala
@@ -0,0 +1,73 @@
+package xyz.driver.pdsuicommon.db
+
+import java.io.Closeable
+import java.time._
+import java.util.UUID
+import java.util.concurrent.Executors
+import javax.sql.DataSource
+
+import io.getquill._
+import xyz.driver.pdsuicommon.concurrent.MdcExecutionContext
+import xyz.driver.pdsuicommon.db.PostgresContext.Settings
+import xyz.driver.pdsuicommon.domain.UuidId
+import xyz.driver.pdsuicommon.logging._
+
+import scala.concurrent.ExecutionContext
+import scala.util.control.NonFatal
+import scala.util.{Failure, Success, Try}
+
+object PostgresContext extends PhiLogging {
+
+  final case class Settings(connection: com.typesafe.config.Config,
+                            connectionAttemptsOnStartup: Int,
+                            threadPoolSize: Int)
+
+  def apply(settings: Settings): PostgresContext = {
+    // Prevent leaking credentials to a log
+    Try(JdbcContextConfig(settings.connection).dataSource) match {
+      case Success(dataSource) => new PostgresContext(dataSource, settings)
+      case Failure(NonFatal(e)) =>
+        logger.error(phi"Can not load dataSource, error: ${Unsafe(e.getClass.getName)}")
+        throw new IllegalArgumentException("Can not load dataSource from config. Check your database and config", e)
+    }
+  }
+
+}
+
+class PostgresContext(val dataSource: DataSource with Closeable, settings: Settings)
+    extends PostgresJdbcContext[SnakeCase](dataSource) with TransactionalContext
+    with EntityExtractorDerivation[SnakeCase] {
+
+  private val tpe = Executors.newFixedThreadPool(settings.threadPoolSize)
+
+  implicit val executionContext: ExecutionContext = {
+    val orig = ExecutionContext.fromExecutor(tpe)
+    MdcExecutionContext.from(orig)
+  }
+
+  override def close(): Unit = {
+    super.close()
+    tpe.shutdownNow()
+  }
+
+  /**
+    * Usable for QueryBuilder's extractors
+    */
+  def timestampToLocalDateTime(timestamp: java.sql.Timestamp): LocalDateTime = {
+    LocalDateTime.ofInstant(timestamp.toInstant, ZoneOffset.UTC)
+  }
+
+  implicit def encodeUuidId[T] = MappedEncoding[UuidId[T], String](_.toString)
+  implicit def decodeUuidId[T] = MappedEncoding[String, UuidId[T]] { uuid =>
+    UuidId[T](UUID.fromString(uuid))
+  }
+
+  def decodeOptUuidId[T] = MappedEncoding[Option[String], Option[UuidId[T]]] {
+    case Some(x) => Option(x).map(y => UuidId[T](UUID.fromString(y)))
+    case None    => None
+  }
+
+  implicit def decodeUuid[T] = MappedEncoding[String, UUID] { uuid =>
+    UUID.fromString(uuid)
+  }
+}
diff --git a/src/main/scala/xyz/driver/pdsuicommon/db/PostgresQueryBuilder.scala b/src/main/scala/xyz/driver/pdsuicommon/db/PostgresQueryBuilder.scala
new file mode 100644
index 0000000..0ddf811
--- /dev/null
+++ b/src/main/scala/xyz/driver/pdsuicommon/db/PostgresQueryBuilder.scala
@@ -0,0 +1,108 @@
+package xyz.driver.pdsuicommon.db
+
+import java.sql.ResultSet
+
+import io.getquill.{PostgresDialect, PostgresEscape}
+import xyz.driver.pdsuicommon.db.PostgresQueryBuilder.SmartPostgresEscape
+
+import scala.collection.breakOut
+
+object PostgresQueryBuilder {
+
+  import xyz.driver.pdsuicommon.db.QueryBuilder._
+
+  trait SmartPostgresEscape extends PostgresEscape {
+    override def column(s: String): String =
+      if (s.startsWith("$")) s else super.column(s)
+    override def default(s: String): String =
+      s.split("\\.").map(ss => s""""$ss"""").mkString(".")
+  }
+
+  object SmartPostgresEscape extends SmartPostgresEscape
+
+  type Escape = SmartPostgresEscape
+  val Escape = SmartPostgresEscape
+
+  def apply[T](tableName: String,
+               lastUpdateFieldName: Option[String],
+               nullableFields: Set[String],
+               links: Set[TableLink],
+               runner: Runner[T],
+               countRunner: CountRunner): PostgresQueryBuilder[T] = {
+    val parameters = PostgresQueryBuilderParameters(
+      tableData = TableData(tableName, lastUpdateFieldName, nullableFields),
+      links = links.map(x => x.foreignTableName -> x)(breakOut)
+    )
+    new PostgresQueryBuilder[T](parameters)(runner, countRunner)
+  }
+
+  def apply[T](tableName: String,
+               lastUpdateFieldName: Option[String],
+               nullableFields: Set[String],
+               links: Set[TableLink],
+               extractor: ResultSet => T)(implicit sqlContext: PostgresContext): PostgresQueryBuilder[T] = {
+    apply(tableName, QueryBuilderParameters.AllFields, lastUpdateFieldName, nullableFields, links, extractor)
+  }
+
+  def apply[T](tableName: String,
+               fields: Set[String],
+               lastUpdateFieldName: Option[String],
+               nullableFields: Set[String],
+               links: Set[TableLink],
+               extractor: ResultSet => T)(implicit sqlContext: PostgresContext): PostgresQueryBuilder[T] = {
+
+    val runner: Runner[T] = { parameters =>
+      val (sql, binder) = parameters.toSql(countQuery = false, fields = fields, namingStrategy = SmartPostgresEscape)
+      sqlContext.executeQuery[T](sql, binder, { resultSet =>
+        extractor(resultSet)
+      })
+    }
+
+    val countRunner: CountRunner = { parameters =>
+      val (sql, binder) = parameters.toSql(countQuery = true, namingStrategy = SmartPostgresEscape)
+      sqlContext
+        .executeQuery[CountResult](
+          sql,
+          binder, { resultSet =>
+            val count = resultSet.getInt(1)
+            val lastUpdate = if (parameters.tableData.lastUpdateFieldName.isDefined) {
+              Option(resultSet.getTimestamp(2)).map(sqlContext.timestampToLocalDateTime)
+            } else None
+
+            (count, lastUpdate)
+          }
+        )
+        .head
+    }
+
+    apply[T](
+      tableName = tableName,
+      lastUpdateFieldName = lastUpdateFieldName,
+      nullableFields = nullableFields,
+      links = links,
+      runner = runner,
+      countRunner = countRunner
+    )
+  }
+}
+
+class PostgresQueryBuilder[T](parameters: PostgresQueryBuilderParameters)(implicit runner: QueryBuilder.Runner[T],
+                                                                          countRunner: QueryBuilder.CountRunner)
+    extends QueryBuilder[T, PostgresDialect, PostgresQueryBuilder.Escape](parameters) {
+
+  def withFilter(newFilter: SearchFilterExpr): QueryBuilder[T, PostgresDialect, SmartPostgresEscape] = {
+    new PostgresQueryBuilder[T](parameters.copy(filter = newFilter))
+  }
+
+  def withSorting(newSorting: Sorting): QueryBuilder[T, PostgresDialect, SmartPostgresEscape] = {
+    new PostgresQueryBuilder[T](parameters.copy(sorting = newSorting))
+  }
+
+  def withPagination(newPagination: Pagination): QueryBuilder[T, PostgresDialect, SmartPostgresEscape] = {
+    new PostgresQueryBuilder[T](parameters.copy(pagination = Some(newPagination)))
+  }
+
+  def resetPagination: QueryBuilder[T, PostgresDialect, SmartPostgresEscape] = {
+    new PostgresQueryBuilder[T](parameters.copy(pagination = None))
+  }
+}