Fix SqlGenerator DML table should not be contain alias

(cherry picked from commit 659b7a8)

Author: mhyeon-lee

spring-data-jdbc-plus-sql/src/main/java/com/navercorp/spring/data/jdbc/plus/sql/convert/SqlContext.java

@@ -40,12 +40,16 @@ class SqlContext implements SqlContexts {
 
 	SqlContext(RelationalPersistentEntity<?> entity) {
 		this.entity = entity;
+		this.table = getEntityTable(entity);
+	}
+
+	private static Table getEntityTable(RelationalPersistentEntity<?> entity) {
 		Table table = Table.create(entity.getTableName());
 		SqlIdentifier tableAlias = TableAliasUtils.getTableAlias(entity);
 		if (tableAlias != null) {
 			table = table.as(tableAlias);
 		}
-		this.table = table;
+		return table;
 	}
 
 	@Override

spring-data-jdbc-plus-sql/src/main/java/com/navercorp/spring/data/jdbc/plus/sql/convert/SqlGenerator.java

@@ -429,7 +429,7 @@ String getDeleteByList() {
 	String createDeleteAllSql(
 		@Nullable PersistentPropertyPath<RelationalPersistentProperty> path) {
 
-		Table table = getTable();
+		Table table = getDmlTable();
 
 		DeleteBuilder.DeleteWhere deleteAll = Delete.builder().from(table);
 
@@ -610,7 +610,7 @@ String selectFrom() {
 			if (join != null) {
 				joinTables.add(join);
 			}
-			
+
 			Column column = getColumn(extPath);
 			if (column != null) {
 				columnExpressions.add(getColumnExpression(extPath, column));
@@ -782,7 +782,7 @@ private String createCountSql() {
 
 	private String createInsertSql(Set<SqlIdentifier> additionalColumns) {
 
-		Table table = getTable();
+		Table table = getDmlTable();
 
 		Set<SqlIdentifier> columnNamesForInsert =
 			new TreeSet<>(Comparator.comparing(SqlIdentifier::getReference));
@@ -821,7 +821,7 @@ private String createUpdateWithVersionSql() {
 
 	private UpdateBuilder.UpdateWhereAndOr createBaseUpdate() {
 
-		Table table = getTable();
+		Table table = getDmlTable();
 
 		List<AssignValue> assignments = columns.getUpdateableColumns() //
 			.stream() //
@@ -837,12 +837,12 @@ private UpdateBuilder.UpdateWhereAndOr createBaseUpdate() {
 	}
 
 	private String createDeleteSql() {
-		return render(createBaseDeleteById(getTable()).build());
+		return render(createBaseDeleteById(getDmlTable()).build());
 	}
 
 	private String createDeleteByIdAndVersionSql() {
 
-		Delete delete = createBaseDeleteById(getTable()) //
+		Delete delete = createBaseDeleteById(getDmlTable()) //
 			.and(getVersionColumn().isEqualTo(
 				SQL.bindMarker(":" + renderReference(VERSION_SQL_PARAMETER)))) //
 			.build();
@@ -883,7 +883,7 @@ private String createDeleteByPathAndCriteria(PersistentPropertyPathExtension pat
 
 	private String createDeleteByListSql() {
 
-		Table table = getTable();
+		Table table = getDmlTable();
 
 		Delete delete = Delete.builder() //
 			.from(table) //
@@ -913,6 +913,15 @@ private Table getTable() {
 		return sqlContext.getTable();
 	}
 
+	// DML Table should not be Aliased Table
+	private Table getDmlTable() {
+		Table table = sqlContext.getTable();
+		if (table instanceof Aliased) {
+			table = Table.create(table.getName());
+		}
+		return table;
+	}
+
 	private Column getIdColumn() {
 		return sqlContext.getIdColumn();
 	}