From 2d240202022ab1e00033aebdd0f278d401aee4a0 Mon Sep 17 00:00:00 2001 From: Roland Praml Date: Wed, 11 Aug 2021 09:32:21 +0200 Subject: [PATCH] Added / enhanced test case --- .../server/query/SqlTreeBuilder.java | 2 +- .../java/org/tests/query/TestQueryExists.java | 28 +++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java index a344244c4..65fa4f7f8 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java @@ -150,7 +150,7 @@ public final class SqlTreeBuilder { if (rawSql) { return "Not Used"; } - if (query.getType() ==Type.SQ_EXISTS) { + if (query.getType() == Type.SQ_EXISTS) { // effective query is "where exists (select 1 from ...)" return "1"; } diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryExists.java b/ebean-core/src/test/java/org/tests/query/TestQueryExists.java index 93155bf9a..f885852b7 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryExists.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryExists.java @@ -1,7 +1,7 @@ package org.tests.query; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.Query; import io.ebeantest.LoggedSql; @@ -21,7 +21,7 @@ public class TestQueryExists extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.find(Order.class) + Query query = DB.find(Order.class) .where().gt("id", 1) .query(); @@ -34,8 +34,8 @@ public class TestQueryExists extends BaseTestCase { assertThat(sql).contains("select t0.id from o_order t0 where t0.id > ? limit 1"); } - assertThat(Ebean.find(Order.class).where().gt("id", 1).exists()).isTrue(); - assertThat(Ebean.find(Order.class).where().or().gt("id", 1).isNull("shipDate").exists()).isTrue(); + assertThat(DB.find(Order.class).where().gt("id", 1).exists()).isTrue(); + assertThat(DB.find(Order.class).where().or().gt("id", 1).isNull("shipDate").exists()).isTrue(); } @Test @@ -43,13 +43,13 @@ public class TestQueryExists extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.find(Order.class) + Query query = DB.find(Order.class) .where().raw("exists (select 1 from o_order_detail where order_id = t0.id)") .query(); List ordersThatHave = query.findList(); - Query query2 = Ebean.find(Order.class) + Query query2 = DB.find(Order.class) .where().raw("not exists (select 1 from o_order_detail where order_id = t0.id)") .query(); @@ -67,13 +67,13 @@ public class TestQueryExists extends BaseTestCase { ResetBasicData.reset(); - Query query = Ebean.find(Customer.class) + Query query = DB.find(Customer.class) .where().raw("exists (select 1 from contact where customer_id = t0.id)") .query(); List customersWithContacts = query.findList(); - Query query2 = Ebean.find(Customer.class) + Query query2 = DB.find(Customer.class) .where().raw("not exists (select 1 FROM contact where customer_id = t0.id)") .query(); @@ -89,26 +89,26 @@ public class TestQueryExists extends BaseTestCase { public void testExists() { ResetBasicData.reset(); - Query subQuery = Ebean.find(Order.class).alias("sq").select("id").where().raw("sq.kcustomer_id = qt.id").query(); + Query subQuery = DB.find(Order.class).alias("sq").select("id").where().raw("sq.kcustomer_id = qt.id").query(); - Query query = Ebean.find(Customer.class).alias("qt").where().exists(subQuery).query(); + Query query = DB.find(Customer.class).alias("qt").where().exists(subQuery).query(); query.findList(); String sql = query.getGeneratedSql(); - assertThat(sql).contains("exists ("); + assertThat(sql).contains("exists (select 1 from"); } @Test public void testNotExists() { ResetBasicData.reset(); - Query subQuery = Ebean.find(Order.class).alias("sq").select("id").where().raw("sq.kcustomer_id = qt.id").query(); - Query query = Ebean.find(Customer.class).alias("qt").where().notExists(subQuery).query(); + Query subQuery = DB.find(Order.class).alias("sq").where().raw("sq.kcustomer_id = qt.id").query(); + Query query = DB.find(Customer.class).alias("qt").where().notExists(subQuery).query(); query.findList(); String sql = query.getGeneratedSql(); - assertThat(sql).contains("not exists ("); + assertThat(sql).contains("not exists (select 1 from"); } }