From c4307db0a60c7b4612397ab1e1b911e0a78ccf13 Mon Sep 17 00:00:00 2001
From: Robert Volkmann <20912167+robertvolkmann@users.noreply.github.com>
Date: Sun, 20 Nov 2022 13:25:33 +0100
Subject: [PATCH] dependencies: Fix #2297: Upgrade H2 (#2317)

* refactor: drop tables according to their dependencies

* refactor: renamed table because USER is an SQL keyword

* dep: upgrade com.h2database.h2 1.4.190 to 2.1.214
---
 .../src/main/java/com/iluwatar/domainmodel/App.java       | 4 ++--
 metadata-mapping/README.md                                | 8 ++++----
 .../java/com/iluwatar/metamapping/utils/DatabaseUtil.java | 4 ++--
 .../resources/com/iluwatar/metamapping/model/User.hbm.xml | 2 +-
 pom.xml                                                   | 6 ------
 .../com/iluwatar/transactionscript/RoomSchemaSql.java     | 2 +-
 6 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/domain-model/src/main/java/com/iluwatar/domainmodel/App.java b/domain-model/src/main/java/com/iluwatar/domainmodel/App.java
index 80058fb89..681e7c4fc 100644
--- a/domain-model/src/main/java/com/iluwatar/domainmodel/App.java
+++ b/domain-model/src/main/java/com/iluwatar/domainmodel/App.java
@@ -60,8 +60,8 @@ public class App {
           + "customer_name varchar references CUSTOMERS(name));";
 
   public static final String DELETE_SCHEMA_SQL =
-      "DROP TABLE CUSTOMERS IF EXISTS;"
-          + "DROP TABLE PURCHASES IF EXISTS;"
+      "DROP TABLE PURCHASES IF EXISTS;"
+          + "DROP TABLE CUSTOMERS IF EXISTS;"
           + "DROP TABLE PRODUCTS IF EXISTS;";
 
   /**
diff --git a/metadata-mapping/README.md b/metadata-mapping/README.md
index dd91271d8..0beee3ae6 100644
--- a/metadata-mapping/README.md
+++ b/metadata-mapping/README.md
@@ -26,14 +26,14 @@ Wikipedia says
 
 **Programmatic Example**
 
-We give an example about visiting the information of `USER` table in `h2` database. Firstly, we create `USER` table with `h2`:
+We give an example about visiting the information of `user_account` table in `h2` database. Firstly, we create `user_account` table with `h2`:
 
 ```java
 @Slf4j
 public class DatabaseUtil {
   private static final String DB_URL = "jdbc:h2:mem:metamapping";
-  private static final String CREATE_SCHEMA_SQL = "DROP TABLE IF EXISTS `user`;"
-      + "CREATE TABLE `user` (\n"
+  private static final String CREATE_SCHEMA_SQL = "DROP TABLE IF EXISTS `user_account`;"
+      + "CREATE TABLE `user_account` (\n"
       + "  `id` int(11) NOT NULL AUTO_INCREMENT,\n"
       + "  `username` varchar(255) NOT NULL,\n"
       + "  `password` varchar(255) NOT NULL,\n"
@@ -88,7 +88,7 @@ Then we write a `xml` file to show the mapping between the table and the object:
     "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping>
-  <class name="com.iluwatar.metamapping.model.User" table="user">
+  <class name="com.iluwatar.metamapping.model.User" table="user_account">
     <id name="id" type="java.lang.Integer" column="id">
       <generator class="native"/>
     </id>
diff --git a/metadata-mapping/src/main/java/com/iluwatar/metamapping/utils/DatabaseUtil.java b/metadata-mapping/src/main/java/com/iluwatar/metamapping/utils/DatabaseUtil.java
index 55f06ed9a..048f470ae 100644
--- a/metadata-mapping/src/main/java/com/iluwatar/metamapping/utils/DatabaseUtil.java
+++ b/metadata-mapping/src/main/java/com/iluwatar/metamapping/utils/DatabaseUtil.java
@@ -34,8 +34,8 @@ import org.h2.jdbcx.JdbcDataSource;
 @Slf4j
 public class DatabaseUtil {
   private static final String DB_URL = "jdbc:h2:mem:metamapping";
-  private static final String CREATE_SCHEMA_SQL = "DROP TABLE IF EXISTS `user`;"
-      + "CREATE TABLE `user` (\n"
+  private static final String CREATE_SCHEMA_SQL = "DROP TABLE IF EXISTS `user_account`;"
+      + "CREATE TABLE `user_account` (\n"
       + "  `id` int(11) NOT NULL AUTO_INCREMENT,\n"
       + "  `username` varchar(255) NOT NULL,\n"
       + "  `password` varchar(255) NOT NULL,\n"
diff --git a/metadata-mapping/src/main/resources/com/iluwatar/metamapping/model/User.hbm.xml b/metadata-mapping/src/main/resources/com/iluwatar/metamapping/model/User.hbm.xml
index cd63c552d..38862c67a 100644
--- a/metadata-mapping/src/main/resources/com/iluwatar/metamapping/model/User.hbm.xml
+++ b/metadata-mapping/src/main/resources/com/iluwatar/metamapping/model/User.hbm.xml
@@ -4,7 +4,7 @@
     "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping>
-  <class name="com.iluwatar.metamapping.model.User" table="user">
+  <class name="com.iluwatar.metamapping.model.User" table="user_account">
     <id name="id" type="java.lang.Integer" column="id">
       <generator class="native"/>
     </id>
diff --git a/pom.xml b/pom.xml
index 6f7f6721f..f8adbff43 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,6 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <sonar-maven-plugin.version>3.8.0.2131</sonar-maven-plugin.version>
     <spring-boot.version>2.7.5</spring-boot.version>
-    <h2.version>1.4.190</h2.version>
     <jacoco.version>0.8.8</jacoco.version>
     <commons-dbcp.version>1.4</commons-dbcp.version>
     <camel.version>2.25.1</camel.version>
@@ -232,11 +231,6 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
-      <dependency>
-        <groupId>com.h2database</groupId>
-        <artifactId>h2</artifactId>
-        <version>${h2.version}</version>
-      </dependency>
       <dependency>
         <groupId>commons-dbcp</groupId>
         <artifactId>commons-dbcp</artifactId>
diff --git a/transaction-script/src/main/java/com/iluwatar/transactionscript/RoomSchemaSql.java b/transaction-script/src/main/java/com/iluwatar/transactionscript/RoomSchemaSql.java
index acb96930e..29cad5862 100644
--- a/transaction-script/src/main/java/com/iluwatar/transactionscript/RoomSchemaSql.java
+++ b/transaction-script/src/main/java/com/iluwatar/transactionscript/RoomSchemaSql.java
@@ -30,7 +30,7 @@ package com.iluwatar.transactionscript;
 public final class RoomSchemaSql {
 
   public static final String CREATE_SCHEMA_SQL =
-      "CREATE TABLE ROOMS (ID NUMBER, ROOM_TYPE VARCHAR(100), PRICE INT(100), BOOKED VARCHAR(100))";
+      "CREATE TABLE ROOMS (ID NUMBER, ROOM_TYPE VARCHAR(100), PRICE INT, BOOKED VARCHAR(100))";
   public static final String DELETE_SCHEMA_SQL = "DROP TABLE ROOMS IF EXISTS";
 
   private RoomSchemaSql() {