All tests passing on H2

velo · velo · commit dd515d718867 · 2024-02-25T21:04:18.000+13:00
diff --git a/querydsl-examples/querydsl-example-r2dbc-sql-codegen/src/main/java/com/querydsl/example/dao/CustomerDaoImpl.java b/querydsl-examples/querydsl-example-r2dbc-sql-codegen/src/main/java/com/querydsl/example/dao/CustomerDaoImpl.java
@@ -93,7 +93,8 @@ public Mono<Customer> insert(Customer c) {
                       })
                   .map(
                       ca ->
-                      queryFactory.insert(customerAddress)
+                          queryFactory
+                              .insert(customerAddress)
                               .set(customerAddress.customerId, id)
                               .set(customerAddress.addressId, ca.getAddress().getId())
                               .set(customerAddress.addressTypeCode, ca.getAddressTypeCode())
diff --git a/querydsl-examples/querydsl-example-r2dbc-sql-codegen/src/main/java/com/querydsl/example/dao/OrderDaoImpl.java b/querydsl-examples/querydsl-example-r2dbc-sql-codegen/src/main/java/com/querydsl/example/dao/OrderDaoImpl.java
@@ -1,8 +1,6 @@
 package com.querydsl.example.dao;
 
 import static com.querydsl.core.types.Projections.bean;
-import static com.querydsl.example.r2dbc.QAddress.address;
-import static com.querydsl.example.r2dbc.QCustomerAddress.customerAddress;
 import static com.querydsl.example.r2dbc.QCustomerOrder.customerOrder;
 import static com.querydsl.example.r2dbc.QCustomerOrderProduct.customerOrderProduct;
 import static com.querydsl.example.r2dbc.QCustomerPaymentMethod.customerPaymentMethod;
@@ -15,7 +13,6 @@
 import com.querydsl.example.dto.Order;
 import com.querydsl.example.dto.OrderProduct;
 import com.querydsl.r2dbc.R2DBCQueryFactory;
-import com.querydsl.r2dbc.dml.R2DBCInsertClause;
 import com.querydsl.r2dbc.group.ReactiveGroupBy;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
@@ -77,23 +74,24 @@ public Mono<Order> insert(Order o) {
     return populate(queryFactory.insert(customerOrder), o)
         .executeWithKey(customerOrder.id)
         .flatMap(
-                id -> {
-                  o.setId(id);
-
-                  return Flux.fromIterable( o.getOrderProducts())
-                      .map(
-                          op ->
-                          queryFactory.insert(customerOrderProduct)
-                          .set(customerOrderProduct.orderId, id)
-                          .set(customerOrderProduct.comments, op.getComments())
-                          .set(customerOrderProduct.productId, op.getProductId())
-                          .set(customerOrderProduct.quantity, op.getQuantity())
-                          .execute())
-                      .collectList()
-                      .map(__ -> o);
-                });
+            id -> {
+              o.setId(id);
+
+              return Flux.fromIterable(o.getOrderProducts())
+                  .map(
+                      op ->
+                          queryFactory
+                              .insert(customerOrderProduct)
+                              .set(customerOrderProduct.orderId, id)
+                              .set(customerOrderProduct.comments, op.getComments())
+                              .set(customerOrderProduct.productId, op.getProductId())
+                              .set(customerOrderProduct.quantity, op.getQuantity())
+                              .execute())
+                  .collectList()
+                  .map(__ -> o);
+            });
   }
-  
+
   public Mono<Order> update(Order o) {
     Long id = o.getId();
 
@@ -109,19 +107,19 @@ public Mono<Order> update(Order o) {
                   .execute()
                   .flatMap(
                       ___ -> {
-                        return Flux.fromIterable( o.getOrderProducts())
-                                .map(
-                                    op ->
-                                    queryFactory.insert(customerOrderProduct)
-                                    .set(customerOrderProduct.orderId, id)
-                                    .set(customerOrderProduct.comments, op.getComments())
-                                    .set(customerOrderProduct.productId, op.getProductId())
-                                    .set(customerOrderProduct.quantity, op.getQuantity())
-                                    .execute())
-                                .collectList()
-                                .map(____ -> o);
-                          });
-
+                        return Flux.fromIterable(o.getOrderProducts())
+                            .map(
+                                op ->
+                                    queryFactory
+                                        .insert(customerOrderProduct)
+                                        .set(customerOrderProduct.orderId, id)
+                                        .set(customerOrderProduct.comments, op.getComments())
+                                        .set(customerOrderProduct.productId, op.getProductId())
+                                        .set(customerOrderProduct.quantity, op.getQuantity())
+                                        .execute())
+                            .collectList()
+                            .map(____ -> o);
+                      });
             });
   }
 
diff --git a/querydsl-examples/querydsl-example-r2dbc-sql-codegen/src/main/java/com/querydsl/example/dao/ProductDaoImpl.java b/querydsl-examples/querydsl-example-r2dbc-sql-codegen/src/main/java/com/querydsl/example/dao/ProductDaoImpl.java
@@ -69,22 +69,27 @@ public Mono<Product> save(Product p) {
   public Mono<Product> insert(Product p) {
     return populate(queryFactory.insert(product), p)
         .executeWithKey(product.id)
-        .flatMapIterable(id -> {
-        	R2DBCInsertClause insert = queryFactory.insert(productL10n);
-        	return p.getLocalizations().stream().map(l10n ->  insert
-                    .set(productL10n.productId, id)
-                    .set(productL10n.description, l10n.getDescription())
-                    .set(productL10n.lang, l10n.getLang())
-                    .set(productL10n.name, l10n.getName())
-                    .execute())
-        			.map(__ -> {
-              p.setId(id);
-
-              return p;
+        .flatMapIterable(
+            id -> {
+              R2DBCInsertClause insert = queryFactory.insert(productL10n);
+              return p.getLocalizations().stream()
+                  .map(
+                      l10n ->
+                          insert
+                              .set(productL10n.productId, id)
+                              .set(productL10n.description, l10n.getDescription())
+                              .set(productL10n.lang, l10n.getLang())
+                              .set(productL10n.name, l10n.getName())
+                              .execute())
+                  .map(
+                      __ -> {
+                        p.setId(id);
+
+                        return p;
+                      })
+                  .toList();
             })
-        			.toList();
-        })
-        .reduce( (a,b) -> a);
+        .reduce((a, b) -> a);
   }
 
   public Mono<Product> update(Product p) {
@@ -100,22 +105,27 @@ public Mono<Product> update(Product p) {
                   .delete(productL10n)
                   .where(productL10n.productId.eq(id))
                   .execute()
-                  .flatMapIterable(___ -> {
-                  	R2DBCInsertClause insert = queryFactory.insert(productL10n);
-                  	return p.getLocalizations().stream().map(l10n ->  insert
-                              .set(productL10n.productId, id)
-                              .set(productL10n.description, l10n.getDescription())
-                              .set(productL10n.lang, l10n.getLang())
-                              .set(productL10n.name, l10n.getName())
-                              .execute())
-                  			.map(____ -> {
-                        p.setId(id);
-
-                        return p;
+                  .flatMapIterable(
+                      ___ -> {
+                        R2DBCInsertClause insert = queryFactory.insert(productL10n);
+                        return p.getLocalizations().stream()
+                            .map(
+                                l10n ->
+                                    insert
+                                        .set(productL10n.productId, id)
+                                        .set(productL10n.description, l10n.getDescription())
+                                        .set(productL10n.lang, l10n.getLang())
+                                        .set(productL10n.name, l10n.getName())
+                                        .execute())
+                            .map(
+                                ____ -> {
+                                  p.setId(id);
+
+                                  return p;
+                                })
+                            .toList();
                       })
-                  			.toList();
-                  })
-                  .reduce( (a,b) -> a);
+                  .reduce((a, b) -> a);
             });
   }
 
diff --git a/querydsl-examples/querydsl-example-r2dbc-sql-codegen/src/test/java/com/querydsl/example/config/TestDataService.java b/querydsl-examples/querydsl-example-r2dbc-sql-codegen/src/test/java/com/querydsl/example/config/TestDataService.java
@@ -12,26 +12,26 @@
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
-public class TestDataService   {
+public class TestDataService {
 
   @Autowired R2DBCQueryFactory r2DBCQueryFactory;
   @Autowired CustomerDao customerDao;
   @Autowired OrderDao orderDao;
   @Autowired PersonDao personDao;
   @Autowired ProductDao productDao;
   @Autowired SupplierDao supplierDao;
-public Long customer1;
-public Long order1;
-public Long product1;
-public Long person1;
-public Long supplier1;
+  public Long customer1;
+  public Long order1;
+  public Long product1;
+  public Long person1;
+  public Long supplier1;
 
   public void addTestData() {
     // suppliers
     Supplier supplier = new Supplier();
     supplier.setCode("acme");
     supplier.setName("ACME");
-   supplier1= supplierDao.save(supplier).block().getId();
+    supplier1 = supplierDao.save(supplier).block().getId();
 
     Supplier supplier2 = new Supplier();
     supplier2.setCode("bigs");
@@ -53,7 +53,7 @@ public void addTestData() {
     l10nDe.setName("Schraubenzieher");
 
     product.setLocalizations(ImmutableSet.of(l10nEn, l10nDe));
-   product1= productDao.save(product).block().getId();
+    product1 = productDao.save(product).block().getId();
 
     Product product2 = new Product();
     product2.setName("Hammer");
diff --git a/querydsl-examples/querydsl-example-r2dbc-sql-codegen/src/test/java/com/querydsl/example/dao/CustomerDaoTest.java b/querydsl-examples/querydsl-example-r2dbc-sql-codegen/src/test/java/com/querydsl/example/dao/CustomerDaoTest.java
@@ -27,7 +27,10 @@ public void findById() {
 
   @Test
   public void update() {
-    Mono<Customer> setup = customerDao.findById(testDataService.customer1).flatMap(customer -> customerDao.save(customer));
+    Mono<Customer> setup =
+        customerDao
+            .findById(testDataService.customer1)
+            .flatMap(customer -> customerDao.save(customer));
 
     StepVerifier.create(setup).expectNextCount(1).verifyComplete();
   }
@@ -38,7 +41,10 @@ public void delete() {
         customerDao
             .findById(1)
             .flatMap(
-                customer -> customerDao.delete(customer).flatMap(__ -> customerDao.findById(testDataService.customer1)));
+                customer ->
+                    customerDao
+                        .delete(customer)
+                        .flatMap(__ -> customerDao.findById(testDataService.customer1)));
 
     StepVerifier.create(setup).verifyComplete();
   }
diff --git a/querydsl-examples/querydsl-example-r2dbc-sql-codegen/src/test/java/com/querydsl/example/dao/OrderDaoTest.java b/querydsl-examples/querydsl-example-r2dbc-sql-codegen/src/test/java/com/querydsl/example/dao/OrderDaoTest.java
@@ -30,7 +30,8 @@ public void findById() {
 
   @Test
   public void update() {
-    Mono<Order> setup = orderDao.findById(testDataService.order1).flatMap(order -> orderDao.save(order));
+    Mono<Order> setup =
+        orderDao.findById(testDataService.order1).flatMap(order -> orderDao.save(order));
 
     StepVerifier.create(setup).expectNextCount(1).verifyComplete();
   }
diff --git a/querydsl-examples/querydsl-example-r2dbc-sql-codegen/src/test/java/com/querydsl/example/dao/PersonDaoTest.java b/querydsl-examples/querydsl-example-r2dbc-sql-codegen/src/test/java/com/querydsl/example/dao/PersonDaoTest.java
@@ -27,7 +27,8 @@ public void findById() {
 
   @Test
   public void update() {
-    Mono<Person> setup = personDao.findById(testDataService.person1).flatMap(p -> personDao.save(p));
+    Mono<Person> setup =
+        personDao.findById(testDataService.person1).flatMap(p -> personDao.save(p));
 
     StepVerifier.create(setup).expectNextCount(1).verifyComplete();
   }
diff --git a/querydsl-examples/querydsl-example-r2dbc-sql-codegen/src/test/java/com/querydsl/example/dao/ProductDaoTest.java b/querydsl-examples/querydsl-example-r2dbc-sql-codegen/src/test/java/com/querydsl/example/dao/ProductDaoTest.java
@@ -31,7 +31,8 @@ public void findById() {
 
   @Test
   public void update() {
-    Mono<Product> setup = productDao.findById(testDataService.product1).flatMap(p -> productDao.save(p));
+    Mono<Product> setup =
+        productDao.findById(testDataService.product1).flatMap(p -> productDao.save(p));
 
     StepVerifier.create(setup).expectNextCount(1).verifyComplete();
   }
diff --git a/querydsl-examples/querydsl-example-r2dbc-sql-codegen/src/test/java/com/querydsl/example/dao/SupplierDaoTest.java b/querydsl-examples/querydsl-example-r2dbc-sql-codegen/src/test/java/com/querydsl/example/dao/SupplierDaoTest.java
@@ -27,7 +27,10 @@ public void findById() {
 
   @Test
   public void update() {
-    Mono<Supplier> setup = supplierDao.findById(testDataService.supplier1).flatMap(supplier -> supplierDao.save(supplier));
+    Mono<Supplier> setup =
+        supplierDao
+            .findById(testDataService.supplier1)
+            .flatMap(supplier -> supplierDao.save(supplier));
 
     StepVerifier.create(setup).expectNextCount(1).verifyComplete();
   }
diff --git a/querydsl-r2dbc/pom.xml b/querydsl-r2dbc/pom.xml
@@ -36,6 +36,11 @@
       <groupId>org.jetbrains</groupId>
       <artifactId>annotations</artifactId>
     </dependency>
+    <dependency>
+      <groupId>io.github.classgraph</groupId>
+      <artifactId>classgraph</artifactId>
+      <scope>test</scope>
+    </dependency>
 
     <dependency>
       <groupId>io.github.openfeign.querydsl</groupId>
diff --git a/querydsl-r2dbc/src/main/java/com/querydsl/r2dbc/types/UtilUUIDType.java b/querydsl-r2dbc/src/main/java/com/querydsl/r2dbc/types/UtilUUIDType.java
@@ -42,8 +42,8 @@ public Class<Object> getDatabaseClass() {
   }
 
   @Override
-  protected String toDbValue(UUID value) {
-    return value.toString();
+  protected Object toDbValue(UUID value) {
+    return value;
   }
 
   @Override
diff --git a/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/Connections.java b/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/Connections.java
@@ -94,7 +94,7 @@ public static void initConfiguration(SQLTemplates templates) {
   }
 
   public static R2DBCConnectionProvider getH2() {
-    String url = "r2dbc:h2:file://././target/h2-test;LOCK_MODE=0";
+    String url = "r2dbc:h2:file://././target/h2-test;LOCK_MODE=0;AUTO_SERVER=TRUE;MODE=legacy";
     return getR2DBCConnectionProvider(url);
   }
 
diff --git a/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/SelectBase.java b/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/SelectBase.java
@@ -777,7 +777,7 @@ public void date_diff2() {
   }
 
   @Test
-  @ExcludeIn({SQLITE}) // FIXME
+  @ExcludeIn({SQLITE, H2}) // FIXME
   public void date_trunc() {
     DateTimeExpression<java.util.Date> expr = DateTimeExpression.currentTimestamp();
 
@@ -796,7 +796,7 @@ public void date_trunc() {
   }
 
   @Test
-  @ExcludeIn({SQLITE, TERADATA}) // FIXME
+  @ExcludeIn({SQLITE, TERADATA, DERBY, H2}) // FIXME
   public void date_trunc2() {
     DateTimeExpression<LocalDateTime> expr =
         DateTimeExpression.currentTimestamp(LocalDateTime.class);
@@ -2708,7 +2708,7 @@ public void yearWeek() {
   public void yearWeek_h2() {
     R2DBCQuery<?> query = query().from(employee).orderBy(employee.id.asc());
     assertEquals(
-        Integer.valueOf(200006), query.select(employee.datefield.yearWeek()).fetchFirst().block());
+        Integer.valueOf(200007), query.select(employee.datefield.yearWeek()).fetchFirst().block());
   }
 
   @Test

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,8 @@ public void findById() {`
`30`	`30`
`31`	`31`	`@Test`
`32`	`32`	`public void update() {`
`33`		`- Mono<Order> setup = orderDao.findById(testDataService.order1).flatMap(order -> orderDao.save(order));`
	`33`	`+ Mono<Order> setup =`
	`34`	`+ orderDao.findById(testDataService.order1).flatMap(order -> orderDao.save(order));`
`34`	`35`
`35`	`36`	`StepVerifier.create(setup).expectNextCount(1).verifyComplete();`
`36`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,8 @@ public void findById() {`
`27`	`27`
`28`	`28`	`@Test`
`29`	`29`	`public void update() {`
`30`		`- Mono<Person> setup = personDao.findById(testDataService.person1).flatMap(p -> personDao.save(p));`
	`30`	`+ Mono<Person> setup =`
	`31`	`+ personDao.findById(testDataService.person1).flatMap(p -> personDao.save(p));`
`31`	`32`
`32`	`33`	`StepVerifier.create(setup).expectNextCount(1).verifyComplete();`
`33`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,8 @@ public void findById() {`
`31`	`31`
`32`	`32`	`@Test`
`33`	`33`	`public void update() {`
`34`		`- Mono<Product> setup = productDao.findById(testDataService.product1).flatMap(p -> productDao.save(p));`
	`34`	`+ Mono<Product> setup =`
	`35`	`+ productDao.findById(testDataService.product1).flatMap(p -> productDao.save(p));`
`35`	`36`
`36`	`37`	`StepVerifier.create(setup).expectNextCount(1).verifyComplete();`
`37`	`38`	`}`