mirror of
https://github.com/ebean-orm/ebean.git
synced 2026-11-19 23:02:24 +00:00
#2361 - Tidy tests only, move to LoggedSql (ebean-test)
This commit is contained in:
1 parent
e5dceda4b9
commit
1696caadd4
163 files changed
+1024
-1179
No files matched your search
@@ -3,7 +3,7 @@ package org.tests.query;
|
||||
import io.ebean.BaseTestCase;
|
||||
import io.ebean.DB;
|
||||
import io.ebean.PagedList;
|
||||
import org.ebeantest.LoggedSqlCollector;
|
||||
import io.ebean.test.LoggedSql;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.tests.model.basic.Order;
|
||||
import org.tests.model.basic.ResetBasicData;
|
||||
@@ -22,14 +22,14 @@ public class TestAddOrderByWithFirstRowsMaxRows extends BaseTestCase {
|
||||
|
||||
ResetBasicData.reset();
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
|
||||
DB.find(Order.class)
|
||||
.setFirstRow(3)
|
||||
.order().asc("id")
|
||||
.findList();
|
||||
|
||||
List<String> loggedSql = LoggedSqlCollector.stop();
|
||||
List<String> loggedSql = LoggedSql.stop();
|
||||
|
||||
assertThat(loggedSql).hasSize(1);
|
||||
assertThat(loggedSql.get(0)).contains("order by t0.id");
|
||||
@@ -41,13 +41,13 @@ public class TestAddOrderByWithFirstRowsMaxRows extends BaseTestCase {
|
||||
|
||||
ResetBasicData.reset();
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
|
||||
DB.find(Order.class)
|
||||
.setMaxRows(10)
|
||||
.findList();
|
||||
|
||||
List<String> loggedSql = LoggedSqlCollector.stop();
|
||||
List<String> loggedSql = LoggedSql.stop();
|
||||
|
||||
assertThat(loggedSql).hasSize(1);
|
||||
if (isH2()) {
|
||||
@@ -61,7 +61,7 @@ public class TestAddOrderByWithFirstRowsMaxRows extends BaseTestCase {
|
||||
|
||||
ResetBasicData.reset();
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
|
||||
DB.find(Order.class)
|
||||
.setFirstRow(3)
|
||||
@@ -69,7 +69,7 @@ public class TestAddOrderByWithFirstRowsMaxRows extends BaseTestCase {
|
||||
.order().asc("id")
|
||||
.findList();
|
||||
|
||||
List<String> loggedSql = LoggedSqlCollector.stop();
|
||||
List<String> loggedSql = LoggedSql.stop();
|
||||
|
||||
assertThat(loggedSql).hasSize(1);
|
||||
assertThat(loggedSql.get(0)).contains("order by t0.id");
|
||||
@@ -80,7 +80,7 @@ public class TestAddOrderByWithFirstRowsMaxRows extends BaseTestCase {
|
||||
|
||||
ResetBasicData.reset();
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
|
||||
// maxRows 1 with no first rows means Ebean does not automatically
|
||||
// add the order by id to the query
|
||||
@@ -88,7 +88,7 @@ public class TestAddOrderByWithFirstRowsMaxRows extends BaseTestCase {
|
||||
.setMaxRows(1)
|
||||
.findList();
|
||||
|
||||
List<String> loggedSql = LoggedSqlCollector.stop();
|
||||
List<String> loggedSql = LoggedSql.stop();
|
||||
|
||||
assertThat(loggedSql).hasSize(1);
|
||||
assertThat(loggedSql.get(0)).doesNotContain("order by t0.id");
|
||||
@@ -99,7 +99,7 @@ public class TestAddOrderByWithFirstRowsMaxRows extends BaseTestCase {
|
||||
|
||||
ResetBasicData.reset();
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
|
||||
PagedList<Order> pagedList =
|
||||
DB.find(Order.class)
|
||||
@@ -108,7 +108,7 @@ public class TestAddOrderByWithFirstRowsMaxRows extends BaseTestCase {
|
||||
|
||||
pagedList.getList();
|
||||
|
||||
List<String> loggedSql = LoggedSqlCollector.stop();
|
||||
List<String> loggedSql = LoggedSql.stop();
|
||||
|
||||
assertThat(loggedSql).hasSize(1);
|
||||
if (isH2()) {
|
||||
@@ -121,7 +121,7 @@ public class TestAddOrderByWithFirstRowsMaxRows extends BaseTestCase {
|
||||
|
||||
ResetBasicData.reset();
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
|
||||
DB.find(Order.class)
|
||||
.setFirstRow(10)
|
||||
@@ -130,7 +130,7 @@ public class TestAddOrderByWithFirstRowsMaxRows extends BaseTestCase {
|
||||
.findPagedList()
|
||||
.getList();
|
||||
|
||||
List<String> loggedSql = LoggedSqlCollector.stop();
|
||||
List<String> loggedSql = LoggedSql.stop();
|
||||
|
||||
assertThat(loggedSql).hasSize(1);
|
||||
if (isH2()) {
|
||||
@@ -144,7 +144,7 @@ public class TestAddOrderByWithFirstRowsMaxRows extends BaseTestCase {
|
||||
|
||||
ResetBasicData.reset();
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
|
||||
DB.find(Order.class)
|
||||
.order().asc("orderDate")
|
||||
@@ -152,7 +152,7 @@ public class TestAddOrderByWithFirstRowsMaxRows extends BaseTestCase {
|
||||
.findPagedList()
|
||||
.getList();
|
||||
|
||||
List<String> loggedSql = LoggedSqlCollector.stop();
|
||||
List<String> loggedSql = LoggedSql.stop();
|
||||
|
||||
assertThat(loggedSql).hasSize(1);
|
||||
assertThat(loggedSql.get(0)).contains("order by t0.order_date");
|
||||
@@ -163,7 +163,7 @@ public class TestAddOrderByWithFirstRowsMaxRows extends BaseTestCase {
|
||||
|
||||
ResetBasicData.reset();
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
|
||||
DB.find(Order.class)
|
||||
.order().asc("orderDate")
|
||||
@@ -172,7 +172,7 @@ public class TestAddOrderByWithFirstRowsMaxRows extends BaseTestCase {
|
||||
.findPagedList()
|
||||
.getList();
|
||||
|
||||
List<String> loggedSql = LoggedSqlCollector.stop();
|
||||
List<String> loggedSql = LoggedSql.stop();
|
||||
|
||||
assertThat(loggedSql).hasSize(1);
|
||||
assertThat(loggedSql.get(0)).contains("order by t0.order_date, t0.id desc");
|
||||
|
||||
@@ -2,7 +2,7 @@ package org.tests.query;
|
||||
|
||||
import io.ebean.BaseTestCase;
|
||||
import io.ebean.DB;
|
||||
import io.ebeantest.LoggedSql;
|
||||
import io.ebean.test.LoggedSql;
|
||||
import org.junit.jupiter.api.BeforeAll;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.tests.model.basic.Customer;
|
||||
|
||||
@@ -4,7 +4,7 @@ import io.ebean.BaseTestCase;
|
||||
import io.ebean.DB;
|
||||
import io.ebean.annotation.ForPlatform;
|
||||
import io.ebean.annotation.Platform;
|
||||
import org.ebeantest.LoggedSqlCollector;
|
||||
import io.ebean.test.LoggedSql;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.tests.model.basic.Customer;
|
||||
import org.tests.model.basic.ResetBasicData;
|
||||
@@ -21,7 +21,7 @@ public class TestQueryBaseTable extends BaseTestCase {
|
||||
|
||||
ResetBasicData.reset();
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
|
||||
Customer one = DB.find(Customer.class)
|
||||
.setBaseTable("O_CUSTOMER")
|
||||
@@ -40,7 +40,7 @@ public class TestQueryBaseTable extends BaseTestCase {
|
||||
assertThat(one.getName()).isEqualTo(two.getName());
|
||||
assertThat(three.getName()).isEqualTo("Fiona");
|
||||
|
||||
List<String> sql = LoggedSqlCollector.stop();
|
||||
List<String> sql = LoggedSql.stop();
|
||||
|
||||
assertThat(sql).hasSize(3);
|
||||
assertSql(sql.get(0)).contains("from O_CUSTOMER");
|
||||
|
||||
@@ -3,7 +3,7 @@ package org.tests.query;
|
||||
import io.ebean.BaseTestCase;
|
||||
import io.ebean.DB;
|
||||
import io.ebean.Query;
|
||||
import io.ebeantest.LoggedSql;
|
||||
import io.ebean.test.LoggedSql;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.tests.model.basic.Customer;
|
||||
import org.tests.model.basic.Order;
|
||||
|
||||
@@ -3,7 +3,7 @@ package org.tests.query;
|
||||
import io.ebean.BaseTestCase;
|
||||
import io.ebean.DB;
|
||||
import io.ebean.Query;
|
||||
import org.ebeantest.LoggedSqlCollector;
|
||||
import io.ebean.test.LoggedSql;
|
||||
import org.tests.model.basic.Contact;
|
||||
import org.tests.model.basic.Customer;
|
||||
import org.tests.model.basic.OrderShipment;
|
||||
@@ -30,11 +30,11 @@ public class TestQueryFetchManyTwoDeep extends BaseTestCase {
|
||||
.fetch("orders.details");
|
||||
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
|
||||
List<Customer> list = query.findList();
|
||||
|
||||
List<String> sql = LoggedSqlCollector.stop();
|
||||
List<String> sql = LoggedSql.stop();
|
||||
|
||||
assertTrue(!list.isEmpty());
|
||||
String mainSql = sqlOf(query);
|
||||
|
||||
@@ -4,7 +4,7 @@ import io.ebean.BaseTestCase;
|
||||
import io.ebean.DB;
|
||||
import io.ebean.ExpressionList;
|
||||
import io.ebean.Query;
|
||||
import org.ebeantest.LoggedSqlCollector;
|
||||
import io.ebean.test.LoggedSql;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.tests.model.basic.Customer;
|
||||
import org.tests.model.basic.Order;
|
||||
@@ -24,7 +24,7 @@ public class TestQueryFilterMany extends BaseTestCase {
|
||||
|
||||
ResetBasicData.reset();
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
|
||||
Customer customer = DB.find(Customer.class)
|
||||
.fetchLazy("orders")
|
||||
@@ -36,7 +36,7 @@ public class TestQueryFilterMany extends BaseTestCase {
|
||||
final int size = customer.getOrders().size();
|
||||
assertThat(size).isGreaterThan(0);
|
||||
|
||||
List<String> sqlList = LoggedSqlCollector.stop();
|
||||
List<String> sqlList = LoggedSql.stop();
|
||||
assertEquals(2, sqlList.size());
|
||||
assertThat(sqlList.get(1)).contains("status = ?");
|
||||
|
||||
@@ -50,7 +50,7 @@ public class TestQueryFilterMany extends BaseTestCase {
|
||||
|
||||
ResetBasicData.reset();
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
|
||||
final Query<Customer> query = DB.find(Customer.class)
|
||||
.where().ieq("name", "Rob")
|
||||
@@ -60,7 +60,7 @@ public class TestQueryFilterMany extends BaseTestCase {
|
||||
|
||||
final List<Customer> customers = query.findList();
|
||||
assertThat(customers).isNotEmpty();
|
||||
List<String> sqlList = LoggedSqlCollector.stop();
|
||||
List<String> sqlList = LoggedSql.stop();
|
||||
assertEquals(2, sqlList.size());
|
||||
assertThat(sqlList.get(0)).contains("lower(t0.name) = ?");
|
||||
assertThat(sqlList.get(1)).contains("status = ?");
|
||||
@@ -78,7 +78,7 @@ public class TestQueryFilterMany extends BaseTestCase {
|
||||
|
||||
ResetBasicData.reset();
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
|
||||
final Query<Customer> query = DB.find(Customer.class)
|
||||
.where().ieq("name", "Rob")
|
||||
@@ -91,7 +91,7 @@ public class TestQueryFilterMany extends BaseTestCase {
|
||||
|
||||
final List<Customer> customers = query.findList();
|
||||
assertThat(customers).isNotEmpty();
|
||||
List<String> sqlList = LoggedSqlCollector.stop();
|
||||
List<String> sqlList = LoggedSql.stop();
|
||||
assertEquals(2, sqlList.size());
|
||||
|
||||
assertThat(sqlList.get(0)).contains("lower(t0.name) = ?");
|
||||
@@ -110,7 +110,7 @@ public class TestQueryFilterMany extends BaseTestCase {
|
||||
|
||||
ResetBasicData.reset();
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
|
||||
final Query<Customer> query = DB.find(Customer.class)
|
||||
.where().ieq("name", "Rob")
|
||||
@@ -121,7 +121,7 @@ public class TestQueryFilterMany extends BaseTestCase {
|
||||
|
||||
final List<Customer> customers = query.findList();
|
||||
assertThat(customers).isNotEmpty();
|
||||
List<String> sqlList = LoggedSqlCollector.stop();
|
||||
List<String> sqlList = LoggedSql.stop();
|
||||
assertEquals(2, sqlList.size());
|
||||
assertThat(sqlList.get(0)).contains("lower(t0.name) = ?");
|
||||
assertThat(sqlList.get(1)).contains("status = ?");
|
||||
@@ -168,7 +168,7 @@ public class TestQueryFilterMany extends BaseTestCase {
|
||||
|
||||
ResetBasicData.reset();
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
|
||||
Query<Customer> query = DB.find(Customer.class)
|
||||
.filterMany("orders").raw("1=0")
|
||||
@@ -180,7 +180,7 @@ public class TestQueryFilterMany extends BaseTestCase {
|
||||
assertThat(customer.getOrders()).isEmpty();
|
||||
}
|
||||
|
||||
List<String> sqlList = LoggedSqlCollector.stop();
|
||||
List<String> sqlList = LoggedSql.stop();
|
||||
assertEquals(1, sqlList.size());
|
||||
assertThat(sqlList.get(0)).contains("from o_customer t0 left join o_order t1 on t1.kcustomer_id = t0.id and t1.order_date is not null left join o_customer t2 on t2.id = t1.kcustomer_id where exists (select 1 from o_order x where x.kcustomer_id = t0.id and x.order_date is not null) and 1=0 order by t0.id");
|
||||
}
|
||||
@@ -190,7 +190,7 @@ public class TestQueryFilterMany extends BaseTestCase {
|
||||
|
||||
ResetBasicData.reset();
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
|
||||
Query<Customer> query = DB.find(Customer.class)
|
||||
.fetch("orders")
|
||||
@@ -199,7 +199,7 @@ public class TestQueryFilterMany extends BaseTestCase {
|
||||
|
||||
query.findCount();
|
||||
|
||||
List<String> sqlList = LoggedSqlCollector.stop();
|
||||
List<String> sqlList = LoggedSql.stop();
|
||||
assertEquals(1, sqlList.size());
|
||||
assertThat(sqlList.get(0)).contains("select count(*) from o_customer");
|
||||
}
|
||||
@@ -208,7 +208,7 @@ public class TestQueryFilterMany extends BaseTestCase {
|
||||
public void test_filterMany_copy_findList() {
|
||||
|
||||
ResetBasicData.reset();
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
|
||||
Query<Customer> query = DB.find(Customer.class)
|
||||
.fetch("orders")
|
||||
@@ -217,7 +217,7 @@ public class TestQueryFilterMany extends BaseTestCase {
|
||||
|
||||
query.copy().findList();
|
||||
|
||||
List<String> sqlList = LoggedSqlCollector.stop();
|
||||
List<String> sqlList = LoggedSql.stop();
|
||||
assertEquals(1, sqlList.size());
|
||||
assertThat(sqlList.get(0)).contains("from o_customer t0 left join o_order t1 on t1.kcustomer_id = t0.id and t1.order_date is not null left join o_customer t2 on t2.id = t1.kcustomer_id where t1.status ");
|
||||
if (isPostgres()) {
|
||||
@@ -231,7 +231,7 @@ public class TestQueryFilterMany extends BaseTestCase {
|
||||
public void test_filterMany_fetchQuery() {
|
||||
|
||||
ResetBasicData.reset();
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
|
||||
Query<Customer> query = DB.find(Customer.class)
|
||||
.fetchQuery("orders") // explicitly fetch orders separately
|
||||
@@ -240,7 +240,7 @@ public class TestQueryFilterMany extends BaseTestCase {
|
||||
|
||||
query.findList();
|
||||
|
||||
List<String> sqlList = LoggedSqlCollector.stop();
|
||||
List<String> sqlList = LoggedSql.stop();
|
||||
assertEquals(2, sqlList.size());
|
||||
assertThat(sqlList.get(0)).contains("from o_customer t0");
|
||||
if (isPostgres()) {
|
||||
@@ -256,7 +256,7 @@ public class TestQueryFilterMany extends BaseTestCase {
|
||||
public void testDisjunction() {
|
||||
|
||||
ResetBasicData.reset();
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
|
||||
DB.find(Customer.class)
|
||||
.filterMany("orders")
|
||||
@@ -265,7 +265,7 @@ public class TestQueryFilterMany extends BaseTestCase {
|
||||
.eq("orderDate", LocalDate.now())
|
||||
.findList();
|
||||
|
||||
List<String> sql = LoggedSqlCollector.stop();
|
||||
List<String> sql = LoggedSql.stop();
|
||||
assertEquals(1, sql.size());
|
||||
assertSql(sql.get(0)).contains(" from o_customer t0 left join o_order t1 on t1.kcustomer_id = t0.id and t1.order_date is not null left join o_customer t2 on t2.id = t1.kcustomer_id where (t1.status = ? or t1.order_date = ?) order by t0.id");
|
||||
}
|
||||
@@ -274,13 +274,13 @@ public class TestQueryFilterMany extends BaseTestCase {
|
||||
public void testNestedFilterMany() {
|
||||
|
||||
ResetBasicData.reset();
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
DB.find(Customer.class)
|
||||
.filterMany("contacts").isNotNull("firstName")
|
||||
.filterMany("contacts.notes").istartsWith("title", "foo")
|
||||
.findList();
|
||||
|
||||
List<String> sql = LoggedSqlCollector.stop();
|
||||
List<String> sql = LoggedSql.stop();
|
||||
|
||||
assertThat(sql).hasSize(2);
|
||||
assertSql(sql.get(0)).contains(" from o_customer t0 left join contact t1 on t1.customer_id = t0.id where t1.first_name is not null order by t0.id; --bind()");
|
||||
@@ -292,14 +292,14 @@ public class TestQueryFilterMany extends BaseTestCase {
|
||||
public void testFilterManyUsingExpression() {
|
||||
|
||||
ResetBasicData.reset();
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
|
||||
DB.find(Customer.class)
|
||||
.where()
|
||||
.filterMany("contacts", "firstName isNotNull and email istartsWith ?", "rob")
|
||||
.findList();
|
||||
|
||||
List<String> sql = LoggedSqlCollector.stop();
|
||||
List<String> sql = LoggedSql.stop();
|
||||
|
||||
assertThat(sql).hasSize(1);
|
||||
if (isSqlServer()) {
|
||||
|
||||
@@ -7,7 +7,7 @@ import io.ebean.Transaction;
|
||||
import io.ebean.annotation.Transactional;
|
||||
import io.ebean.bean.PersistenceContext;
|
||||
import io.ebeaninternal.api.SpiTransaction;
|
||||
import org.ebeantest.LoggedSqlCollector;
|
||||
import io.ebean.test.LoggedSql;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
@@ -127,13 +127,13 @@ public class TestQueryFindEach extends BaseTestCase {
|
||||
PersistenceContext pc = spiTxn.getPersistenceContext();
|
||||
assertThat(pc.size(Customer.class)).isEqualTo(customerList.size());
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
query.findEach(contact -> {
|
||||
// use customer from persistence context (otherwise would invoke lazy loading)
|
||||
assertNotNull(contact.getCustomer().getName());
|
||||
});
|
||||
|
||||
final List<String> sql = LoggedSqlCollector.stop();
|
||||
final List<String> sql = LoggedSql.stop();
|
||||
assertThat(sql).hasSize(1);
|
||||
}
|
||||
}
|
||||
@@ -170,7 +170,7 @@ public class TestQueryFindEach extends BaseTestCase {
|
||||
|
||||
test_setLazyLoadBatchSize_withFetchLazy();
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
|
||||
DB.find(OmBasicChild.class)
|
||||
.setLazyLoadBatchSize(100)
|
||||
@@ -178,13 +178,13 @@ public class TestQueryFindEach extends BaseTestCase {
|
||||
assertNotNull(child.getParent().getName());
|
||||
});
|
||||
|
||||
final List<String> sql = LoggedSqlCollector.stop();
|
||||
final List<String> sql = LoggedSql.stop();
|
||||
assertThat(sql.size()).isLessThan(50);
|
||||
}
|
||||
|
||||
private void test_setLazyLoadBatchSize_withFetchLazy() {
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
|
||||
DB.find(OmBasicParent.class)
|
||||
.setLazyLoadBatchSize(5)
|
||||
@@ -194,7 +194,7 @@ public class TestQueryFindEach extends BaseTestCase {
|
||||
it.getChildren().size();
|
||||
});
|
||||
|
||||
final List<String> sql = LoggedSqlCollector.stop();
|
||||
final List<String> sql = LoggedSql.stop();
|
||||
assertThat(sql).hasSize(11);
|
||||
assertThat(sql.get(0)).contains(" from om_basic_parent ");
|
||||
for (int i = 1; i < 11; i++) {
|
||||
|
||||
@@ -8,7 +8,7 @@ import io.ebean.annotation.ForPlatform;
|
||||
import io.ebean.annotation.Platform;
|
||||
import io.ebean.datasource.DataSourcePool;
|
||||
import io.ebean.plugin.SpiServer;
|
||||
import org.ebeantest.LoggedSqlCollector;
|
||||
import io.ebean.test.LoggedSql;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.tests.model.basic.Customer;
|
||||
import org.tests.model.basic.Order;
|
||||
@@ -119,7 +119,7 @@ public class TestQueryFindIterate extends BaseTestCase {
|
||||
|
||||
ResetBasicData.reset();
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
|
||||
DB.find(Order.class)
|
||||
.setLazyLoadBatchSize(10)
|
||||
@@ -135,7 +135,7 @@ public class TestQueryFindIterate extends BaseTestCase {
|
||||
});
|
||||
|
||||
|
||||
List<String> loggedSql = LoggedSqlCollector.stop();
|
||||
List<String> loggedSql = LoggedSql.stop();
|
||||
|
||||
assertEquals(3, loggedSql.size());
|
||||
assertTrue(trimSql(loggedSql.get(0), 7).contains("select t0.id, t0.status, t0.order_date, t1.id, t1.name from o_order t0 join o_customer t1"));
|
||||
@@ -148,7 +148,7 @@ public class TestQueryFindIterate extends BaseTestCase {
|
||||
|
||||
ResetBasicData.reset();
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
|
||||
// make sure we don't hit the L2 cache for order shipments
|
||||
DB.cacheManager().clear(Order.class);
|
||||
@@ -170,7 +170,7 @@ public class TestQueryFindIterate extends BaseTestCase {
|
||||
order.getShipments().size();
|
||||
});
|
||||
|
||||
List<String> loggedSql = LoggedSqlCollector.stop();
|
||||
List<String> loggedSql = LoggedSql.stop();
|
||||
|
||||
assertEquals(2, loggedSql.size());
|
||||
assertThat(trimSql(loggedSql.get(0), 7).contains("select t0.id, t0.status, t0.order_date, t1.id, t1.name, t2.id, t2.order_qty, t2.ship_qty"));
|
||||
|
||||
@@ -5,7 +5,7 @@ import io.ebean.DB;
|
||||
import io.ebean.FetchConfig;
|
||||
import io.ebean.PagedList;
|
||||
import org.assertj.core.util.Lists;
|
||||
import org.ebeantest.LoggedSqlCollector;
|
||||
import io.ebean.test.LoggedSql;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.tests.model.basic.Contact;
|
||||
import org.tests.model.basic.Customer;
|
||||
@@ -23,13 +23,13 @@ public class TestQueryFindNative extends BaseTestCase {
|
||||
|
||||
ResetBasicData.reset();
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
|
||||
String sql = "select id,first_name from contact where id in(:ids)";
|
||||
DB.findNative(Contact.class, sql).setParameter("ids", Lists.newArrayList(1, 2, 3)).findList();
|
||||
DB.findNative(Contact.class, sql).setParameter("ids", Lists.newArrayList(1, 2)).findList();
|
||||
|
||||
List<String> loggedSql = LoggedSqlCollector.stop();
|
||||
List<String> loggedSql = LoggedSql.stop();
|
||||
assertThat(loggedSql).hasSize(2);
|
||||
if (isH2()) {
|
||||
assertThat(loggedSql.get(0)).contains("(?,?,?)");
|
||||
@@ -43,7 +43,7 @@ public class TestQueryFindNative extends BaseTestCase {
|
||||
ResetBasicData.reset();
|
||||
String sql = "select n.id from contact n where n.first_name like ?";
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
|
||||
int rowCount = server()
|
||||
.findNative(Contact.class, sql)
|
||||
@@ -56,7 +56,7 @@ public class TestQueryFindNative extends BaseTestCase {
|
||||
.setParameter(1, "J%")
|
||||
.findIds();
|
||||
|
||||
List<String> loggedSql = LoggedSqlCollector.stop();
|
||||
List<String> loggedSql = LoggedSql.stop();
|
||||
|
||||
assertThat(nativeIds).hasSize(rowCount);
|
||||
|
||||
@@ -77,12 +77,12 @@ public class TestQueryFindNative extends BaseTestCase {
|
||||
.setMaxRows(100)
|
||||
.findPagedList();
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
|
||||
int listSize = pagedList.getList().size();
|
||||
int totalCount = pagedList.getTotalCount();
|
||||
|
||||
List<String> loggedSql = LoggedSqlCollector.stop();
|
||||
List<String> loggedSql = LoggedSql.stop();
|
||||
|
||||
assertThat(listSize).isEqualTo(totalCount);
|
||||
|
||||
@@ -204,7 +204,7 @@ public class TestQueryFindNative extends BaseTestCase {
|
||||
"from o_customer " +
|
||||
"order by order_column_1";
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
|
||||
List<Customer> result = DB.findNative(Customer.class, sql)
|
||||
.setParameter(LocalDate.now())
|
||||
@@ -214,7 +214,7 @@ public class TestQueryFindNative extends BaseTestCase {
|
||||
.findList();
|
||||
|
||||
assertThat(result).isNotEmpty();
|
||||
List<String> loggedSql = LoggedSqlCollector.stop();
|
||||
List<String> loggedSql = LoggedSql.stop();
|
||||
|
||||
if (isH2()) {
|
||||
assertThat(loggedSql.get(0)).contains("from o_customer order by order_column_1 limit 10 offset 1");
|
||||
@@ -231,7 +231,7 @@ public class TestQueryFindNative extends BaseTestCase {
|
||||
"from o_customer " +
|
||||
"order by order_column_1";
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
|
||||
List<Customer> result = DB.findNative(Customer.class, sql)
|
||||
.setParameter("date", LocalDate.now())
|
||||
@@ -240,7 +240,7 @@ public class TestQueryFindNative extends BaseTestCase {
|
||||
.findList();
|
||||
|
||||
assertThat(result).isNotEmpty();
|
||||
List<String> loggedSql = LoggedSqlCollector.stop();
|
||||
List<String> loggedSql = LoggedSql.stop();
|
||||
|
||||
if (isH2()) {
|
||||
assertThat(loggedSql.get(0)).contains("from o_customer order by order_column_1 limit 10 offset 1");
|
||||
@@ -255,14 +255,14 @@ public class TestQueryFindNative extends BaseTestCase {
|
||||
|
||||
String sql = "select * from o_customer";
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
|
||||
List<Customer> result = DB.findNative(Customer.class, sql)
|
||||
.fetchQuery("contacts")
|
||||
.findList();
|
||||
|
||||
assertThat(result).isNotEmpty();
|
||||
List<String> loggedSql = LoggedSqlCollector.stop();
|
||||
List<String> loggedSql = LoggedSql.stop();
|
||||
|
||||
if (isH2()) {
|
||||
assertThat(loggedSql).hasSize(2);
|
||||
@@ -278,14 +278,14 @@ public class TestQueryFindNative extends BaseTestCase {
|
||||
|
||||
String sql = "select * from o_customer";
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
|
||||
List<Customer> result = DB.findNative(Customer.class, sql)
|
||||
.fetch("contacts", "firstName, lastName")
|
||||
.findList();
|
||||
|
||||
assertThat(result).isNotEmpty();
|
||||
List<String> loggedSql = LoggedSqlCollector.stop();
|
||||
List<String> loggedSql = LoggedSql.stop();
|
||||
|
||||
if (isH2()) {
|
||||
assertThat(loggedSql).hasSize(2);
|
||||
@@ -301,7 +301,7 @@ public class TestQueryFindNative extends BaseTestCase {
|
||||
|
||||
String sql = "select * from o_customer";
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
|
||||
List<Customer> result = DB.findNative(Customer.class, sql)
|
||||
.fetchQuery("orders")
|
||||
@@ -309,7 +309,7 @@ public class TestQueryFindNative extends BaseTestCase {
|
||||
.findList();
|
||||
|
||||
assertThat(result).isNotEmpty();
|
||||
List<String> loggedSql = LoggedSqlCollector.stop();
|
||||
List<String> loggedSql = LoggedSql.stop();
|
||||
|
||||
if (isH2()) {
|
||||
assertThat(loggedSql).hasSize(3);
|
||||
@@ -326,7 +326,7 @@ public class TestQueryFindNative extends BaseTestCase {
|
||||
|
||||
String sql = "select * from o_customer";
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
|
||||
List<Customer> result = DB.findNative(Customer.class, sql)
|
||||
// with nativeSql fetch (default) are converted to fetchQuery()
|
||||
@@ -335,7 +335,7 @@ public class TestQueryFindNative extends BaseTestCase {
|
||||
.findList();
|
||||
|
||||
assertThat(result).isNotEmpty();
|
||||
List<String> loggedSql = LoggedSqlCollector.stop();
|
||||
List<String> loggedSql = LoggedSql.stop();
|
||||
|
||||
if (isH2()) {
|
||||
assertThat(loggedSql).hasSize(3);
|
||||
|
||||
@@ -3,7 +3,7 @@ package org.tests.query;
|
||||
import io.ebean.BaseTestCase;
|
||||
import io.ebean.DB;
|
||||
import io.ebean.PagedList;
|
||||
import org.ebeantest.LoggedSqlCollector;
|
||||
import io.ebean.test.LoggedSql;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.tests.model.basic.Customer;
|
||||
import org.tests.model.basic.Order;
|
||||
@@ -49,12 +49,12 @@ public class TestQueryFindPagedList extends BaseTestCase {
|
||||
.setMaxRows(4)
|
||||
.findPagedList();
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
|
||||
List<Order> orders = pagedList.getList();
|
||||
|
||||
assertTrue(!orders.isEmpty());
|
||||
List<String> loggedSql = LoggedSqlCollector.stop();
|
||||
List<String> loggedSql = LoggedSql.stop();
|
||||
|
||||
assertEquals(1, loggedSql.size());
|
||||
}
|
||||
@@ -157,12 +157,12 @@ public class TestQueryFindPagedList extends BaseTestCase {
|
||||
|
||||
PagedList<Order> pagedList = DB.find(Order.class).setMaxRows(4).findPagedList();
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
|
||||
List<Order> orders = pagedList.getList();
|
||||
|
||||
assertTrue(!orders.isEmpty());
|
||||
List<String> loggedSql = LoggedSqlCollector.stop();
|
||||
List<String> loggedSql = LoggedSql.stop();
|
||||
|
||||
assertEquals(1, loggedSql.size());
|
||||
}
|
||||
@@ -211,7 +211,7 @@ public class TestQueryFindPagedList extends BaseTestCase {
|
||||
|
||||
PagedList<Order> pagedList = DB.find(Order.class).setMaxRows(3).findPagedList();
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
|
||||
// kinda not normal but just wrap in a transaction to assert
|
||||
// the background fetch does not occur (which explicitly creates
|
||||
@@ -225,7 +225,7 @@ public class TestQueryFindPagedList extends BaseTestCase {
|
||||
// invoke it again but cached...
|
||||
int totalRowCountAgain = pagedList.getTotalCount();
|
||||
|
||||
List<String> loggedSql = LoggedSqlCollector.stop();
|
||||
List<String> loggedSql = LoggedSql.stop();
|
||||
|
||||
assertTrue(orders.size() < totalRowCount);
|
||||
assertEquals(2, loggedSql.size());
|
||||
@@ -253,12 +253,12 @@ public class TestQueryFindPagedList extends BaseTestCase {
|
||||
.setMaxRows(6)
|
||||
.findPagedList();
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
|
||||
pagedList.getTotalCount();
|
||||
pagedList.getList();
|
||||
|
||||
List<String> loggedSql = LoggedSqlCollector.stop();
|
||||
List<String> loggedSql = LoggedSql.stop();
|
||||
|
||||
assertEquals(2, loggedSql.size());
|
||||
assertThat(loggedSql.get(0)).contains("select count(*) from o_order b where b.id > 0");
|
||||
|
||||
@@ -7,7 +7,7 @@ import io.ebean.Expr;
|
||||
import io.ebean.Query;
|
||||
import io.ebean.annotation.ForPlatform;
|
||||
import io.ebean.annotation.Platform;
|
||||
import org.ebeantest.LoggedSqlCollector;
|
||||
import io.ebean.test.LoggedSql;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.tests.model.basic.Customer;
|
||||
import org.tests.model.basic.Order;
|
||||
@@ -153,7 +153,7 @@ public class TestWhereRawClause extends BaseTestCase {
|
||||
|
||||
ResetBasicData.reset();
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
|
||||
DB.find(Customer.class)
|
||||
.select("name").where().rawOrEmpty("name = any(?)", asList("Rob", "Fiona", "Jack"))
|
||||
@@ -167,7 +167,7 @@ public class TestWhereRawClause extends BaseTestCase {
|
||||
.select("name").where().rawOrEmpty("name = any(?)", null)
|
||||
.findList();
|
||||
|
||||
List<String> sql = LoggedSqlCollector.stop();
|
||||
List<String> sql = LoggedSql.stop();
|
||||
|
||||
assertThat(sql.get(0)).contains("select t0.id, t0.name from o_customer t0 where t0.name = any(?);");
|
||||
assertThat(sql.get(1)).contains("select t0.id, t0.name from o_customer t0; --bind()");
|
||||
|
||||
@@ -3,8 +3,7 @@ package org.tests.query.aggregation;
|
||||
import io.ebean.BaseTestCase;
|
||||
import io.ebean.DB;
|
||||
import io.ebean.Query;
|
||||
import io.ebeantest.LoggedSql;
|
||||
import org.ebeantest.LoggedSqlCollector;
|
||||
import io.ebean.test.LoggedSql;
|
||||
import org.junit.jupiter.api.BeforeAll;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.tests.model.basic.Contact;
|
||||
@@ -64,7 +63,7 @@ public class TestAggregationCount extends BaseTestCase {
|
||||
|
||||
ResetBasicData.reset();
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
|
||||
int count =
|
||||
DB.find(TEventOne.class)
|
||||
@@ -73,7 +72,7 @@ public class TestAggregationCount extends BaseTestCase {
|
||||
|
||||
assertThat(count).isGreaterThan(1);
|
||||
|
||||
List<String> sql = LoggedSqlCollector.stop();
|
||||
List<String> sql = LoggedSql.stop();
|
||||
assertSql(sql.get(0)).contains("select count(*) from tevent_one t0 where t0.name is not null");
|
||||
}
|
||||
|
||||
@@ -238,7 +237,7 @@ public class TestAggregationCount extends BaseTestCase {
|
||||
assertThat(sql).contains("having max(t0.version) >= ?");
|
||||
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
|
||||
for (TEventOne eventOne : list) {
|
||||
assertThat(eventOne.getStatus()).isNotNull();
|
||||
@@ -250,7 +249,7 @@ public class TestAggregationCount extends BaseTestCase {
|
||||
assertThat(eventOne.getName()).isNull();
|
||||
}
|
||||
|
||||
List<String> lazyLoadSql = LoggedSqlCollector.stop();
|
||||
List<String> lazyLoadSql = LoggedSql.stop();
|
||||
assertThat(lazyLoadSql).isEmpty();
|
||||
}
|
||||
|
||||
@@ -375,7 +374,7 @@ public class TestAggregationCount extends BaseTestCase {
|
||||
|
||||
ResetBasicData.reset();
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
|
||||
String maxLastName =
|
||||
DB.find(Contact.class)
|
||||
@@ -385,7 +384,7 @@ public class TestAggregationCount extends BaseTestCase {
|
||||
|
||||
assertThat(maxLastName).isNotNull();
|
||||
|
||||
List<String> sql = LoggedSqlCollector.stop();
|
||||
List<String> sql = LoggedSql.stop();
|
||||
assertSql(sql.get(0)).contains("select max(t0.last_name) from contact t0");
|
||||
}
|
||||
|
||||
@@ -394,7 +393,7 @@ public class TestAggregationCount extends BaseTestCase {
|
||||
|
||||
ResetBasicData.reset();
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
|
||||
Long count =
|
||||
DB.find(Contact.class)
|
||||
@@ -404,7 +403,7 @@ public class TestAggregationCount extends BaseTestCase {
|
||||
|
||||
assertThat(count).isNotNull();
|
||||
|
||||
List<String> sql = LoggedSqlCollector.stop();
|
||||
List<String> sql = LoggedSql.stop();
|
||||
assertSql(sql.get(0)).contains("select count(distinct t0.last_name) from contact t0 where not exists (select 1 from contact_note x where x.contact_id = t0.id)");
|
||||
}
|
||||
|
||||
@@ -413,7 +412,7 @@ public class TestAggregationCount extends BaseTestCase {
|
||||
|
||||
ResetBasicData.reset();
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
|
||||
List<String> names =
|
||||
|
||||
@@ -425,7 +424,7 @@ public class TestAggregationCount extends BaseTestCase {
|
||||
|
||||
assertThat(names).isNotEmpty();
|
||||
|
||||
List<String> sql = LoggedSqlCollector.stop();
|
||||
List<String> sql = LoggedSql.stop();
|
||||
assertSql(sql.get(0)).contains("select " + concat("t0.last_name",", ","t0.first_name") + " from contact t0 where t0.phone is null order by t0.last_name");
|
||||
}
|
||||
|
||||
@@ -434,7 +433,7 @@ public class TestAggregationCount extends BaseTestCase {
|
||||
|
||||
ResetBasicData.reset();
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
|
||||
List<String> names =
|
||||
|
||||
@@ -446,7 +445,7 @@ public class TestAggregationCount extends BaseTestCase {
|
||||
|
||||
assertThat(names).isNotEmpty();
|
||||
|
||||
List<String> sql = LoggedSqlCollector.stop();
|
||||
List<String> sql = LoggedSql.stop();
|
||||
assertSql(sql.get(0)).contains("select " + concat("t0.updtime",", ","t0.first_name") + " from contact t0");
|
||||
}
|
||||
|
||||
@@ -455,7 +454,7 @@ public class TestAggregationCount extends BaseTestCase {
|
||||
|
||||
ResetBasicData.reset();
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
|
||||
Instant instant =
|
||||
|
||||
@@ -466,7 +465,7 @@ public class TestAggregationCount extends BaseTestCase {
|
||||
|
||||
assertThat(instant).isNotNull();
|
||||
|
||||
List<String> sql = LoggedSqlCollector.stop();
|
||||
List<String> sql = LoggedSql.stop();
|
||||
assertSql(sql.get(0)).contains("select max(t0.updtime) from contact t0 where t0.phone is null");
|
||||
}
|
||||
|
||||
@@ -476,7 +475,7 @@ public class TestAggregationCount extends BaseTestCase {
|
||||
|
||||
ResetBasicData.reset();
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
|
||||
List<Contact> contacts =
|
||||
|
||||
@@ -493,7 +492,7 @@ public class TestAggregationCount extends BaseTestCase {
|
||||
assertThat(lastName).contains(", ");
|
||||
}
|
||||
|
||||
List<String> sql = LoggedSqlCollector.stop();
|
||||
List<String> sql = LoggedSql.stop();
|
||||
assertSql(sql.get(0)).contains("select t0.id, t0.email, " + concat("t0.last_name",", ","t0.first_name") + " lastName from contact t0 where t0.phone is null order by t0.last_name; --bind()");
|
||||
}
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@ import io.ebean.meta.QueryPlanInit;
|
||||
import io.ebean.meta.QueryPlanRequest;
|
||||
import io.ebean.meta.ServerMetrics;
|
||||
import io.ebean.meta.SortMetric;
|
||||
import org.ebeantest.LoggedSqlCollector;
|
||||
import io.ebean.test.LoggedSql;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.tests.model.basic.Customer;
|
||||
import org.tests.model.basic.EBasic;
|
||||
@@ -107,14 +107,14 @@ public class TestCustomerFinder extends BaseTestCase {
|
||||
try {
|
||||
Customer.find.currentTransaction().setBatchMode(true);
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
EBasic b = new EBasic("junk");
|
||||
DB.save(b);
|
||||
|
||||
assertTrue(LoggedSqlCollector.current().isEmpty());
|
||||
assertTrue(LoggedSql.collect().isEmpty());
|
||||
Customer.find.flush();
|
||||
|
||||
List<String> sql = LoggedSqlCollector.stop();
|
||||
List<String> sql = LoggedSql.stop();
|
||||
assertSql(sql.get(0)).contains("insert into e_basic");
|
||||
} finally {
|
||||
transaction.end();
|
||||
|
||||
@@ -3,7 +3,7 @@ package org.tests.query.joins;
|
||||
import io.ebean.BaseTestCase;
|
||||
import io.ebean.DB;
|
||||
import io.ebean.Query;
|
||||
import org.ebeantest.LoggedSqlCollector;
|
||||
import io.ebean.test.LoggedSql;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.tests.model.basic.Order;
|
||||
import org.tests.model.basic.ResetBasicData;
|
||||
@@ -20,7 +20,7 @@ public class TestQueryJoinManyNonRoot extends BaseTestCase {
|
||||
|
||||
ResetBasicData.reset();
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
|
||||
List<Order> orders = DB.find(Order.class)
|
||||
.select("id, status, orderDate")
|
||||
@@ -29,7 +29,7 @@ public class TestQueryJoinManyNonRoot extends BaseTestCase {
|
||||
|
||||
assertTrue(!orders.isEmpty());
|
||||
|
||||
List<String> loggedSql = LoggedSqlCollector.stop();
|
||||
List<String> loggedSql = LoggedSql.stop();
|
||||
assertEquals(1, loggedSql.size());
|
||||
assertTrue(loggedSql.get(0).contains("select distinct "));
|
||||
assertTrue(loggedSql.get(0).contains(" from o_order t0 join o_order_detail u1 on u1.order_id = t0.id "));
|
||||
|
||||
@@ -2,7 +2,7 @@ package org.tests.query.joins;
|
||||
|
||||
import io.ebean.BaseTestCase;
|
||||
import io.ebean.DB;
|
||||
import org.ebeantest.LoggedSqlCollector;
|
||||
import io.ebean.test.LoggedSql;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.tests.model.basic.Order;
|
||||
@@ -26,14 +26,14 @@ public class TestQueryJoinOnFormula extends BaseTestCase {
|
||||
@Test
|
||||
public void test_OrderFindIds() {
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
|
||||
List<Integer> orderIds = DB.find(Order.class)
|
||||
.where().eq("totalItems", 3)
|
||||
.findIds();
|
||||
assertThat(orderIds).hasSize(2);
|
||||
|
||||
List<String> loggedSql = LoggedSqlCollector.stop();
|
||||
List<String> loggedSql = LoggedSql.stop();
|
||||
assertEquals(1, loggedSql.size());
|
||||
assertThat(loggedSql.get(0)).contains(" left join (select order_id, count(*) as total_items,");
|
||||
}
|
||||
@@ -41,14 +41,14 @@ public class TestQueryJoinOnFormula extends BaseTestCase {
|
||||
@Test
|
||||
public void test_OrderFindList() {
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
|
||||
List<Order> orders = DB.find(Order.class)
|
||||
.where().eq("totalItems", 3)
|
||||
.findList();
|
||||
assertThat(orders).hasSize(2);
|
||||
|
||||
List<String> loggedSql = LoggedSqlCollector.stop();
|
||||
List<String> loggedSql = LoggedSql.stop();
|
||||
assertEquals(1, loggedSql.size());
|
||||
assertThat(loggedSql.get(0)).contains(" left join (select order_id, count(*) as total_items,");
|
||||
}
|
||||
@@ -56,14 +56,14 @@ public class TestQueryJoinOnFormula extends BaseTestCase {
|
||||
@Test
|
||||
public void test_OrderFindCount() {
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
|
||||
int orders = DB.find(Order.class)
|
||||
.where().eq("totalItems", 3)
|
||||
.findCount();
|
||||
assertThat(orders).isEqualTo(2);
|
||||
|
||||
List<String> sql = LoggedSqlCollector.stop();
|
||||
List<String> sql = LoggedSql.stop();
|
||||
assertEquals(1, sql.size());
|
||||
assertSql(sql.get(0)).contains("join (select order_id, count(*) as total_items,");
|
||||
assertSql(sql.get(0)).contains("select count(*) from ( select t0.id from o_order t0 left join (select order_id,");
|
||||
@@ -72,7 +72,7 @@ public class TestQueryJoinOnFormula extends BaseTestCase {
|
||||
@Test
|
||||
public void test_OrderFindCount_multiFormula() {
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
|
||||
int orders = DB.find(Order.class)
|
||||
.where()
|
||||
@@ -82,7 +82,7 @@ public class TestQueryJoinOnFormula extends BaseTestCase {
|
||||
|
||||
assertThat(orders).isEqualTo(2);
|
||||
|
||||
List<String> sql = LoggedSqlCollector.stop();
|
||||
List<String> sql = LoggedSql.stop();
|
||||
assertEquals(1, sql.size());
|
||||
assertSql(sql.get(0)).contains("select count(*) from ( select t0.id from o_order t0 left join (select order_id,");
|
||||
}
|
||||
@@ -90,7 +90,7 @@ public class TestQueryJoinOnFormula extends BaseTestCase {
|
||||
@Test
|
||||
public void test_OrderFindSingleAttributeList() {
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
|
||||
List<Date> orderDates = DB.find(Order.class)
|
||||
.select("orderDate")
|
||||
@@ -98,7 +98,7 @@ public class TestQueryJoinOnFormula extends BaseTestCase {
|
||||
.findSingleAttributeList();
|
||||
assertThat(orderDates).hasSize(2);
|
||||
|
||||
List<String> sql = LoggedSqlCollector.stop();
|
||||
List<String> sql = LoggedSql.stop();
|
||||
assertEquals(1, sql.size());
|
||||
assertSql(sql.get(0)).contains(" left join (select order_id, count(*) as total_items,");
|
||||
assertSql(sql.get(0)).contains("select t0.order_date from o_order t0");
|
||||
@@ -107,7 +107,7 @@ public class TestQueryJoinOnFormula extends BaseTestCase {
|
||||
@Test
|
||||
public void test_OrderFindOne() {
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
|
||||
Order order = DB.find(Order.class)
|
||||
.select("totalItems")
|
||||
@@ -118,7 +118,7 @@ public class TestQueryJoinOnFormula extends BaseTestCase {
|
||||
|
||||
assertThat(order.getTotalItems()).isEqualTo(3);
|
||||
|
||||
List<String> sql = LoggedSqlCollector.stop();
|
||||
List<String> sql = LoggedSql.stop();
|
||||
assertEquals(1, sql.size());
|
||||
assertSql(sql.get(0)).contains("join (select order_id, count(*) as total_items,");
|
||||
if (isSqlServer()) {
|
||||
@@ -131,13 +131,13 @@ public class TestQueryJoinOnFormula extends BaseTestCase {
|
||||
@Test
|
||||
public void test_ParentPersonFindIds() {
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
|
||||
List<ParentPerson> orderIds = DB.find(ParentPerson.class)
|
||||
.where().eq("totalAge", 3)
|
||||
.findIds();
|
||||
|
||||
List<String> loggedSql = LoggedSqlCollector.stop();
|
||||
List<String> loggedSql = LoggedSql.stop();
|
||||
assertEquals(1, loggedSql.size());
|
||||
assertThat(loggedSql.get(0)).contains("where coalesce(f2.child_age, 0) = ?; --bind(3)");
|
||||
}
|
||||
@@ -145,7 +145,7 @@ public class TestQueryJoinOnFormula extends BaseTestCase {
|
||||
@Test
|
||||
public void test_ParentPersonFindList() {
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
|
||||
DB.find(ParentPerson.class)
|
||||
.select("identifier")
|
||||
@@ -153,7 +153,7 @@ public class TestQueryJoinOnFormula extends BaseTestCase {
|
||||
.where().eq("familyName", "foo")
|
||||
.findList();
|
||||
|
||||
List<String> sql = LoggedSqlCollector.stop();
|
||||
List<String> sql = LoggedSql.stop();
|
||||
assertEquals(1, sql.size());
|
||||
assertSql(sql.get(0)).contains("select t0.identifier from parent_person t0 where t0.family_name = ?");
|
||||
}
|
||||
@@ -161,13 +161,13 @@ public class TestQueryJoinOnFormula extends BaseTestCase {
|
||||
@Test
|
||||
public void test_ParentPersonFindCount() {
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
|
||||
DB.find(ParentPerson.class)
|
||||
.where().eq("totalAge", 3)
|
||||
.findCount();
|
||||
|
||||
List<String> sql = LoggedSqlCollector.stop();
|
||||
List<String> sql = LoggedSql.stop();
|
||||
assertEquals(1, sql.size());
|
||||
assertSql(sql.get(0)).contains("where coalesce(f2.child_age, 0) = ?)");
|
||||
assertSql(sql.get(0)).contains("select count(*) from ( select t0.identifier from parent_person t0 left join (select i2.parent_identifier, count(*) as child_count");
|
||||
@@ -176,14 +176,14 @@ public class TestQueryJoinOnFormula extends BaseTestCase {
|
||||
@Test
|
||||
public void test_ParentPersonFindSingleAttributeList() {
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
|
||||
DB.find(ParentPerson.class)
|
||||
.select("address")
|
||||
.where().eq("totalAge", 3)
|
||||
.findSingleAttributeList();
|
||||
|
||||
List<String> sql = LoggedSqlCollector.stop();
|
||||
List<String> sql = LoggedSql.stop();
|
||||
assertEquals(1, sql.size());
|
||||
assertSql(sql.get(0)).contains("select t0.address from parent_person t0 left join (select i2.parent_identifier");
|
||||
assertSql(sql.get(0)).contains("where coalesce(f2.child_age, 0) = ?; --bind(3)");
|
||||
@@ -192,7 +192,7 @@ public class TestQueryJoinOnFormula extends BaseTestCase {
|
||||
@Test
|
||||
public void test_ParentPersonFindOne() {
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
|
||||
DB.find(ParentPerson.class)
|
||||
.where().eq("totalAge", 3)
|
||||
@@ -200,7 +200,7 @@ public class TestQueryJoinOnFormula extends BaseTestCase {
|
||||
.orderById(true)
|
||||
.findOne();
|
||||
|
||||
List<String> loggedSql = LoggedSqlCollector.stop();
|
||||
List<String> loggedSql = LoggedSql.stop();
|
||||
assertEquals(1, loggedSql.size());
|
||||
assertThat(loggedSql.get(0)).contains("where coalesce(f2.child_age, 0) = ? order by t0.identifier");
|
||||
}
|
||||
@@ -208,13 +208,13 @@ public class TestQueryJoinOnFormula extends BaseTestCase {
|
||||
@Test
|
||||
public void test_ChildPersonParentFindIds() {
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
|
||||
DB.find(ChildPerson.class)
|
||||
.where().eq("parent.totalAge", 3)
|
||||
.findIds();
|
||||
|
||||
List<String> loggedSql = LoggedSqlCollector.stop();
|
||||
List<String> loggedSql = LoggedSql.stop();
|
||||
assertEquals(1, loggedSql.size());
|
||||
assertThat(loggedSql.get(0)).contains("select t0.identifier from child_person t0 left join (select i2.parent_identifier");
|
||||
assertThat(loggedSql.get(0)).contains("where coalesce(f2.child_age, 0) = ?");
|
||||
@@ -223,13 +223,13 @@ public class TestQueryJoinOnFormula extends BaseTestCase {
|
||||
@Test
|
||||
public void test_ChildPersonParentFindCount() {
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
|
||||
DB.find(ChildPerson.class)
|
||||
.where().eq("parent.totalAge", 3)
|
||||
.findCount();
|
||||
|
||||
List<String> loggedSql = LoggedSqlCollector.stop();
|
||||
List<String> loggedSql = LoggedSql.stop();
|
||||
assertEquals(1, loggedSql.size());
|
||||
assertThat(loggedSql.get(0)).contains("select count(*) from ( select t0.identifier");
|
||||
assertThat(loggedSql.get(0)).contains("where coalesce(f2.child_age, 0) = ?");
|
||||
|
||||
@@ -6,7 +6,7 @@ import io.ebean.Query;
|
||||
import org.tests.model.basic.Order;
|
||||
import org.tests.model.basic.OrderDetail;
|
||||
import org.tests.model.basic.ResetBasicData;
|
||||
import org.ebeantest.LoggedSqlCollector;
|
||||
import io.ebean.test.LoggedSql;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import java.util.List;
|
||||
@@ -33,7 +33,7 @@ public class TestOrderByWithMany extends BaseTestCase {
|
||||
|
||||
private void checkWithLazyLoadingOnBuiltInMany() {
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
|
||||
Query<Order> query = DB.find(Order.class);
|
||||
|
||||
@@ -47,7 +47,7 @@ public class TestOrderByWithMany extends BaseTestCase {
|
||||
}
|
||||
|
||||
// first one is the main query and others are lazy loading queries
|
||||
List<String> loggedSql = LoggedSqlCollector.stop();
|
||||
List<String> loggedSql = LoggedSql.stop();
|
||||
assertTrue(loggedSql.size() > 1);
|
||||
|
||||
String lazyLoadSql = loggedSql.get(1);
|
||||
|
||||
@@ -3,7 +3,7 @@ package org.tests.query.other;
|
||||
import io.ebean.BaseTestCase;
|
||||
import io.ebean.DB;
|
||||
import io.ebean.Query;
|
||||
import org.ebeantest.LoggedSqlCollector;
|
||||
import io.ebean.test.LoggedSql;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.tests.model.converstation.Conversation;
|
||||
|
||||
@@ -52,7 +52,7 @@ public class TestQueryConversationRowCount extends BaseTestCase {
|
||||
assertThat(generatedSql).contains("where t0.group_id = ? and ((t0.isopen = ? and u1.user_id = ?) or t0.isopen = ?)");
|
||||
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
query.findCount();
|
||||
|
||||
// select count(*) from (
|
||||
@@ -62,7 +62,7 @@ public class TestQueryConversationRowCount extends BaseTestCase {
|
||||
// where t0.group_id = ? and ((t0.open = ? and u1.user_id = ? ) or t0.open = ? )
|
||||
// ); --bind(1,true,1,true)
|
||||
|
||||
List<String> loggedSql = LoggedSqlCollector.stop();
|
||||
List<String> loggedSql = LoggedSql.stop();
|
||||
assertEquals(1, loggedSql.size());
|
||||
|
||||
String countSql = trimSql(loggedSql.get(0), 0);
|
||||
|
||||
@@ -5,7 +5,7 @@ import io.ebean.DB;
|
||||
import io.ebean.Query;
|
||||
import org.tests.model.basic.Order;
|
||||
import org.tests.model.basic.ResetBasicData;
|
||||
import org.ebeantest.LoggedSqlCollector;
|
||||
import io.ebean.test.LoggedSql;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import java.util.List;
|
||||
@@ -25,10 +25,10 @@ public class TestQueryRawExpressionMany extends BaseTestCase {
|
||||
.where().raw("details.orderQty = ?", quantity)
|
||||
.query();
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
|
||||
query.findCount();
|
||||
List<String> sql = LoggedSqlCollector.stop();
|
||||
List<String> sql = LoggedSql.stop();
|
||||
|
||||
assertThat(trimSql(sql.get(0), 1)).contains("select count(*) from ( select distinct t0.id from o_order t0 left join o_order_detail t1 on t1.order_id = t0.id and t1.id > 0 where t1.order_qty = ?)");
|
||||
}
|
||||
|
||||
@@ -3,7 +3,7 @@ package org.tests.query.other;
|
||||
import io.ebean.BaseTestCase;
|
||||
import io.ebean.DB;
|
||||
import io.ebean.Query;
|
||||
import org.ebeantest.LoggedSqlCollector;
|
||||
import io.ebean.test.LoggedSql;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.tests.model.basic.Order;
|
||||
import org.tests.model.basic.ResetBasicData;
|
||||
@@ -20,7 +20,7 @@ public class TestQueryRowCountWithMany extends BaseTestCase {
|
||||
|
||||
ResetBasicData.reset();
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
|
||||
Long productId = 1L;
|
||||
|
||||
@@ -64,7 +64,7 @@ public class TestQueryRowCountWithMany extends BaseTestCase {
|
||||
// u1.product_id = ?
|
||||
// ); --bind(1)
|
||||
|
||||
List<String> sqlLogged = LoggedSqlCollector.stop();
|
||||
List<String> sqlLogged = LoggedSql.stop();
|
||||
|
||||
assertEquals(list.size(), rowCount);
|
||||
assertEquals(2, sqlLogged.size());
|
||||
@@ -89,10 +89,10 @@ public class TestQueryRowCountWithMany extends BaseTestCase {
|
||||
.orderBy("cretime asc")
|
||||
.query();
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
query.findCount();
|
||||
|
||||
List<String> sqlLogged = LoggedSqlCollector.stop();
|
||||
List<String> sqlLogged = LoggedSql.stop();
|
||||
|
||||
assertEquals(1, sqlLogged.size());
|
||||
assertThat(trimSql(sqlLogged.get(0), 1)).contains("select count(*) from ( select distinct t0.id from o_order t0 join o_order_detail u1 on u1.order_id = t0.id and u1.id > 0 where u1.product_id = ?)");
|
||||
|
||||
@@ -2,7 +2,7 @@ package org.tests.query.other;
|
||||
|
||||
import io.ebean.BaseTestCase;
|
||||
import io.ebean.DB;
|
||||
import org.ebeantest.LoggedSqlCollector;
|
||||
import io.ebean.test.LoggedSql;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.tests.model.basic.Customer;
|
||||
import org.tests.model.basic.Order;
|
||||
@@ -21,13 +21,13 @@ public class TestWhereAnnotation extends BaseTestCase {
|
||||
|
||||
ResetBasicData.reset();
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
|
||||
DB.find(Customer.class)
|
||||
.fetch("orders")
|
||||
.findList();
|
||||
|
||||
List<String> loggedSql = LoggedSqlCollector.stop();
|
||||
List<String> loggedSql = LoggedSql.stop();
|
||||
|
||||
assertEquals(1, loggedSql.size());
|
||||
|
||||
@@ -42,7 +42,7 @@ public class TestWhereAnnotation extends BaseTestCase {
|
||||
|
||||
DB.cacheManager().clearAll();
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
|
||||
List<Customer> customers = DB.find(Customer.class)
|
||||
.order().asc("id")
|
||||
@@ -52,7 +52,7 @@ public class TestWhereAnnotation extends BaseTestCase {
|
||||
assertThat(orders.size()).isGreaterThan(0);
|
||||
orders.get(0).getStatus();
|
||||
|
||||
List<String> loggedSql = LoggedSqlCollector.stop();
|
||||
List<String> loggedSql = LoggedSql.stop();
|
||||
|
||||
assertThat(loggedSql).hasSize(2);
|
||||
assertThat(loggedSql.get(1)).contains("t0.order_date is not null");
|
||||
|
||||
@@ -3,7 +3,7 @@ package org.tests.query.softdelete;
|
||||
import io.ebean.DB;
|
||||
import io.ebean.PagedList;
|
||||
import io.ebean.TransactionalTestCase;
|
||||
import org.ebeantest.LoggedSqlCollector;
|
||||
import io.ebean.test.LoggedSql;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.tests.model.onetoone.album.Cover;
|
||||
|
||||
@@ -25,7 +25,7 @@ public class TestSoftDeletePagingList extends TransactionalTestCase {
|
||||
DB.saveAll(list);
|
||||
DB.delete(list.get(1));
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
|
||||
PagedList<Cover> pagedList = DB.find(Cover.class)
|
||||
.where().startsWith("s3Url", "SoftDelPaged-")
|
||||
@@ -35,7 +35,7 @@ public class TestSoftDeletePagingList extends TransactionalTestCase {
|
||||
int totalRowCount = pagedList.getTotalCount();
|
||||
List<Cover> resultList = pagedList.getList();
|
||||
|
||||
List<String> sql = LoggedSqlCollector.stop();
|
||||
List<String> sql = LoggedSql.stop();
|
||||
|
||||
assertThat(resultList).hasSize(2);
|
||||
assertThat(totalRowCount).isEqualTo(2);
|
||||
|
||||
@@ -8,7 +8,7 @@ import io.ebean.SqlRow;
|
||||
import io.ebean.annotation.ForPlatform;
|
||||
import io.ebean.annotation.Platform;
|
||||
import io.ebean.meta.MetaTimedMetric;
|
||||
import org.ebeantest.LoggedSqlCollector;
|
||||
import io.ebean.test.LoggedSql;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.tests.model.basic.Order;
|
||||
import org.tests.model.basic.ResetBasicData;
|
||||
@@ -297,10 +297,10 @@ public class SqlQueryTests extends BaseTestCase {
|
||||
sqlQuery.setFirstRow(3);
|
||||
sqlQuery.setMaxRows(10);
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
List<SqlRow> list = sqlQuery.findList();
|
||||
|
||||
List<String> sql = LoggedSqlCollector.stop();
|
||||
List<String> sql = LoggedSql.stop();
|
||||
|
||||
if (isSqlServer()) {
|
||||
// FIXME: we should order by primary key ALWAYS (not by first column) when no
|
||||
@@ -325,9 +325,9 @@ public class SqlQueryTests extends BaseTestCase {
|
||||
SqlQuery sqlQuery = DB.sqlQuery("Select * from o_order order by id");
|
||||
sqlQuery.setFirstRow(3);
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
sqlQuery.findList();
|
||||
List<String> sql = LoggedSqlCollector.stop();
|
||||
List<String> sql = LoggedSql.stop();
|
||||
|
||||
assertSql(sql.get(0)).contains("Select * from o_order order by id offset 3");
|
||||
}
|
||||
@@ -341,9 +341,9 @@ public class SqlQueryTests extends BaseTestCase {
|
||||
SqlQuery sqlQuery = DB.sqlQuery("Select * from o_order order by id");
|
||||
sqlQuery.setMaxRows(10);
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
sqlQuery.findList();
|
||||
List<String> sql = LoggedSqlCollector.stop();
|
||||
List<String> sql = LoggedSql.stop();
|
||||
|
||||
if (isSqlServer()) {
|
||||
assertSql(sql.get(0)).contains("Select * from o_order order by id offset 0 rows fetch next 10 rows only;");
|
||||
@@ -367,9 +367,9 @@ public class SqlQueryTests extends BaseTestCase {
|
||||
.setLabel("findList-3-10");
|
||||
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
sqlQuery.findList();
|
||||
List<String> sql = LoggedSqlCollector.stop();
|
||||
List<String> sql = LoggedSql.stop();
|
||||
|
||||
if (isSqlServer()) {
|
||||
assertSql(sql.get(0)).contains("select * from o_order where o_order.id > ? order by id offset 0 rows fetch next 10 rows only;");
|
||||
@@ -393,9 +393,9 @@ public class SqlQueryTests extends BaseTestCase {
|
||||
.setMaxRows(10)
|
||||
.setLabel("findEach-Max10Rows");
|
||||
|
||||
LoggedSqlCollector.start();
|
||||
LoggedSql.start();
|
||||
sqlQuery.findEach(bean -> bean.get("id"));
|
||||
List<String> sql = LoggedSqlCollector.stop();
|
||||
List<String> sql = LoggedSql.stop();
|
||||
|
||||
if (isSqlServer()) {
|
||||
assertSql(sql.get(0)).contains("offset 0 rows fetch next 10 rows only");
|
||||
|
||||
Reference in new issue
Block a user