mirror of
https://github.com/ebean-orm/ebean.git
synced 2026-11-22 15:10:02 +00:00
Tidy DefaultDbSqlContext, remove excess space from sql left join, tidy whitespace
This commit is contained in:
1 parent
56acac9f08
commit
7a17cd0797
2 files changed
+10
-30
No files matched your search
@@ -18,46 +18,27 @@ final class DefaultDbSqlContext implements DbSqlContext {
|
|||||||
private static final String tableAliasManyPlaceHolder = "${mta}";
|
private static final String tableAliasManyPlaceHolder = "${mta}";
|
||||||
|
|
||||||
private final String columnAliasPrefix;
|
private final String columnAliasPrefix;
|
||||||
|
|
||||||
private final ArrayStack<String> tableAliasStack = new ArrayStack<>();
|
private final ArrayStack<String> tableAliasStack = new ArrayStack<>();
|
||||||
|
|
||||||
private final ArrayStack<String> joinStack = new ArrayStack<>();
|
private final ArrayStack<String> joinStack = new ArrayStack<>();
|
||||||
|
|
||||||
private final ArrayStack<String> prefixStack = new ArrayStack<>();
|
private final ArrayStack<String> prefixStack = new ArrayStack<>();
|
||||||
|
|
||||||
private final String fromForUpdate;
|
private final String fromForUpdate;
|
||||||
|
|
||||||
private boolean useColumnAlias;
|
private boolean useColumnAlias;
|
||||||
|
|
||||||
private int columnIndex;
|
private int columnIndex;
|
||||||
private int asOfTableCount;
|
private int asOfTableCount;
|
||||||
|
|
||||||
private StringBuilder sb = new StringBuilder(STRING_BUILDER_INITIAL_CAPACITY);
|
private StringBuilder sb = new StringBuilder(STRING_BUILDER_INITIAL_CAPACITY);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A Set used to make sure formula joins are only added once to a query.
|
* A Set used to make sure formula joins are only added once to a query.
|
||||||
*/
|
*/
|
||||||
private HashSet<String> formulaJoins;
|
private HashSet<String> formulaJoins;
|
||||||
|
|
||||||
private HashSet<String> tableJoins;
|
private HashSet<String> tableJoins;
|
||||||
|
|
||||||
private final SqlTreeAlias alias;
|
private final SqlTreeAlias alias;
|
||||||
|
|
||||||
private String currentPrefix;
|
private String currentPrefix;
|
||||||
|
|
||||||
private List<BeanProperty> encryptedProps;
|
private List<BeanProperty> encryptedProps;
|
||||||
|
|
||||||
private List<SqlTreeJoin> extraJoins;
|
private List<SqlTreeJoin> extraJoins;
|
||||||
|
|
||||||
private final CQueryDraftSupport draftSupport;
|
private final CQueryDraftSupport draftSupport;
|
||||||
|
|
||||||
private final CQueryHistorySupport historySupport;
|
private final CQueryHistorySupport historySupport;
|
||||||
|
|
||||||
private final boolean historyQuery;
|
private final boolean historyQuery;
|
||||||
|
|
||||||
/**
|
|
||||||
* Construct for SELECT clause (with column alias settings).
|
|
||||||
*/
|
|
||||||
DefaultDbSqlContext(SqlTreeAlias alias, String columnAliasPrefix, CQueryHistorySupport historySupport,
|
DefaultDbSqlContext(SqlTreeAlias alias, String columnAliasPrefix, CQueryHistorySupport historySupport,
|
||||||
CQueryDraftSupport draftSupport, String fromForUpdate) {
|
CQueryDraftSupport draftSupport, String fromForUpdate) {
|
||||||
this.alias = alias;
|
this.alias = alias;
|
||||||
@@ -117,7 +98,6 @@ final class DefaultDbSqlContext implements DbSqlContext {
|
|||||||
if (encryptedProps == null) {
|
if (encryptedProps == null) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
return encryptedProps.toArray(new BeanProperty[0]);
|
return encryptedProps.toArray(new BeanProperty[0]);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -243,7 +223,7 @@ final class DefaultDbSqlContext implements DbSqlContext {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void appendFormulaJoin(String sqlFormulaJoin, SqlJoinType joinType, String manyWhere) {
|
public void appendFormulaJoin(String sqlFormulaJoin, SqlJoinType joinType, String manyWhere) {
|
||||||
// replace ${ta} place holder with the real table alias...
|
// replace ${ta} placeholder with the real table alias...
|
||||||
String tableAlias = manyWhere == null ? tableAliasStack.peek() : getTableAliasManyWhere(manyWhere);
|
String tableAlias = manyWhere == null ? tableAliasStack.peek() : getTableAliasManyWhere(manyWhere);
|
||||||
String converted = sqlFormulaJoin.replace(tableAliasPlaceHolder, tableAlias);
|
String converted = sqlFormulaJoin.replace(tableAliasPlaceHolder, tableAlias);
|
||||||
if (formulaJoins == null) {
|
if (formulaJoins == null) {
|
||||||
@@ -257,9 +237,9 @@ final class DefaultDbSqlContext implements DbSqlContext {
|
|||||||
formulaJoins.add(converted);
|
formulaJoins.add(converted);
|
||||||
sb.append(" ");
|
sb.append(" ");
|
||||||
if (joinType == SqlJoinType.OUTER) {
|
if (joinType == SqlJoinType.OUTER) {
|
||||||
if ("join".equals(sqlFormulaJoin.substring(0, 4).toLowerCase())) {
|
if ("join".equalsIgnoreCase(sqlFormulaJoin.substring(0, 4))) {
|
||||||
// prepend left as we are in the 'many' part
|
// prepend left as we are in the 'many' part
|
||||||
append(" left ");
|
sb.append("left ");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
sb.append(converted);
|
sb.append(converted);
|
||||||
|
|||||||
@@ -68,7 +68,7 @@ public class TestQueryJoinOnFormula extends BaseTestCase {
|
|||||||
List<String> sql = LoggedSql.stop();
|
List<String> sql = LoggedSql.stop();
|
||||||
assertEquals(1, sql.size());
|
assertEquals(1, sql.size());
|
||||||
assertSql(sql.get(0)).contains("join (select order_id, count(*) as total_items,");
|
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,");
|
assertSql(sql.get(0)).contains("select count(*) from ( select t0.id from o_order t0 left join (select order_id,");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@@ -83,7 +83,7 @@ public class TestQueryJoinOnFormula extends BaseTestCase {
|
|||||||
shipQuery.findList();
|
shipQuery.findList();
|
||||||
assertSql(shipQuery.getGeneratedSql()).isEqualTo("select t0.id "
|
assertSql(shipQuery.getGeneratedSql()).isEqualTo("select t0.id "
|
||||||
+ "from or_order_ship t0 "
|
+ "from or_order_ship t0 "
|
||||||
+ "left join o_order t1 on t1.id = t0.order_id "
|
+ "left join o_order t1 on t1.id = t0.order_id "
|
||||||
+ "left join (select order_id, count(*) as total_items, sum(order_qty*unit_price) as total_amount from o_order_detail group by order_id) z_bt1 on z_bt1.order_id = t1.id "
|
+ "left join (select order_id, count(*) as total_items, sum(order_qty*unit_price) as total_amount from o_order_detail group by order_id) z_bt1 on z_bt1.order_id = t1.id "
|
||||||
+ "order by z_bt1.total_amount");
|
+ "order by z_bt1.total_amount");
|
||||||
}
|
}
|
||||||
@@ -100,7 +100,7 @@ public class TestQueryJoinOnFormula extends BaseTestCase {
|
|||||||
shipQuery.findList();
|
shipQuery.findList();
|
||||||
assertSql(shipQuery.getGeneratedSql()).isEqualTo("select t0.id "
|
assertSql(shipQuery.getGeneratedSql()).isEqualTo("select t0.id "
|
||||||
+ "from or_order_ship t0 "
|
+ "from or_order_ship t0 "
|
||||||
+ "left join o_order t1 on t1.id = t0.order_id "
|
+ "left join o_order t1 on t1.id = t0.order_id "
|
||||||
+ "left join (select order_id, count(*) as total_items, sum(order_qty*unit_price) as total_amount from o_order_detail group by order_id) z_bt1 on z_bt1.order_id = t1.id "
|
+ "left join (select order_id, count(*) as total_items, sum(order_qty*unit_price) as total_amount from o_order_detail group by order_id) z_bt1 on z_bt1.order_id = t1.id "
|
||||||
+ "where z_bt1.total_amount is not null");
|
+ "where z_bt1.total_amount is not null");
|
||||||
}
|
}
|
||||||
@@ -124,7 +124,7 @@ public class TestQueryJoinOnFormula extends BaseTestCase {
|
|||||||
"from or_order_ship t0 " +
|
"from or_order_ship t0 " +
|
||||||
"join o_order u1 on u1.id = t0.order_id " +
|
"join o_order u1 on u1.id = t0.order_id " +
|
||||||
"join or_order_ship u2 on u2.order_id = u1.id " +
|
"join or_order_ship u2 on u2.order_id = u1.id " +
|
||||||
"join o_order u3 on u3.id = u2.order_id " +
|
"join o_order u3 on u3.id = u2.order_id " +
|
||||||
"left join (select order_id, count(*) as total_items, sum(order_qty*unit_price) as total_amount from o_order_detail group by order_id) z_bu3 on z_bu3.order_id = u3.id " +
|
"left join (select order_id, count(*) as total_items, sum(order_qty*unit_price) as total_amount from o_order_detail group by order_id) z_bu3 on z_bu3.order_id = u3.id " +
|
||||||
"where z_bu3.total_amount is not null");
|
"where z_bu3.total_amount is not null");
|
||||||
}
|
}
|
||||||
@@ -141,7 +141,7 @@ public class TestQueryJoinOnFormula extends BaseTestCase {
|
|||||||
shipQuery.findList();
|
shipQuery.findList();
|
||||||
assertSql(shipQuery.getGeneratedSql()).isEqualTo("select t0.id, t1.id, z_bt1.total_amount "
|
assertSql(shipQuery.getGeneratedSql()).isEqualTo("select t0.id, t1.id, z_bt1.total_amount "
|
||||||
+ "from or_order_ship t0 "
|
+ "from or_order_ship t0 "
|
||||||
+ "left join o_order t1 on t1.id = t0.order_id "
|
+ "left join o_order t1 on t1.id = t0.order_id "
|
||||||
+ "left join (select order_id, count(*) as total_items, sum(order_qty*unit_price) as total_amount from o_order_detail group by order_id) z_bt1 on z_bt1.order_id = t1.id "
|
+ "left join (select order_id, count(*) as total_items, sum(order_qty*unit_price) as total_amount from o_order_detail group by order_id) z_bt1 on z_bt1.order_id = t1.id "
|
||||||
+ "order by z_bt1.total_amount");
|
+ "order by z_bt1.total_amount");
|
||||||
|
|
||||||
@@ -158,7 +158,7 @@ public class TestQueryJoinOnFormula extends BaseTestCase {
|
|||||||
shipQuery.findList();
|
shipQuery.findList();
|
||||||
assertSql(shipQuery.getGeneratedSql()).isEqualTo("select t0.id, t1.id, z_bt1.total_amount "
|
assertSql(shipQuery.getGeneratedSql()).isEqualTo("select t0.id, t1.id, z_bt1.total_amount "
|
||||||
+ "from or_order_ship t0 "
|
+ "from or_order_ship t0 "
|
||||||
+ "left join o_order t1 on t1.id = t0.order_id "
|
+ "left join o_order t1 on t1.id = t0.order_id "
|
||||||
+ "left join (select order_id, count(*) as total_items, sum(order_qty*unit_price) as total_amount from o_order_detail group by order_id) z_bt1 on z_bt1.order_id = t1.id "
|
+ "left join (select order_id, count(*) as total_items, sum(order_qty*unit_price) as total_amount from o_order_detail group by order_id) z_bt1 on z_bt1.order_id = t1.id "
|
||||||
+ "where z_bt1.total_amount is not null");
|
+ "where z_bt1.total_amount is not null");
|
||||||
|
|
||||||
@@ -179,7 +179,7 @@ public class TestQueryJoinOnFormula extends BaseTestCase {
|
|||||||
|
|
||||||
List<String> sql = LoggedSql.stop();
|
List<String> sql = LoggedSql.stop();
|
||||||
assertEquals(1, sql.size());
|
assertEquals(1, sql.size());
|
||||||
assertSql(sql.get(0)).contains("select count(*) from ( select t0.id from o_order t0 left join (select order_id,");
|
assertSql(sql.get(0)).contains("select count(*) from ( select t0.id from o_order t0 left join (select order_id,");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
|||||||
Reference in new issue
Block a user