Compare commits

..

No commits in common. "master" and "0.1.0" have entirely different histories.

9 changed files with 24 additions and 28 deletions

View File

@ -5,14 +5,14 @@
<parent>
<artifactId>fluent-sql</artifactId>
<groupId>group.flyfish.framework</groupId>
<version>1.0.0</version>
<version>0.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>fluent-sql-annotations</artifactId>
<properties>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
</properties>
</project>

View File

@ -5,15 +5,15 @@
<parent>
<artifactId>fluent-sql</artifactId>
<groupId>group.flyfish.framework</groupId>
<version>1.0.0</version>
<version>0.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>fluent-sql-core</artifactId>
<properties>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
</properties>
<dependencies>

View File

@ -369,7 +369,7 @@ final class SQLImpl extends ConcatSegment<SQLImpl> implements SQLOperations, Pre
}
@Override
public Mono<Long> execute() {
public Mono<Integer> execute() {
return SHARED_REACTIVE_OPERATIONS.execute(entity);
}
}

View File

@ -44,5 +44,5 @@ public interface ReactiveBoundEntitySpec<T> {
*
* @return 更新行数
*/
Mono<Long> execute();
Mono<Integer> execute();
}

View File

@ -2,6 +2,7 @@ package group.flyfish.fluent.operations;
import group.flyfish.fluent.entity.BoundSQLEntity;
import group.flyfish.fluent.entity.DataPage;
import group.flyfish.fluent.entity.SQLEntity;
import org.springframework.lang.Nullable;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
@ -49,5 +50,5 @@ public interface ReactiveFluentSQLOperations {
* @param entity sql实体
* @return 更新行数
*/
<T> Mono<Long> execute(BoundSQLEntity<T> entity);
<T> Mono<Integer> execute(BoundSQLEntity<T> entity);
}

View File

@ -5,7 +5,7 @@
<parent>
<artifactId>fluent-sql</artifactId>
<groupId>group.flyfish.framework</groupId>
<version>1.0.0</version>
<version>0.1.0</version>
</parent>
<description>spring boot 快速集成组件</description>
<modelVersion>4.0.0</modelVersion>
@ -13,8 +13,8 @@
<artifactId>fluent-sql-spring-boot-starter</artifactId>
<properties>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
</properties>
<dependencies>

View File

@ -5,15 +5,15 @@
<parent>
<artifactId>fluent-sql</artifactId>
<groupId>group.flyfish.framework</groupId>
<version>1.0.0</version>
<version>0.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>fluent-sql-spring</artifactId>
<properties>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
</properties>
<dependencies>
@ -49,6 +49,7 @@
<dependency>
<groupId>io.asyncer</groupId>
<artifactId>r2dbc-mysql</artifactId>
<version>0.9.7</version>
<scope>test</scope>
</dependency>
<dependency>

View File

@ -61,7 +61,7 @@ public class R2dbcFluentSQLOperations implements ReactiveFluentSQLOperations {
* @return 更新行数
*/
@Override
public <T> Mono<Long> execute(BoundSQLEntity<T> entity) {
public <T> Mono<Integer> execute(BoundSQLEntity<T> entity) {
return resolve(entity).fetch().rowsUpdated();
}

18
pom.xml
View File

@ -7,7 +7,7 @@
<groupId>group.flyfish.framework</groupId>
<artifactId>fluent-sql</artifactId>
<packaging>pom</packaging>
<version>1.0.0</version>
<version>0.1.0</version>
<name>fluent-sql</name>
<description>A very fast sql generation engine using fluent-style api. Help you start your work without mybatis</description>
@ -35,12 +35,12 @@
</modules>
<properties>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
<lombok.version>1.18.24</lombok.version>
<jackson.version>2.17.2</jackson.version>
<spring-boot.version>3.3.1</spring-boot.version>
<spring.version>6.1.10</spring.version>
<spring-boot.version>2.7.18</spring-boot.version>
<spring.version>5.3.22</spring.version>
</properties>
<!-- 开发人员信息 -->
@ -158,12 +158,6 @@
<version>8.0.29</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.asyncer</groupId>
<artifactId>r2dbc-mysql</artifactId>
<version>1.1.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-core</artifactId>
@ -210,7 +204,7 @@
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.7.0</version>
<version>1.6.7</version>
<extensions>true</extensions>
<configuration>
<serverId>ossrh</serverId>