admin/mybatis-flex
1
0
Fork 0
mirror of https://gitee.com/mybatis-flex/mybatis-flex.git synced 2025-12-07 17:18:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: close #I8ASWS

Browse Source
This commit is contained in:
开源海哥 2023-10-26 22:28:40 +08:00
parent a7a41c3fc6
commit 3df467ef88
3 changed files with 37 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mybatis-flex-core/src/main/java/com/mybatisflex/core/dialect/impl/CommonsDialectImpl.java
View File

@ -491,6 +491,23 @@ public class CommonsDialectImpl implements IDialect {
if (StringUtil.isNotBlank(hint)) {
sqlBuilder.append(BLANK).append(hint).deleteCharAt(sqlBuilder.length() - 1);
}
//delete with join
if (joinTables != null && !joinTables.isEmpty()) {
if (queryTables == null || queryTables.isEmpty()) {
throw new IllegalArgumentException("Delete with join sql must designate the from table.");
} else if (queryTables.size() != 1) {
throw new IllegalArgumentException("Delete with join sql must has 1 table only. but current has " + queryTables.size());
}
QueryTable queryTable = queryTables.get(0);
String table = getRealTable(queryTable.getName());
if (StringUtil.isNotBlank(queryTable.getSchema())) {
sqlBuilder.append(wrap(getRealSchema(queryTable.getSchema(), table))).append(REFERENCE);
}
sqlBuilder.append(BLANK).append(wrap(getRealTable(table)));
}
sqlBuilder.append(FROM).append(StringUtil.join(DELIMITER, queryTables, queryTable -> queryTable.toSql(this)));
buildJoinSql(sqlBuilder, queryWrapper, allTables);

3
mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryWrapper.java
View File

@ -125,7 +125,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
}
public <T> QueryWrapper select(LambdaGetter<T>... lambdaGetters) {
for (LambdaGetter<T> lambdaGetter : lambdaGetters) {
for (LambdaGetter<?> lambdaGetter : lambdaGetters) {
QueryColumn queryColumn = LambdaUtil.getQueryColumn(lambdaGetter);
addSelectColumn(queryColumn);
}
@ -660,7 +660,6 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
addGroupByColumns(LambdaUtil.getQueryColumn(column));
return this;
}
public <T> QueryWrapper groupBy(LambdaGetter<T>... columns) {
for (LambdaGetter<T> column : columns) {
groupBy(LambdaUtil.getQueryColumn(column));

23
mybatis-flex-core/src/test/java/com/mybatisflex/coretest/AccountSqlTester.java
View File

@ -21,10 +21,7 @@ import com.mybatisflex.core.dialect.IDialect;
import com.mybatisflex.core.dialect.KeywordWrap;
import com.mybatisflex.core.dialect.LimitOffsetProcessor;
import com.mybatisflex.core.dialect.impl.CommonsDialectImpl;
import com.mybatisflex.core.query.DistinctQueryColumn;
import com.mybatisflex.core.query.QueryWrapper;
import com.mybatisflex.core.query.RawQueryColumn;
import com.mybatisflex.core.query.SqlOperators;
import com.mybatisflex.core.query.*;
import com.mybatisflex.core.table.TableInfo;
import com.mybatisflex.core.table.TableInfoFactory;
import com.mybatisflex.core.table.TableManager;
@ -560,6 +557,24 @@ public class AccountSqlTester {
System.out.println(sql);
}
/**
* test https://gitee.com/mybatis-flex/mybatis-flex/issues/I8ASWS
*/
@Test
public void testDeleteWithJoin() {
QueryWrapper qw = QueryWrapper.create()
.from(ACCOUNT).leftJoin(ARTICLE).on(ACCOUNT.ID.eq(ARTICLE.ACCOUNT_ID))
.where(ACCOUNT.USER_NAME.eq("x"));
IDialect dialect = new CommonsDialectImpl();
String sql = dialect.forDeleteByQuery(qw);
Assert.assertEquals("DELETE `tb_account` FROM `tb_account` " +
"LEFT JOIN `tb_article` ON `tb_account`.`id` = `tb_article`.`account_id` " +
"WHERE `tb_account`.`user_name` = ?"
,sql);
System.out.println(sql);
}
@Test
public void testForUpdate() {
IDialect dialect = new CommonsDialectImpl();