Skip to content

Commit a0d570d

Browse files
committed
chore: dedup SubqueriesBase between sql and r2dbc
1 parent fc33eea commit a0d570d

1 file changed

Lines changed: 11 additions & 6 deletions

File tree

querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/SubqueriesBase.java

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import static com.querydsl.r2dbc.Constants.employee2;
1616
import static com.querydsl.r2dbc.Constants.survey;
1717
import static com.querydsl.r2dbc.Constants.survey2;
18+
import static com.querydsl.r2dbc.R2DBCExpressions.select;
1819
import static org.assertj.core.api.Assertions.assertThat;
1920

2021
import com.querydsl.core.testutil.ExcludeIn;
@@ -26,8 +27,12 @@
2627
import com.querydsl.core.types.dsl.Wildcard;
2728
import com.querydsl.r2dbc.domain.Employee;
2829
import com.querydsl.r2dbc.domain.QEmployee;
30+
import com.querydsl.sql.Configuration;
2931
import com.querydsl.sql.ForeignKey;
32+
import com.querydsl.sql.SQLSerializer;
33+
import com.querydsl.sql.SQLTemplates;
3034
import java.math.BigDecimal;
35+
import java.sql.SQLException;
3136
import java.util.Arrays;
3237
import org.junit.Test;
3338

@@ -75,7 +80,7 @@ public void list_in_query() {
7580
@Test
7681
@SkipForQuoted
7782
@ExcludeIn(DB2) // ID is reserved IN DB2
78-
public void subQueries() {
83+
public void subQueries() throws SQLException {
7984
// subquery in where block
8085
expectedQuery =
8186
"""
@@ -157,10 +162,10 @@ public void subQuery_leftJoin() {
157162
public void subQuery_params() {
158163
var aParam = new Param<String>(String.class, "param");
159164
R2DBCQuery<?> subQuery =
160-
R2DBCExpressions.select(Wildcard.all).from(employee).where(employee.firstname.eq(aParam));
165+
select(Wildcard.all).from(employee).where(employee.firstname.eq(aParam));
161166
subQuery.set(aParam, "Mike");
162167

163-
assertThat((long) query().from(subQuery).fetchCount().block()).isEqualTo(1);
168+
assertThat(query().from(subQuery).fetchCount().block()).isEqualTo(1);
164169
}
165170

166171
@Test
@@ -219,7 +224,7 @@ public void subQuerySerialization() {
219224
public void subQuerySerialization2() {
220225
NumberPath<BigDecimal> sal = Expressions.numberPath(BigDecimal.class, "sal");
221226
var sq = new PathBuilder<Object[]>(Object[].class, "sq");
222-
var serializer = new SQLSerializer(Configuration.DEFAULT);
227+
var serializer = new SQLSerializer(new Configuration(SQLTemplates.DEFAULT));
223228

224229
serializer.handle(
225230
query()
@@ -232,7 +237,7 @@ public void subQuerySerialization2() {
232237

233238
@Test
234239
public void scalarSubQueryInClause() {
235-
var serializer = new SQLSerializer(Configuration.DEFAULT);
240+
var serializer = new SQLSerializer(new Configuration(SQLTemplates.DEFAULT));
236241

237242
serializer.handle(
238243
this.query()
@@ -259,7 +264,7 @@ public void scalarSubQueryInClause() {
259264

260265
@Test
261266
public void scalarSubQueryInClause2() {
262-
var serializer = new SQLSerializer(Configuration.DEFAULT);
267+
var serializer = new SQLSerializer(new Configuration(SQLTemplates.DEFAULT));
263268

264269
serializer.handle(
265270
this.query()

0 commit comments

Comments
 (0)