Skip to content

Commit

Permalink
Fix tests
Browse files Browse the repository at this point in the history 
See zio/zio-quill#2970
  • Loading branch information
@guizmaii
guizmaii committed Mar 15, 2024
1 parent 0ad5cbf commit 56d56bd
Showing 1 changed file with 20 additions and 20 deletions.
40 changes: 20 additions & 20 deletions quill-sql-tests/src/test/scala/io/getquill/context/sql/idiom/SqlIdiomOptionCompareSpec.scala
View file
Expand Up @@ -107,35 +107,35 @@ class SqlIdiomOptionCompareSpec extends Spec {
qr1.filter(t => t.o.exists(op => if (op != 1) false else true))
}
testContext.run(q).string mustEqual
"SELECT t.s, t.i, t.l, t.o, t.b FROM TestEntity t WHERE t.o IS NOT NULL AND CASE WHEN t.o <> 1 THEN false ELSE true END"
"SELECT t.s, t.i, t.l, t.o, t.b FROM TestEntity t WHERE CASE WHEN t.o <> 1 THEN false ELSE true END AND t.o IS NOT NULL"
}
"forall" in {
inline def q = quote {
qr1.filter(t => t.i != 1 && t.o.forall(op => op == 1))
}
testContext.run(q).string mustEqual
"SELECT t.s, t.i, t.l, t.o, t.b FROM TestEntity t WHERE t.i <> 1 AND (t.o IS NULL OR t.o = 1)"
"SELECT t.s, t.i, t.l, t.o, t.b FROM TestEntity t WHERE t.i <> 1 AND (t.o = 1 OR t.o IS NULL)"
}
"forall with null-check" in {
inline def q = quote {
qr1.filter(t => t.i != 1 && t.o.forall(op => if (op != 1) false else true))
}
testContext.run(q).string mustEqual
"SELECT t.s, t.i, t.l, t.o, t.b FROM TestEntity t WHERE t.i <> 1 AND (t.o IS NULL OR t.o IS NOT NULL AND CASE WHEN t.o <> 1 THEN false ELSE true END)"
"SELECT t.s, t.i, t.l, t.o, t.b FROM TestEntity t WHERE t.i <> 1 AND (CASE WHEN t.o <> 1 THEN false ELSE true END AND t.o IS NOT NULL OR t.o IS NULL)"
}
"filterIfDefined" in {
inline def q = quote {
qr1.filter(t => t.i != 1 && t.o.filterIfDefined(op => op == 1))
}
testContext.run(q).string mustEqual
"SELECT t.s, t.i, t.l, t.o, t.b FROM TestEntity t WHERE t.i <> 1 AND (t.o IS NULL OR t.o = 1)"
"SELECT t.s, t.i, t.l, t.o, t.b FROM TestEntity t WHERE t.i <> 1 AND (t.o = 1 OR t.o IS NULL)"
}
"filter IfDefined with null-check" in {
inline def q = quote {
qr1.filter(t => t.i != 1 && t.o.filterIfDefined(op => if (op != 1) false else true))
}
testContext.run(q).string mustEqual
"SELECT t.s, t.i, t.l, t.o, t.b FROM TestEntity t WHERE t.i <> 1 AND (t.o IS NULL OR t.o IS NOT NULL AND CASE WHEN t.o <> 1 THEN false ELSE true END)"
"SELECT t.s, t.i, t.l, t.o, t.b FROM TestEntity t WHERE t.i <> 1 AND (CASE WHEN t.o <> 1 THEN false ELSE true END AND t.o IS NOT NULL OR t.o IS NULL)"
}
"embedded" - {
case class TestEntity(optionalEmbedded: Option[EmbeddedEntity])
Expand Down Expand Up @@ -183,39 +183,39 @@ class SqlIdiomOptionCompareSpec extends Spec {
}

testContext.run(q).string mustEqual
"SELECT t.optionalValue FROM TestEntity t WHERE t.optionalValue IS NOT NULL AND CASE WHEN t.optionalValue = 1 THEN true ELSE false END"
"SELECT t.optionalValue FROM TestEntity t WHERE CASE WHEN t.optionalValue = 1 THEN true ELSE false END AND t.optionalValue IS NOT NULL"
}
"forall" in {
inline def q = quote {
query[TestEntity].filter(t => t.optionalEmbedded.exists(_.optionalValue.forall(_ == 1)))
}

testContext.run(q).string mustEqual
"SELECT t.optionalValue FROM TestEntity t WHERE t.optionalValue IS NULL OR t.optionalValue = 1"
"SELECT t.optionalValue FROM TestEntity t WHERE t.optionalValue = 1 OR t.optionalValue IS NULL"
}
"forall with null-check" in {
inline def q = quote {
query[TestEntity].filter(t => t.optionalEmbedded.exists(_.optionalValue.forall(v => if (v == 1) true else false)))
}

testContext.run(q).string mustEqual
"SELECT t.optionalValue FROM TestEntity t WHERE t.optionalValue IS NULL OR t.optionalValue IS NOT NULL AND CASE WHEN t.optionalValue = 1 THEN true ELSE false END"
"SELECT t.optionalValue FROM TestEntity t WHERE CASE WHEN t.optionalValue = 1 THEN true ELSE false END AND t.optionalValue IS NOT NULL OR t.optionalValue IS NULL"
}
"filterIfDefined" in {
inline def q = quote {
query[TestEntity].filter(t => t.optionalEmbedded.exists(_.optionalValue.filterIfDefined(_ == 1)))
}

testContext.run(q).string mustEqual
"SELECT t.optionalValue FROM TestEntity t WHERE t.optionalValue IS NULL OR t.optionalValue = 1"
"SELECT t.optionalValue FROM TestEntity t WHERE t.optionalValue = 1 t.optionalValue IS NULL"
}
"filterIfDefined with null-check" in {
inline def q = quote {
query[TestEntity].filter(t => t.optionalEmbedded.exists(_.optionalValue.filterIfDefined(v => if (v == 1) true else false)))
}

testContext.run(q).string mustEqual
"SELECT t.optionalValue FROM TestEntity t WHERE t.optionalValue IS NULL OR t.optionalValue IS NOT NULL AND CASE WHEN t.optionalValue = 1 THEN true ELSE false END"
"SELECT t.optionalValue FROM TestEntity t WHERE CASE WHEN t.optionalValue = 1 THEN true ELSE false END AND t.optionalValue IS NOT NULL OR t.optionalValue IS NULL"
}
}
}
Expand Down Expand Up @@ -318,35 +318,35 @@ class SqlIdiomOptionCompareSpec extends Spec {
qr1.filter(t => t.o.exists(op => if (op != 1) false else true))
}
testContext.run(q).string mustEqual
"SELECT t.s, t.i, t.l, t.o, t.b FROM TestEntity t WHERE t.o IS NOT NULL AND CASE WHEN t.o <> 1 THEN false ELSE true END"
"SELECT t.s, t.i, t.l, t.o, t.b FROM TestEntity t WHERE CASE WHEN t.o <> 1 THEN false ELSE true END AND t.o IS NOT NULL"
}
"forall" in {
inline def q = quote {
qr1.filter(t => t.i != 1 && t.o.forall(op => op == 1))
}
testContext.run(q).string mustEqual
"SELECT t.s, t.i, t.l, t.o, t.b FROM TestEntity t WHERE t.i <> 1 AND (t.o IS NULL OR t.o = 1)"
"SELECT t.s, t.i, t.l, t.o, t.b FROM TestEntity t WHERE t.i <> 1 AND (t.o = 1 OR t.o IS NULL)"
}
"forall with null-check" in {
inline def q = quote {
qr1.filter(t => t.i != 1 && t.o.forall(op => if (op != 1) false else true))
}
testContext.run(q).string mustEqual
"SELECT t.s, t.i, t.l, t.o, t.b FROM TestEntity t WHERE t.i <> 1 AND (t.o IS NULL OR t.o IS NOT NULL AND CASE WHEN t.o <> 1 THEN false ELSE true END)"
"SELECT t.s, t.i, t.l, t.o, t.b FROM TestEntity t WHERE t.i <> 1 AND (CASE WHEN t.o <> 1 THEN false ELSE true END AND t.o IS NOT NULL OR t.o IS NULL)"
}
"filterIfDefined" in {
inline def q = quote {
qr1.filter(t => t.i != 1 && t.o.filterIfDefined(op => op == 1))
}
testContext.run(q).string mustEqual
"SELECT t.s, t.i, t.l, t.o, t.b FROM TestEntity t WHERE t.i <> 1 AND (t.o IS NULL OR t.o = 1)"
"SELECT t.s, t.i, t.l, t.o, t.b FROM TestEntity t WHERE t.i <> 1 AND (t.o = 1 OR t.o IS NULL)"
}
"filterIfDefined with null-check" in {
inline def q = quote {
qr1.filter(t => t.i != 1 && t.o.filterIfDefined(op => if (op != 1) false else true))
}
testContext.run(q).string mustEqual
"SELECT t.s, t.i, t.l, t.o, t.b FROM TestEntity t WHERE t.i <> 1 AND (t.o IS NULL OR t.o IS NOT NULL AND CASE WHEN t.o <> 1 THEN false ELSE true END)"
"SELECT t.s, t.i, t.l, t.o, t.b FROM TestEntity t WHERE t.i <> 1 AND (CASE WHEN t.o <> 1 THEN false ELSE true END AND t.o IS NOT NULL OR t.o IS NULL)"
}
"embedded" - {
case class TestEntity(optionalEmbedded: Option[EmbeddedEntity])
Expand Down Expand Up @@ -394,39 +394,39 @@ class SqlIdiomOptionCompareSpec extends Spec {
}

testContext.run(q).string mustEqual
"SELECT t.optionalValue FROM TestEntity t WHERE t.optionalValue IS NOT NULL AND CASE WHEN t.optionalValue = 1 THEN true ELSE false END"
"SELECT t.optionalValue FROM TestEntity t WHERE CASE WHEN t.optionalValue = 1 THEN true ELSE false END AND t.optionalValue IS NOT NULL"
}
"forall" in {
inline def q = quote {
query[TestEntity].filter(t => t.optionalEmbedded.exists(_.optionalValue.forall(_ == 1)))
}

testContext.run(q).string mustEqual
"SELECT t.optionalValue FROM TestEntity t WHERE t.optionalValue IS NULL OR t.optionalValue = 1"
"SELECT t.optionalValue FROM TestEntity t WHERE t.optionalValue = 1 OR t.optionalValue IS NULL"
}
"forall with null-check" in {
inline def q = quote {
query[TestEntity].filter(t => t.optionalEmbedded.exists(_.optionalValue.forall(v => if (v == 1) true else false)))
}

testContext.run(q).string mustEqual
"SELECT t.optionalValue FROM TestEntity t WHERE t.optionalValue IS NULL OR t.optionalValue IS NOT NULL AND CASE WHEN t.optionalValue = 1 THEN true ELSE false END"
"SELECT t.optionalValue FROM TestEntity t WHERE CASE WHEN t.optionalValue = 1 THEN true ELSE false END AND t.optionalValue IS NOT NULL OR t.optionalValue IS NULL"
}
"filterIfDefined" in {
inline def q = quote {
query[TestEntity].filter(t => t.optionalEmbedded.exists(_.optionalValue.filterIfDefined(_ == 1)))
}

testContext.run(q).string mustEqual
"SELECT t.optionalValue FROM TestEntity t WHERE t.optionalValue IS NULL OR t.optionalValue = 1"
"SELECT t.optionalValue FROM TestEntity t WHERE t.optionalValue = 1 OR t.optionalValue IS NULL"
}
"filterIfDefined with null-check" in {
inline def q = quote {
query[TestEntity].filter(t => t.optionalEmbedded.exists(_.optionalValue.filterIfDefined(v => if (v == 1) true else false)))
}

testContext.run(q).string mustEqual
"SELECT t.optionalValue FROM TestEntity t WHERE t.optionalValue IS NULL OR t.optionalValue IS NOT NULL AND CASE WHEN t.optionalValue = 1 THEN true ELSE false END"
"SELECT t.optionalValue FROM TestEntity t WHERE CASE WHEN t.optionalValue = 1 THEN true ELSE false END AND t.optionalValue IS NOT NULL OR t.optionalValue IS NULL"
}
}
}
Expand Down

0 comments on commit 56d56bd

Please sign in to comment.