From 586092a2877984cd6bf0bc84b13737f0d42951bc Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@vmware.com>
Date: Wed, 27 Apr 2022 09:30:41 +0200
Subject: [PATCH] Update JDBC examples to work with newer H2 versions.

See #636
---
 .../springdata/jdbc/immutables/Application.java      |  3 ++-
 jdbc/jooq/pom.xml                                    |  4 ++++
 jdbc/jooq/src/main/resources/schema.sql              | 12 ++++++++++--
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/jdbc/immutables/src/main/java/example/springdata/jdbc/immutables/Application.java b/jdbc/immutables/src/main/java/example/springdata/jdbc/immutables/Application.java
index 553b545f..081c541c 100644
--- a/jdbc/immutables/src/main/java/example/springdata/jdbc/immutables/Application.java
+++ b/jdbc/immutables/src/main/java/example/springdata/jdbc/immutables/Application.java
@@ -19,6 +19,7 @@ import java.sql.ResultSet;
 
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.data.jdbc.core.convert.BasicJdbcConverter;
 import org.springframework.data.jdbc.core.convert.DefaultJdbcTypeFactory;
@@ -73,7 +74,7 @@ class Application {
 		 */
 		@Override
 		public JdbcConverter jdbcConverter(JdbcMappingContext mappingContext, NamedParameterJdbcOperations operations,
-				RelationResolver relationResolver, JdbcCustomConversions conversions, Dialect dialect) {
+				@Lazy RelationResolver relationResolver, JdbcCustomConversions conversions, Dialect dialect) {
 
 			var jdbcTypeFactory = new DefaultJdbcTypeFactory(operations.getJdbcOperations());
 
diff --git a/jdbc/jooq/pom.xml b/jdbc/jooq/pom.xml
index 4683a11b..a2ce42c8 100644
--- a/jdbc/jooq/pom.xml
+++ b/jdbc/jooq/pom.xml
@@ -14,6 +14,10 @@
 	<name>Spring Data JDBC - Usage with jOOQ</name>
 	<description>Sample project demonstrating Spring Data JDBC features</description>
 
+	<properties>
+		<jooq.version>3.16.6</jooq.version>
+	</properties>
+
 	<dependencies>
 		<dependency>
 			<groupId>org.jooq</groupId>
diff --git a/jdbc/jooq/src/main/resources/schema.sql b/jdbc/jooq/src/main/resources/schema.sql
index 600c536a..c377b036 100644
--- a/jdbc/jooq/src/main/resources/schema.sql
+++ b/jdbc/jooq/src/main/resources/schema.sql
@@ -1,6 +1,14 @@
 CREATE TABLE IF NOT EXISTS category (
-  id INTEGER IDENTITY PRIMARY KEY,
-  name VARCHAR(100),
+                                        id
+                                        INTEGER
+                                        AUTO_INCREMENT
+                                        PRIMARY
+                                        KEY,
+                                        name
+                                        VARCHAR
+(
+                                        100
+),
   description VARCHAR(2000),
   age_group VARCHAR(20)
 );