correct cassandra

Author: ajozwik

macro-quill/src/test/resources/scripts/create.sql

@@ -6,7 +6,8 @@ CREATE TABLE IF NOT EXISTS ADDRESS
     STREET VARCHAR(50)  DEFAULT NULL,
     BUILDING_NUMBER VARCHAR(10)  DEFAULT NULL,
     LOCAL_NUMBER VARCHAR(10)  DEFAULT NULL,
-    UPDATED DATETIME
+    UPDATED DATETIME,
+    CREATED DATE  DEFAULT NULL
 );
 
 CREATE TABLE IF NOT EXISTS PERSON
@@ -15,7 +16,8 @@ CREATE TABLE IF NOT EXISTS PERSON
     FIRST_NAME VARCHAR(50) NOT NULL,
     LAST_NAME  VARCHAR(20) NOT NULL,
     BIRTH_DATE DATE,
-    ADDRESS_ID INT DEFAULT NULL
+    ADDRESS_ID INT DEFAULT NULL,
+    CREATE_DATE_TIME DATETIME DEFAULT NULL
 );
 
 
@@ -25,7 +27,8 @@ CREATE TABLE IF NOT EXISTS PERSON2
     FIRST_NAME VARCHAR(50) NOT NULL,
     LAST_NAME  VARCHAR(20) NOT NULL,
     BIRTH_DATE DATE,
-    ADDRESS_ID INT DEFAULT NULL
+    ADDRESS_ID INT DEFAULT NULL,
+    CREATE_DATE_TIME DATETIME DEFAULT NULL
 );
 
 CREATE TABLE IF NOT EXISTS PERSON3
@@ -34,7 +37,8 @@ CREATE TABLE IF NOT EXISTS PERSON3
     FIRST_NAME VARCHAR(50) NOT NULL,
     LAST_NAME  VARCHAR(20) NOT NULL,
     DOB DATE,
-    ADDRESS_ID INT DEFAULT NULL
+    ADDRESS_ID INT DEFAULT NULL,
+    CREATE_DATE_TIME DATETIME DEFAULT NULL
 );
 
 
@@ -48,13 +52,16 @@ CREATE TABLE IF NOT EXISTS CONFIGURATION (
 CREATE TABLE IF NOT EXISTS PRODUCT (
     `ID`  INT NOT NULL AUTO_INCREMENT,
     `NAME`  VARCHAR(20) NOT NULL,
+    `CREATED` DATE,
     PRIMARY KEY (`ID`)
 );
 
 CREATE TABLE IF NOT EXISTS SALE (
     `PRODUCT_ID`  INT NOT NULL,
     `PERSON_ID`  INT NOT NULL,
     `SALE_DATE` DATETIME,
+    `SALE_DATE_TIME` DATETIME,
+    `CREATE_DATE` DATE,
     PRIMARY KEY (`PRODUCT_ID`,`PERSON_ID`)
 );
 

macro-quill/src/test/scala/pl/jozwik/quillgeneric/AbstractSpec.scala

@@ -1,8 +1,7 @@
 package pl.jozwik.quillgeneric
 
 import java.time.temporal.ChronoUnit
-import java.time.{ Instant, LocalDate }
-
+import java.time.{ Instant, LocalDate, LocalDateTime, ZoneOffset }
 import com.typesafe.scalalogging.StrictLogging
 import io.getquill.NamingStrategy
 import org.scalatest.concurrent.{ AsyncTimeLimitedTests, TimeLimitedTests }
@@ -24,6 +23,7 @@ trait AbstractSpec extends AnyWordSpecLike with TimeLimitedTests with Spec with
 
   protected val now: Instant             = Instant.now().truncatedTo(ChronoUnit.SECONDS)
   protected val today: LocalDate         = LocalDate.now
+  protected val dateTime: LocalDateTime  = LocalDateTime.ofInstant(now, ZoneOffset.UTC)
   protected val strategy: NamingStrategy = Strategy.namingStrategy
 
   protected val (offset, limit) = (0, 100)

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

@@ -15,5 +15,5 @@ final case class Person(
     lastName: String,
     birthDate: LocalDate,
     addressId: Option[AddressId] = Option(AddressId.empty),
-    createDateTime: Option[LocalDateTime] = None
+    createDateTime: Option[LocalDateTime] = Option(LocalDateTime.now)
 ) extends WithId[PersonId]

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

@@ -1,12 +1,11 @@
 package pl.jozwik.quillgeneric.model
 
-import java.time.{ Instant, LocalDateTime }
+import java.time.{ Instant, LocalDate, LocalDateTime }
 import pl.jozwik.quillgeneric.quillmacro.{ CompositeKey2, WithId }
 
 final case class SaleId(fk1: ProductId, fk2: PersonId) extends CompositeKey2[ProductId, PersonId] {
   def productId: ProductId = fk1
   def personId: PersonId   = fk2
 }
 
-
-final case class Sale(id: SaleId, saleDate: Instant, saleDateTime: LocalDateTime = LocalDateTime.now) extends WithId[SaleId]
+final case class Sale(id: SaleId, saleDate: Instant, saleDateTime: LocalDateTime, createDate: LocalDate) extends WithId[SaleId]

quill-cassandra-macro/src/test/resources/scripts/create.cql

@@ -6,5 +6,6 @@ CREATE TABLE IF NOT EXISTS ADDRESS
     STREET          TEXT,
     BUILDING_NUMBER TEXT,
     LOCAL_NUMBER    TEXT,
-    UPDATED         TIMESTAMP
+    UPDATED         TIMESTAMP,
+    CREATED         DATE
 );

quill-cassandra-macro/src/test/scala/pl/jozwik/quillgeneric/cassandra/AbstractCassandraSpec.scala

@@ -13,7 +13,7 @@ trait AbstractCassandraSpec extends AbstractSpec with BeforeAndAfterAll {
 
   protected lazy val session = {
     EmbeddedCassandraServerHelper.startEmbeddedCassandra()
-    EmbeddedCassandraServerHelper.getSession()
+    EmbeddedCassandraServerHelper.getSession
   }
 
   protected val keySpace = "demo"

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

@@ -1,9 +1,10 @@
 package pl.jozwik.quillgeneric.cassandra.model
 
-import java.util.{ Date, UUID }
-
 import pl.jozwik.quillgeneric.quillmacro.WithId
 
+import java.time.LocalDate
+import java.util.{ Date, UUID }
+
 object AddressId {
   val random: AddressId = AddressId(UUID.randomUUID())
 }
@@ -17,5 +18,6 @@ final case class Address(
     street: Option[String] = None,
     buildingNumber: Option[String] = None,
     updated: Option[Date] = None,
-    localNumber: Option[String] = None
+    localNumber: Option[String] = None,
+    created: Option[LocalDate] = None
 ) extends WithId[AddressId]

quill-cassandra-monix-macro/src/test/resources/scripts/create.cql

@@ -6,5 +6,6 @@ CREATE TABLE IF NOT EXISTS ADDRESS
     STREET          TEXT,
     BUILDING_NUMBER TEXT,
     LOCAL_NUMBER    TEXT,
-    UPDATED         TIMESTAMP
+    UPDATED         TIMESTAMP,
+    CREATED         DATE
 );

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

@@ -21,7 +21,7 @@ trait SaleRepositorySuite extends AbstractJdbcSpec {
       val productWithoutId = Product(ProductId.empty, "productName")
       val product          = productRepository.createAndRead(productWithoutId).success.value
       val saleId           = SaleId(product.id, person.id)
-      val sale             = Sale(saleId, now)
+      val sale             = Sale(saleId, now, dateTime, today)
       repository.createAndRead(sale) shouldBe Symbol("success")
 
       repository.createOrUpdateAndRead(sale) shouldBe Symbol("success")
@@ -35,10 +35,9 @@ trait SaleRepositorySuite extends AbstractJdbcSpec {
             actualSeq shouldBe Seq(sale)
           }
         }
-        .recoverWith {
-          case th =>
-            logger.error("", th)
-            Failure(th)
+        .recoverWith { case th =>
+          logger.error("", th)
+          Failure(th)
         }
         .success
         .value

version.sbt

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