Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update scala-compiler, scala-library to 2.13.12 #2862

Merged
merged 8 commits into from
Sep 20, 2023
Merged

Update scala-compiler, scala-library to 2.13.12 #2862

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3a0afa8
Update scala-compiler, scala-library to 2.13.12
zio-scala-steward[bot] Sep 17, 2023
a45e415
Merge branch 'master' into update/scala-compiler-2.13.12
guizmaii Sep 18, 2023
9d3a2a2
Fix test
guizmaii Sep 20, 2023
9629138
Fix test
guizmaii Sep 20, 2023
1c02351
Fix test
guizmaii Sep 20, 2023
1229821
Fix test
guizmaii Sep 20, 2023
b7fc6b9
scalafmt
guizmaii Sep 20, 2023
ded0706
clean
guizmaii Sep 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -764,7 +764,7 @@ def excludePaths(paths: Seq[String]) = {
}

val scala_v_12 = "2.12.18"
val scala_v_13 = "2.13.10"
val scala_v_13 = "2.13.12"
val scala_v_30 = "3.3.1"

val scalaCollectionCompatVersion = "2.11.0"
Expand Down
8 changes: 8 additions & 0 deletions quill-sql/src/test/scala-2.12/io/getquill/Versions.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package io.getquill

/**
* Comes from https://discord.com/channels/632150470000902164/632150470000902166/1154004784806891571
*/
object Versions {
val scala = "2.13"
guizmaii marked this conversation as resolved.
Show resolved Hide resolved
}
8 changes: 8 additions & 0 deletions quill-sql/src/test/scala-2.13/io/getquill/Versions.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package io.getquill

/**
* Comes from https://discord.com/channels/632150470000902164/632150470000902166/1154004784806891571
*/
object Versions {
val scala = "2.13"
}
15 changes: 13 additions & 2 deletions quill-sql/src/test/scala/io/getquill/context/sql/idiom/BooleanLiteralSupportSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,8 +319,19 @@ class BooleanLiteralSupportSpec extends Spec {
val q = quote {
query[TestEntity].filter(t => !true)
}
ctx.run(q).string mustEqual
"SELECT t.s, t.i, t.l, t.o, t.b FROM TestEntity t WHERE NOT (1 = 1)"

// See:
// - Discord question: https://discord.com/channels/632150470000902164/632150470000902166/1153978338168291369
// - Discord answer: https://discord.com/channels/632150470000902164/632150470000902166/1153991217684697090
// - Be careful with Scala3: https://docs.scala-lang.org/tutorials/FAQ/index.html#i-want-scala-3-why-does-versionnumberstring-say-im-on-213
val isScala212 = io.getquill.Versions.scala.startsWith("2.12")
val expectedQuery =
if (isScala212)
"SELECT t.s, t.i, t.l, t.o, t.b FROM TestEntity t WHERE NOT (1 = 1)"
else
"SELECT t.s, t.i, t.l, t.o, t.b FROM TestEntity t WHERE 1 = 0"

ctx.run(q).string mustEqual expectedQuery
}
"field" in testContext.withDialect(MirrorSqlDialectWithBooleanLiterals) { ctx =>
import ctx._
Expand Down