Browse Source

Fix rendering of asterisk projection (`table.*`) for aliased tables.

Closes #1651
Original pull request: #1662
3.1.x
Jens Schauder 2 years ago committed by Mark Paluch
parent
commit
9223e06883
No known key found for this signature in database
GPG Key ID: 4406B84C1661DCD1
  1. 12
      spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/render/ExpressionVisitor.java
  2. 11
      spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/render/SelectRendererUnitTests.java

12
spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/render/ExpressionVisitor.java

@ -98,8 +98,16 @@ class ExpressionVisitor extends TypedSubtreeVisitor<Expression> implements PartR @@ -98,8 +98,16 @@ class ExpressionVisitor extends TypedSubtreeVisitor<Expression> implements PartR
} else {
value = segment.toString();
}
} else if (segment instanceof AsteriskFromTable) {
value = NameRenderer.render(context, ((AsteriskFromTable) segment).getTable()) + ".*";
} else if (segment instanceof AsteriskFromTable asteriskFromTable) {
TableLike table = asteriskFromTable.getTable();
CharSequence renderedTable;
if (table instanceof Aliased aliasedTable) {
renderedTable = NameRenderer.render(context, aliasedTable);
} else {
renderedTable = NameRenderer.render(context, table);
}
value = renderedTable + ".*";
} else if (segment instanceof Cast) {
CastVisitor visitor = new CastVisitor(context);

11
spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/render/SelectRendererUnitTests.java

@ -638,6 +638,17 @@ class SelectRendererUnitTests { @@ -638,6 +638,17 @@ class SelectRendererUnitTests {
assertThat(sql).isEqualTo("SELECT atable.* FROM atable WHERE NOT (atable.id = 1 AND atable.id = 2)");
}
@Test // GH-1651
void asteriskOfAliasedTableUsesAlias() {
Table employee = SQL.table("employee").as("e");
Select select = Select.builder().select(employee.asterisk()).select(employee.column("id")).from(employee).build();
String rendered = SqlRenderer.toString(select);
assertThat(rendered).isEqualTo("SELECT e.*, e.id FROM employee e");
}
/**
* Tests the rendering of analytic functions.
*/

Loading…
Cancel
Save