Skip to content

Commit bd66031

Browse files
committed
prepare switch
1 parent 95f9c14 commit bd66031

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/SqlGenerator.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -576,8 +576,8 @@ private SelectBuilder.SelectWhere selectBuilder(Collection<SqlIdentifier> keyCol
576576
return createSelectBuilder(keyColumns, ap -> false, getTable());
577577
}
578578

579-
public SelectBuilder.SelectWhere createSelectBuilder(Predicate<AggregatePath> pathFilter) {
580-
return createSelectBuilder(Collections.emptyList(), pathFilter, getTable());
579+
public SelectBuilder.SelectWhere createSelectBuilder(Predicate<AggregatePath> pathFilter, Table table) {
580+
return createSelectBuilder(Collections.emptyList(), pathFilter, table);
581581
}
582582

583583
private SelectBuilder.SelectWhere createSelectBuilder(Collection<SqlIdentifier> keyColumns,
@@ -591,6 +591,10 @@ private SelectBuilder.SelectWhere createSelectBuilder(Collection<SqlIdentifier>
591591

592592
AggregatePath aggregatePath = mappingContext.getAggregatePath(path);
593593

594+
if (pathFilter.test(aggregatePath)) {
595+
continue;
596+
}
597+
594598
// add a join if necessary
595599
Join join = getJoin(aggregatePath);
596600
if (join != null) {

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/query/JdbcQueryCreator.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -257,9 +257,13 @@ SelectBuilder.SelectLimitOffset createSelectClause(RelationalPersistentEntity<?>
257257

258258
private SelectBuilder.SelectJoin selectBuilder(Table table) {
259259

260+
260261
List<Expression> columnExpressions = new ArrayList<>();
261262
RelationalPersistentEntity<?> entity = entityMetadata.getTableEntity();
262263

264+
// sqlGeneratorSource.getSqlGenerator(entity.getType()).createSelectBuilder(
265+
//
266+
// , table)
263267

264268
SqlContext sqlContext = new SqlContext();
265269

0 commit comments

Comments
 (0)