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

Merge branch 'main' of https://github.com/mybatis-flex/mybatis-flex

Browse Source
This commit is contained in:
开源海哥 2023-04-23 16:26:05 +08:00
commit 7667b04c85
8 changed files with 87 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -272,21 +272,7 @@ public class CommonsDialectImpl implements IDialect {
List<QueryColumn> selectColumns = CPI.getSelectColumns(queryWrapper);
StringBuilder sqlBuilder = new StringBuilder("SELECT ");
if (selectColumns == null || selectColumns.isEmpty()) {
sqlBuilder.append("*");
} else {
int index = 0;
for (QueryColumn selectColumn : selectColumns) {
String selectColumnSql = CPI.toSelectSql(selectColumn, allTables, this);
sqlBuilder.append(selectColumnSql);
if (index != selectColumns.size() - 1) {
sqlBuilder.append(", ");
}
index++;
}
}
StringBuilder sqlBuilder = buildSelectColumnSql(allTables, selectColumns);
sqlBuilder.append(" FROM ").append(StringUtil.join(", ", queryTables, queryTable -> queryTable.toSql(this)));
buildJoinSql(sqlBuilder, queryWrapper, allTables);
@ -312,6 +298,25 @@ public class CommonsDialectImpl implements IDialect {
return sqlBuilder.toString();
}
private StringBuilder buildSelectColumnSql(List<QueryTable> queryTables, List<QueryColumn> selectColumns) {
StringBuilder sqlBuilder = new StringBuilder("SELECT ");
if (selectColumns == null || selectColumns.isEmpty()) {
sqlBuilder.append("*");
} else {
int index = 0;
for (QueryColumn selectColumn : selectColumns) {
String selectColumnSql = CPI.toSelectSql(selectColumn, queryTables, this);
sqlBuilder.append(selectColumnSql);
if (index != selectColumns.size() - 1) {
sqlBuilder.append(", ");
}
index++;
}
}
return sqlBuilder;
}
@Override
public String buildSelectCountSql(QueryWrapper queryWrapper) {
@ -663,8 +668,8 @@ public class CommonsDialectImpl implements IDialect {
@Override
public String forSelectOneEntityById(TableInfo tableInfo) {
StringBuilder sql = new StringBuilder("SELECT * FROM ");
sql.append(wrap(tableInfo.getTableName()));
StringBuilder sql = buildSelectColumnSql(null, tableInfo.getDefaultQueryColumn());
sql.append(" FROM ").append(wrap(tableInfo.getTableName()));
sql.append(" WHERE ");
String[] pKeys = tableInfo.getPrimaryKeys();
for (int i = 0; i < pKeys.length; i++) {
@ -692,8 +697,8 @@ public class CommonsDialectImpl implements IDialect {
@Override
public String forSelectEntityListByIds(TableInfo tableInfo, Object[] primaryValues) {
StringBuilder sql = new StringBuilder("SELECT * FROM ");
sql.append(wrap(tableInfo.getTableName()));
StringBuilder sql = buildSelectColumnSql(null, tableInfo.getDefaultQueryColumn());
sql.append(" FROM ").append(wrap(tableInfo.getTableName()));
sql.append(" WHERE ");
String[] primaryKeys = tableInfo.getPrimaryKeys();

1
mybatis-flex-core/src/main/java/com/mybatisflex/core/provider/EntitySqlProvider.java
View File

@ -315,6 +315,7 @@ public class EntitySqlProvider {
Object[] values = CPI.getValueArray(queryWrapper);
ProviderUtil.setSqlArgs(params, values);
CPI.setSelectColumnsIfNecessary(queryWrapper, tableInfo.getDefaultQueryColumn());
CPI.setFromIfNecessary(queryWrapper, tableInfo.getTableName());
return DialectFactory.getDialect().forSelectListByQuery(queryWrapper);

7
mybatis-flex-core/src/main/java/com/mybatisflex/core/query/CPI.java
View File

@ -63,6 +63,13 @@ public class CPI {
queryWrapper.setSelectColumns(selectColumns);
}
public static void setSelectColumnsIfNecessary(QueryWrapper queryWrapper, List<QueryColumn> selectColumns) {
if (CollectionUtil.isEmpty(queryWrapper.getSelectColumns())
&& CollectionUtil.isNotEmpty(selectColumns)) {
queryWrapper.setSelectColumns(selectColumns);
}
}
public static List<Join> getJoins(QueryWrapper queryWrapper) {
return queryWrapper.getJoins();
}

18
mybatis-flex-core/src/main/java/com/mybatisflex/core/table/TableInfo.java
View File

@ -38,6 +38,7 @@ import org.apache.ibatis.session.Configuration;
import org.apache.ibatis.type.TypeHandler;
import java.util.*;
import java.util.stream.Collectors;
public class TableInfo {
@ -71,6 +72,9 @@ public class TableInfo {
//主键字段
private String[] primaryKeys = new String[0];
// 默认查询列
private String[] defaultColumns = new String[0];
//在插入数据的时候，支持主动插入的主键字段
//通过自定义生成器生成 或者 Sequence 在 before 生成的时候，是需要主动插入数据的
private String[] insertPrimaryKeys;
@ -183,6 +187,14 @@ public class TableInfo {
this.largeColumns = largeColumns;
}
public String[] getDefaultColumns() {
return defaultColumns;
}
public void setDefaultColumns(String[] defaultColumns) {
this.defaultColumns = defaultColumns;
}
public String[] getInsertPrimaryKeys() {
return insertPrimaryKeys;
}
@ -588,6 +600,12 @@ public class TableInfo {
return joiner.toString();
}
public List<QueryColumn> getDefaultQueryColumn() {
return Arrays.stream(defaultColumns)
.map(name -> new QueryColumn(getTableName(), name))
.collect(Collectors.toList());
}
public ResultMap buildResultMap(Configuration configuration) {
String resultMapId = entityClass.getName();
List<ResultMapping> resultMappings = new ArrayList<>();

8
mybatis-flex-core/src/main/java/com/mybatisflex/core/table/TableInfoFactory.java
View File

@ -159,6 +159,8 @@ public class TableInfoFactory {
//大字段列
Set<String> largeColumns = new LinkedHashSet<>();
// 默认查询列
Set<String> defaultColumns = new LinkedHashSet<>();
List<Field> entityFields = ClassUtil.getAllFields(entityClass);
@ -230,6 +232,9 @@ public class TableInfoFactory {
largeColumns.add(columnName);
}
if (column == null || (!column.isLarge() && !column.isLogicDelete())) {
defaultColumns.add(columnName);
}
Id id = field.getAnnotation(Id.class);
ColumnInfo columnInfo;
@ -301,6 +306,9 @@ public class TableInfoFactory {
if (!largeColumns.isEmpty()) {
tableInfo.setLargeColumns(largeColumns.toArray(new String[0]));
}
if (!defaultColumns.isEmpty()) {
tableInfo.setDefaultColumns(defaultColumns.toArray(new String[0]));
}
tableInfo.setColumnInfoList(columnInfoList);
tableInfo.setPrimaryKeyList(idInfos);

6
mybatis-flex-test/mybatis-flex-spring-test/pom.xml
View File

@ -57,6 +57,12 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.22.0</version>
<scope>test</scope>
</dependency>
</dependencies>

5
mybatis-flex-test/mybatis-flex-spring-test/src/main/java/com/mybatisflex/test/AppConfig.java
View File

@ -15,7 +15,9 @@
*/
package com.mybatisflex.test;
import com.mybatisflex.core.mybatis.FlexConfiguration;
import com.mybatisflex.spring.FlexSqlSessionFactoryBean;
import org.apache.ibatis.logging.stdout.StdOutImpl;
import org.apache.ibatis.session.SqlSessionFactory;
import org.mybatis.spring.SqlSessionFactoryBean;
import org.mybatis.spring.annotation.MapperScan;
@ -48,6 +50,9 @@ public class AppConfig implements ApplicationListener<ContextRefreshedEvent> {
// SqlSessionFactoryBean factoryBean = new SqlSessionFactoryBean();
SqlSessionFactoryBean factoryBean = new FlexSqlSessionFactoryBean();
factoryBean.setDataSource(dataSource);
FlexConfiguration configuration = new FlexConfiguration();
configuration.setLogImpl(StdOutImpl.class);
factoryBean.setConfiguration(configuration);
return factoryBean.getObject();
}

20
mybatis-flex-test/mybatis-flex-spring-test/src/test/java/com/mybatisflex/test/AccountTest.java
View File

@ -1,18 +1,24 @@
package com.mybatisflex.test;
import com.mybatisflex.core.query.QueryWrapper;
import com.mybatisflex.core.row.Db;
import com.mybatisflex.core.row.Row;
import com.mybatisflex.test.mapper.AccountMapper;
import com.mybatisflex.test.model.Account;
import org.assertj.core.api.WithAssertions;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import java.util.List;
import static com.mybatisflex.test.model.table.Tables.ACCOUNT;
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(classes = AppConfig.class)
public class AccountTest {
public class AccountTest implements WithAssertions {
@Autowired
AccountMapper accountMapper;
@ -20,7 +26,17 @@ public class AccountTest {
@Test
public void testSelectOne() {
Account account = accountMapper.selectOneById(1);
System.out.println(account);
assertThat(account).isNotNull()
.satisfies(a -> assertThat(a.getId()).isEqualTo(1));
}
@Test
public void testSelectByQuery() {
QueryWrapper queryWrapper = QueryWrapper.create()
.where(ACCOUNT.AGE.eq(18));
List<Account> accounts = accountMapper.selectListByQuery(queryWrapper);
assertThat(accounts.size()).isEqualTo(1);
assertThat(accounts.get(0).getAge()).isEqualTo(18);
}
@Test