More Scalafix #2888

guizmaii · 2023-09-28T16:01:45Z

No description provided.

guizmaii · 2023-09-28T16:05:07Z

...assandra-alpakka/src/test/scala/io/getquill/context/cassandra/alpakka/SetsEncodingSpec.scala

@@ -36,7 +37,7 @@ class SetsEncodingSpec extends CollectionsSpec with CassandraAlpakkaSpec {
    Set(Instant.now()),
    Set(UUID.randomUUID())
  )
-  val q = quote(query[SetsEntity])
+  val q: Quoted[EntityQuery[SetsEntity]] = quote(query[SetsEntity])


guizmaii · 2023-09-28T16:06:12Z

quill-cassandra-zio/src/main/scala/io/getquill/cassandrazio/Quill.scala

@@ -18,7 +18,7 @@ object Quill {
      ZLayer.fromFunction((session: CassandraZioSession) => new Cassandra[N](naming, session))
  }

-  final case class Cassandra[+N <: NamingStrategy](val naming: N, session: CassandraZioSession)


TO BACKPORT TO PREVIOUS PR

guizmaii · 2023-09-28T16:06:49Z

quill-cassandra/src/test/scala/io/getquill/context/cassandra/CassandraTestEntities.scala


 trait CassandraTestEntities extends TestEntities {
  this: CassandraContext[_] =>

  case class MapFrozen(id: Map[Int, Boolean])
-  val mapFroz = quote(query[MapFrozen])
+  val mapFroz: Quoted[EntityQuery[MapFrozen]] = quote(query[MapFrozen])


guizmaii · 2023-09-28T16:07:26Z

quill-cassandra/src/test/scala/io/getquill/context/cassandra/CassandraTestEntities.scala


  case class SetFrozen(id: Set[Int])
-  val setFroz = quote(query[SetFrozen])
+  val setFroz: Quoted[EntityQuery[SetFrozen]] = quote(query[SetFrozen])


guizmaii · 2023-09-28T16:07:28Z

quill-cassandra/src/test/scala/io/getquill/context/cassandra/CassandraTestEntities.scala


  case class ListFrozen(id: List[Int])
-  val listFroz = quote(query[ListFrozen])
+  val listFroz: Quoted[EntityQuery[ListFrozen]] = quote(query[ListFrozen])


guizmaii · 2023-09-28T16:08:12Z

quill-cassandra/src/test/scala/io/getquill/context/cassandra/CqlIdiomSpec.scala

@@ -49,7 +49,7 @@ class CqlIdiomSpec extends Spec {

  "distinct" - {
    "simple" in {
-      val q = quote {
+      quote {


TO PUT BACK

guizmaii · 2023-09-28T16:08:34Z

quill-cassandra/src/test/scala/io/getquill/context/cassandra/CqlIdiomSpec.scala

@@ -126,13 +126,13 @@ class CqlIdiomSpec extends Spec {
        "SELECT s, i, l, o, b FROM TestEntity WHERE i = 1"
    }
    "unary (not supported)" in {
-      val q = quote {
+      quote {


TO PUT BACK

guizmaii · 2023-09-28T16:08:46Z

quill-cassandra/src/test/scala/io/getquill/context/cassandra/CqlIdiomSpec.scala

        qr1.filter(t => !(t.i == 1))
      }
      "mirrorContext.run(q)" mustNot compile
    }
    "function apply (not supported)" in {
-      val q = quote {
+      quote {


TO PUT BACK

guizmaii · 2023-09-28T16:10:38Z

quill-cassandra/src/test/scala/io/getquill/context/cassandra/QueryResultTypeCassandraSpec.scala

+  val deleteAll: Quoted[Delete[OrderTestEntity]]       = quote(query[OrderTestEntity].delete)
+  val selectAll: Quoted[EntityQuery[OrderTestEntity]]  = quote(query[OrderTestEntity])
+  val map: Quoted[EntityQuery[Int]]                    = quote(query[OrderTestEntity].map(_.id))
+  val filter: Quoted[EntityQuery[OrderTestEntity]]     = quote(query[OrderTestEntity].filter(_.id == 1))
+  val withFilter: Quoted[EntityQuery[OrderTestEntity]] = quote(query[OrderTestEntity].withFilter(_.id == 1))
+  val sortBy: Quoted[Query[OrderTestEntity]]           = quote(query[OrderTestEntity].filter(_.id == 1).sortBy(_.i)(Ord.asc))
+  val take: Quoted[Query[OrderTestEntity]]             = quote(query[OrderTestEntity].take(10))
+  val entitySize: Quoted[Long]                         = quote(query[OrderTestEntity].size)
+  val parametrizedSize: Quoted[Int => Long] = quote { (id: Int) =>
    query[OrderTestEntity].filter(_.id == id).size
  }
-  val distinct = quote(query[OrderTestEntity].map(_.id).distinct)
+  val distinct: Quoted[Query[Int]] = quote(query[OrderTestEntity].map(_.id).distinct)


guizmaii · 2023-09-28T16:11:39Z

quill-cassandra/src/test/scala/io/getquill/context/cassandra/norm/RenamePropertiesSpec.scala

+  val e: Quoted[EntityQuery[TestEntity]] = quote {
    querySchema[TestEntity]("test_entity", _.s -> "field_s", _.i -> "field_i")
  }

-  val f = quote {
+  val f: Quoted[EntityQuery[TestEntity]] = quote {


guizmaii · 2023-09-28T16:14:18Z

quill-core/src/test/scala/io/getquill/OpsSpec.scala

@@ -74,24 +74,24 @@ class OpsSpec extends Spec {
  }

  implicit class QueryOps[Q <: Query[_]](q: Q) {
-    def allowFiltering = quote(sql"$q ALLOW FILTERING".as[Q])
+    def allowFiltering: Quoted[Q] = quote(sql"$q ALLOW FILTERING".as[Q])


guizmaii · 2023-09-28T16:14:55Z

quill-core/src/test/scala/io/getquill/TestEntities.scala

+  val qr1: Quoted[EntityQuery[TestEntity]] = quote {
    query[TestEntity]
  }
-  val qr1Emb = quote {
+  val qr1Emb: Quoted[EntityQuery[TestEntityEmb]] = quote {
    querySchema[TestEntityEmb]("TestEntity")
  }
-  val qr2 = quote {
+  val qr2: Quoted[EntityQuery[TestEntity2]] = quote {
    query[TestEntity2]
  }
-  val qr3 = quote {
+  val qr3: Quoted[EntityQuery[TestEntity3]] = quote {
    query[TestEntity3]
  }
-  val qr4 = quote {
+  val qr4: Quoted[EntityQuery[TestEntity4]] = quote {
    query[TestEntity4]
  }
-  val qr5 = quote {
+  val qr5: Quoted[EntityQuery[TestEntity5]] = quote {
    query[TestEntity5]
  }
-  val qr4Emb = quote {
+  val qr4Emb: Quoted[EntityQuery[TestEntity4Emb]] = quote {
    querySchema[TestEntity4Emb]("TestEntity4")
  }
-  val qrRegular = quote {
+  val qrRegular: Quoted[EntityQuery[TestEntityRegular]] = quote {


guizmaii · 2023-09-28T16:15:14Z

quill-core/src/test/scala/io/getquill/UnlimitedOptionalEmbeddedSpec.scala

@@ -30,7 +30,7 @@ class UnlimitedOptionalEmbeddedSpec extends Spec {
    )
  )

-  val qrOptEmd = quote {
+  val qrOptEmd: Quoted[EntityQuery[OptEmd]] = quote {


guizmaii · 2023-09-28T16:16:40Z

quill-core/src/test/scala/io/getquill/base/EncodingSpec.scala

@@ -3,6 +3,8 @@ package io.getquill.base
 import io.getquill.context.Context

 import java.util.Date
+import io.getquill.{Delete, Insert, Quoted}


guizmaii · 2023-09-28T16:17:45Z

quill-core/src/test/scala/io/getquill/context/ContextMacroSpec.scala

@@ -320,7 +320,7 @@ class ContextMacroSpec extends Spec {
  }

  "fails if there's a free variable" in {
-    val q = {


guizmaii · 2023-09-28T16:18:12Z

quill-core/src/test/scala/io/getquill/context/EncodeBindVariablesSpec.scala

    }
    testContext.run(q).prepareRow mustEqual Row(1d)
  }

  "fails for not value class without encoder" in {
-    case class NotValueClass(value: Int)
-    case class Entity(x: NotValueClass)
-    val q = quote { (x: NotValueClass) =>


guizmaii · 2023-09-28T16:19:51Z

quill-core/src/test/scala/io/getquill/norm/AttachToEntitySpec.scala

        }
        attachToEntity(q.ast) mustEqual n.ast
      }
    }
  }

-  val iqr1 = quote {
+  val iqr1: Quoted[Query[TestEntity]] = quote {


guizmaii · 2023-09-28T16:20:47Z

quill-core/src/test/scala/io/getquill/norm/NormalizeNestedStructuresSpec.scala

@@ -6,14 +6,15 @@ import io.getquill.MirrorContexts.testContext.qr1
 import io.getquill.MirrorContexts.testContext.qr2
 import io.getquill.MirrorContexts.testContext.quote
 import io.getquill.MirrorContexts.testContext.unquote
+import io.getquill.Quoted


guizmaii · 2023-09-28T16:21:57Z

quill-core/src/test/scala/io/getquill/norm/QueryGenerator.scala

-      val quat = Quat.Product("Test")
-      val s    = string(3)
-      Entity(s, Nil, Quat.Product("Test", (1 to 20).map(i => (string(3), Quat.Value)).toList.distinct: _*))
+      Quat.Product("Test")


guizmaii · 2023-09-28T16:23:25Z

quill-core/src/test/scala/io/getquill/quat/QuatSpec.scala

@@ -136,7 +135,7 @@ class QuatSpec extends Spec {
    val p: Quat = Quat.Product("p", "foo" -> Quat.Value)
    val v: Quat = Quat.Value
    p.probit mustEqual p
-    val e = intercept[QuatException] {


guizmaii · 2023-09-28T16:23:44Z

quill-core/src/test/scala/io/getquill/quat/QuatSpec.scala

@@ -160,7 +159,7 @@ class QuatSpec extends Spec {
    "rename field" in {
      prod.withRenames(List("bv" -> "bva", "p" -> "pa")).applyRenames mustEqual expect
    }
-    val e = intercept[QuatException] {


guizmaii · 2023-09-28T16:25:49Z

quill-core/src/test/scala/io/getquill/quotation/QuotationSpec.scala

        }
      }
      "forced" in {
-        val q = qr1.dynamic


guizmaii · 2023-09-28T16:26:16Z

quill-core/src/test/scala/io/getquill/quotation/QuotationSpec.scala

@@ -2059,7 +2066,7 @@ class QuotationSpec extends Spec {
  }

  "ignores the ifrefutable call" in {
-    val q = quote {


guizmaii · 2023-09-28T16:26:44Z

quill-core/src/test/scala/io/getquill/quotation/QuotationSpec.scala

@@ -2107,8 +2114,8 @@ class QuotationSpec extends Spec {
  }

  "doesn't double quote" in {
-    val q               = quote(1)
-    val dq: Quoted[Int] = quote(q)


guizmaii · 2023-09-29T06:21:20Z

...l-jasync-mysql/src/test/scala/io/getquill/context/jasync/mysql/MysqlJAsyncEncodingSpec.scala

        Await.result(testContext.run(query[EncodingTestEntity]), Duration.Inf)
      }
    }
    "non-numeric" in {
      Await.result(testContext.run(liftQuery(insertValues).foreach(e => insert(e))), Duration.Inf)
-      case class EncodingTestEntity(v1: Date)
-      val e = intercept[IllegalStateException] {


guizmaii · 2023-09-29T06:21:36Z

...l-jasync-mysql/src/test/scala/io/getquill/context/jasync/mysql/MysqlJAsyncEncodingSpec.scala

@@ -100,15 +100,15 @@ class MysqlJAsyncEncodingSpec extends EncodingSpec {
  "fails if the column has the wrong type" - {
    "numeric" in {
      Await.result(testContext.run(liftQuery(insertValues).foreach(e => insert(e))), Duration.Inf)
-      case class EncodingTestEntity(v1: Int)
-      val e = intercept[IllegalStateException] {


guizmaii · 2023-09-29T06:25:36Z

quill-jdbc-monix/src/test/scala/io/getquill/h2/h2.scala

@@ -3,6 +3,6 @@ package io.getquill
 import monix.execution.Scheduler

 package object h2 {
-  private implicit val scheduler = Scheduler.global
+  Scheduler.global


guizmaii force-pushed the scalafix_2 branch from 1d1cc9f to fe7d652 Compare September 28, 2023 16:02

More Scalafix

d3bbeb5

guizmaii force-pushed the scalafix_2 branch from fe7d652 to d3bbeb5 Compare September 28, 2023 16:03

scalafmt

8ce6942

guizmaii commented Sep 28, 2023

View reviewed changes

quill-core/src/test/scala/io/getquill/quotation/QuotationSpec.scala

}

}

"forced" in {

val q = qr1.dynamic

Copy link

Member Author

guizmaii Sep 28, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PUT BACK

guizmaii commented Sep 28, 2023

View reviewed changes

guizmaii commented Sep 29, 2023

View reviewed changes

guizmaii closed this Oct 2, 2023

guizmaii deleted the scalafix_2 branch October 2, 2023 07:53

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

More Scalafix #2888

More Scalafix #2888

guizmaii commented Sep 28, 2023

guizmaii Sep 28, 2023

guizmaii Sep 28, 2023

guizmaii Sep 28, 2023

guizmaii Sep 28, 2023

guizmaii Sep 28, 2023

guizmaii Sep 28, 2023

guizmaii Sep 28, 2023

guizmaii Sep 28, 2023

guizmaii Sep 28, 2023

guizmaii Sep 28, 2023

guizmaii Sep 28, 2023

guizmaii Sep 28, 2023

guizmaii Sep 28, 2023

guizmaii Sep 28, 2023

guizmaii Sep 28, 2023

guizmaii Sep 28, 2023

guizmaii Sep 28, 2023

guizmaii Sep 28, 2023

guizmaii Sep 28, 2023

guizmaii Sep 28, 2023

guizmaii Sep 28, 2023

guizmaii Sep 28, 2023

guizmaii Sep 28, 2023

guizmaii Sep 28, 2023

guizmaii Sep 29, 2023

guizmaii Sep 29, 2023

guizmaii Sep 29, 2023

More Scalafix #2888

More Scalafix #2888

Conversation

guizmaii commented Sep 28, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment