Add Option[Instant] Quotes

macro-quill/src/main/scala/pl/jozwik/quillgeneric/quillmacro/DateQuotes.scala

@@ -22,6 +22,16 @@ trait DateQuotes {
     def <=(right: LocalDateTime) = quote(infix"$left <= $right".as[Boolean])
   }
 
+  implicit class LocalDateTimeQuotesOption(left: Option[LocalDateTime]) {
+    def >(right: Option[LocalDateTime]) = quote(infix"$left > $right".as[Boolean])
+
+    def <(right: Option[LocalDateTime]) = quote(infix"$left < $right".as[Boolean])
+
+    def >=(right: Option[LocalDateTime]) = quote(infix"$left >= $right".as[Boolean])
+
+    def <=(right: Option[LocalDateTime]) = quote(infix"$left <= $right".as[Boolean])
+  }
+
   implicit class LocalDateQuotes(left: LocalDate) {
     def >(right: LocalDate) = quote(infix"$left > $right".as[Boolean])
 
@@ -32,6 +42,16 @@ trait DateQuotes {
     def <=(right: LocalDate) = quote(infix"$left <= $right".as[Boolean])
   }
 
+  implicit class LocalDateQuotesOption(left: Option[LocalDate]) {
+    def >(right: Option[LocalDate]) = quote(infix"$left > $right".as[Boolean])
+
+    def <(right: Option[LocalDate]) = quote(infix"$left < $right".as[Boolean])
+
+    def >=(right: Option[LocalDate]) = quote(infix"$left >= $right".as[Boolean])
+
+    def <=(right: Option[LocalDate]) = quote(infix"$left <= $right".as[Boolean])
+  }
+
   implicit class InstantQuotes(left: Instant) {
     def >(right: Instant) = quote(infix"$left > $right".as[Boolean])
 
@@ -41,5 +61,15 @@ trait DateQuotes {
 
     def <=(right: Instant) = quote(infix"$left <= $right".as[Boolean])
   }
+
+  implicit class InstantQuotesOption(left: Option[Instant]) {
+    def >(right: Option[Instant]) = quote(infix"$left > $right".as[Boolean])
+
+    def <(right: Option[Instant]) = quote(infix"$left < $right".as[Boolean])
+
+    def >=(right: Option[Instant]) = quote(infix"$left >= $right".as[Boolean])
+
+    def <=(right: Option[Instant]) = quote(infix"$left <= $right".as[Boolean])
+  }
   //scalastyle:on
 }

macro-quill/src/test/scala/pl/jozwik/quillgeneric/model/Address.scala

@@ -1,6 +1,6 @@
 package pl.jozwik.quillgeneric.model
 
-import java.time.LocalDateTime
+import java.time.Instant
 
 import pl.jozwik.quillgeneric.quillmacro.WithId
 
@@ -16,6 +16,6 @@ final case class Address(
     city: String,
     street: Option[String] = None,
     buildingNumber: Option[String] = None,
-    updated: Option[LocalDateTime] = None,
+    updated: Option[Instant] = None,
     localNumber: Option[String] = None
 ) extends WithId[AddressId]

quill-jdbc-macro/src/test/scala/pl/jozwik/quillgeneric/sync/jdbc/AddressSuite.scala

@@ -0,0 +1,26 @@
+package pl.jozwik.quillgeneric.sync.jdbc
+
+import java.time.Instant
+
+import pl.jozwik.quillgeneric.sync.jdbc.repository.AddressRepository
+import pl.jozwik.quillgeneric.model.{ Address, AddressId }
+import org.scalatest.TryValues._
+
+trait AddressSuite extends AbstractJdbcSpec {
+  private val repository = new AddressRepository(ctx)
+
+  "AddressSuite " should {
+    "Call crud operations " in {
+      val id      = AddressId(1)
+      val entity  = Address(id, "Country", "City")
+      val address = repository.createOrUpdateAndRead(entity).success.value
+      address shouldBe entity
+      val a = repository.searchUpdateAfter(Instant.now).success.value
+      a shouldBe empty
+      repository.updateAndRead(address.copy(updated = Option(Instant.now)))
+      val b = repository.searchUpdateAfter(Instant.EPOCH).success.value
+      b should not be empty
+      repository.deleteAll shouldBe Symbol("success")
+    }
+  }
+}

quill-jdbc-macro/src/test/scala/pl/jozwik/quillgeneric/sync/jdbc/QuillCrudJdbcSpec.scala

@@ -1,9 +1,9 @@
 package pl.jozwik.quillgeneric.sync.jdbc
 
-class QuillCrudJdbcSpec
-  extends Cell4dSuite
-  with PersonRepositoryNotGeneratedIdSuite
-  with PersonCustomRepositorySuite
-  with PersonRepositorySuite
-  with ConfigurationRepositorySuite
-  with SaleRepositorySuite
+class QuillCrudJdbcSpec extends AddressSuite
+//  with PersonRepositoryNotGeneratedIdSuite
+//  with PersonCustomRepositorySuite
+//  with PersonRepositorySuite
+//  with ConfigurationRepositorySuite
+//  with SaleRepositorySuite
+//  with Cell4dSuite

quill-jdbc-macro/src/test/scala/pl/jozwik/quillgeneric/sync/jdbc/repository/AbstractAddressRepository.scala

@@ -0,0 +1,22 @@
+package pl.jozwik.quillgeneric.sync.jdbc.repository
+
+import java.time.Instant
+
+import io.getquill.NamingStrategy
+import io.getquill.context.sql.idiom.SqlIdiom
+import pl.jozwik.quillgeneric.model.{ Address, AddressId }
+import pl.jozwik.quillgeneric.quillmacro.sync.JdbcRepositoryWithGeneratedId
+
+import scala.util.Try
+
+trait AbstractAddressRepository[D <: SqlIdiom, N <: NamingStrategy] extends JdbcRepositoryWithGeneratedId[AddressId, Address, D, N] {
+
+  def searchUpdateAfter(updated: Instant): Try[Seq[Address]] =
+    Try {
+      import context._
+      val q = dynamicSchema
+        .filter(a => quote(a.updated > lift(Option(updated))))
+      run(q)
+
+    }
+}

quill-jdbc-macro/src/test/scala/pl/jozwik/quillgeneric/sync/jdbc/repository/AddressRepository.scala

@@ -4,14 +4,13 @@ import io.getquill.NamingStrategy
 import io.getquill.context.sql.idiom.SqlIdiom
 import pl.jozwik.quillgeneric.model.{ Address, AddressId }
 import pl.jozwik.quillgeneric.quillmacro.sync.JdbcRepository.JdbcContextDateQuotes
-import pl.jozwik.quillgeneric.quillmacro.sync.JdbcRepositoryWithGeneratedId
 
 import scala.util.Try
 
 final class AddressRepository[D <: SqlIdiom, N <: NamingStrategy](
     protected val context: JdbcContextDateQuotes[D, N],
-    tableName: String
-) extends JdbcRepositoryWithGeneratedId[AddressId, Address, D, N] {
+    tableName: String = "Address"
+) extends AbstractAddressRepository[D, N] {
 
   protected implicit val dynamicSchema: context.DynamicEntityQuery[Address] = context.dynamicQuerySchema[Address](tableName)
 
@@ -72,15 +71,17 @@ final class AddressRepository[D <: SqlIdiom, N <: NamingStrategy](
       }
     }
 
-  override def update(entity: Address): Try[Long] = Try {
-    context.update[AddressId, Address](entity)
-  }
+  override def update(entity: Address): Try[Long] =
+    Try {
+      context.update[AddressId, Address](entity)
+    }
 
-  override def updateAndRead(entity: Address): Try[Address] = Try {
-    context.transaction {
-      context.updateAndRead[AddressId, Address](entity)
+  override def updateAndRead(entity: Address): Try[Address] =
+    Try {
+      context.transaction {
+        context.updateAndRead[AddressId, Address](entity)
+      }
     }
-  }
 
   override def delete(id: AddressId): Try[Long] =
     Try {

version.sbt

@@ -1 +1 @@
-ThisBuild / version := "0.9.1-SNAPSHOT"
+ThisBuild / version := "0.9.1"