From 4324f23bd7aeab507a781e223575d31e74038378 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Dec 2023 13:56:14 +0000
Subject: [PATCH] chore: bump com.h2database:h2 from 1.4.200 to 2.2.224

Bumps [com.h2database:h2](https://github.com/h2database/h2database) from 1.4.200 to 2.2.224.
- [Release notes](https://github.com/h2database/h2database/releases)
- [Commits](https://github.com/h2database/h2database/compare/version-1.4.200...version-2.2.224)

---
updated-dependencies:
- dependency-name: com.h2database:h2
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml                                       |  2 +-
 .../extractor/JdbcSiteParserDao.java          |  2 +-
 .../resources/liquibase/version/0.4.8.xml     |  2 +-
 ...rename_site_parser_params_value_column.xml | 23 +++++++++++++++++++
 .../sql/site_parser_dao_queries.properties    |  8 +++----
 5 files changed, 30 insertions(+), 7 deletions(-)
 create mode 100644 src/main/resources/liquibase/version/0.4.8/2024-01-25--rename_site_parser_params_value_column.xml

diff --git a/pom.xml b/pom.xml
index b40488d422..683215d283 100644
--- a/pom.xml
+++ b/pom.xml
@@ -574,7 +574,7 @@
 		<groovy-old.version>2.0.8</groovy-old.version>
 		
 		<!-- Redefine default value from spring-boot-dependencies -->
-		<h2.version>1.4.200</h2.version>
+		<h2.version>2.2.224</h2.version>
 		
 		<!-- Redefine default value from spring-boot-dependencies -->
 		<hibernate-validator.version>6.1.7.Final</hibernate-validator.version>
diff --git a/src/main/java/ru/mystamps/web/feature/series/importing/extractor/JdbcSiteParserDao.java b/src/main/java/ru/mystamps/web/feature/series/importing/extractor/JdbcSiteParserDao.java
index 1c19dbe163..1f3118d380 100644
--- a/src/main/java/ru/mystamps/web/feature/series/importing/extractor/JdbcSiteParserDao.java
+++ b/src/main/java/ru/mystamps/web/feature/series/importing/extractor/JdbcSiteParserDao.java
@@ -30,7 +30,7 @@
 public class JdbcSiteParserDao implements SiteParserDao {
 	
 	private static final ResultSetExtractor<Map<String, String>> PARAMS_EXTRACTOR =
-		new MapStringStringResultSetExtractor("name", "value");
+		new MapStringStringResultSetExtractor("name", "val");
 	
 	private final NamedParameterJdbcTemplate jdbcTemplate;
 	private final String findParserIdByMatchedUrlSql;
diff --git a/src/main/resources/liquibase/version/0.4.8.xml b/src/main/resources/liquibase/version/0.4.8.xml
index b96e68b6e3..076944447b 100644
--- a/src/main/resources/liquibase/version/0.4.8.xml
+++ b/src/main/resources/liquibase/version/0.4.8.xml
@@ -5,6 +5,6 @@
 	xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
 		http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.3.xsd">
 	
-	
+	<include file="0.4.8/2024-01-25--rename_site_parser_params_value_column.xml" relativeToChangelogFile="true" />
 	
 </databaseChangeLog>
diff --git a/src/main/resources/liquibase/version/0.4.8/2024-01-25--rename_site_parser_params_value_column.xml b/src/main/resources/liquibase/version/0.4.8/2024-01-25--rename_site_parser_params_value_column.xml
new file mode 100644
index 0000000000..8767f90255
--- /dev/null
+++ b/src/main/resources/liquibase/version/0.4.8/2024-01-25--rename_site_parser_params_value_column.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<databaseChangeLog
+	xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
+		http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.3.xsd">
+	
+	<!--
+		Rename column "value" as it's a reserved word in SQL.
+		Newer versions of H2 don't allow to use it as unquoted identifier.
+		See for details: https://github.com/h2database/h2database/issues/3954
+	-->
+	<changeSet id="rename-site_parser_params-value-field" author="php-coder" context="scheme">
+		
+		<renameColumn
+			tableName="site_parser_params"
+			oldColumnName="value"
+			newColumnName="val"
+			columnDataType="VARCHAR(100)" />
+		
+	</changeSet>
+	
+</databaseChangeLog>
diff --git a/src/main/resources/sql/site_parser_dao_queries.properties b/src/main/resources/sql/site_parser_dao_queries.properties
index 3d68643108..0d858fc946 100644
--- a/src/main/resources/sql/site_parser_dao_queries.properties
+++ b/src/main/resources/sql/site_parser_dao_queries.properties
@@ -2,8 +2,8 @@ site_parser.find_like_matched_url = \
 SELECT parser_id AS id \
   FROM site_parser_params \
  WHERE name = 'matched_url' \
-   AND value = :url \
-    OR :url LIKE CONCAT(value, '%')
+   AND val = :url \
+    OR :url LIKE CONCAT(val, '%')
 
 site_parser.find_names = \
   SELECT name \
@@ -12,11 +12,11 @@ ORDER BY id
 
 site_parser_param.find_all_with_parser_name = \
 SELECT name \
-     , value \
+     , val \
   FROM site_parser_params \
  WHERE parser_id = :parser_id \
  UNION ALL \
 SELECT 'name' AS name \
-     , name AS value \
+     , name AS val \
   FROM site_parsers \
  WHERE id = :parser_id