From 5e6d04b5776ba2761a6fada91a33333e95a6c7d5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 21 Jan 2022 23:19:54 +0000 Subject: [PATCH 1/2] Bump h2 from 1.4.197 to 2.1.210 Bumps [h2](https://github.com/h2database/h2database) from 1.4.197 to 2.1.210. - [Release notes](https://github.com/h2database/h2database/releases) - [Commits](https://github.com/h2database/h2database/compare/version-1.4.197...version-2.1.210) --- updated-dependencies: - dependency-name: com.h2database:h2 dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ec70bb41..4856167f 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,7 @@ com.h2database h2 - 1.4.197 + 2.1.210 From f15399a7609c9be7d4e7ac574c81d09a96131586 Mon Sep 17 00:00:00 2001 From: Jared Stehler Date: Sat, 3 Jun 2023 12:01:13 -0400 Subject: [PATCH 2/2] VALUE is a keyword as of h2 v2 --- .../hubspot/rosetta/jdbi3/AbstractJdbiTest.java | 2 +- .../java/com/hubspot/rosetta/jdbi3/TestDao.java | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/RosettaJdbi3/src/test/java/com/hubspot/rosetta/jdbi3/AbstractJdbiTest.java b/RosettaJdbi3/src/test/java/com/hubspot/rosetta/jdbi3/AbstractJdbiTest.java index 9409f19d..d780d51b 100644 --- a/RosettaJdbi3/src/test/java/com/hubspot/rosetta/jdbi3/AbstractJdbiTest.java +++ b/RosettaJdbi3/src/test/java/com/hubspot/rosetta/jdbi3/AbstractJdbiTest.java @@ -14,7 +14,7 @@ public void setup() { jdbi.registerRowMapper(new RosettaRowMapperFactory()); jdbi.useHandle(handle -> { handle.execute("CREATE TABLE IF NOT EXISTS test_table (id INT, name VARCHAR(255) NOT NULL, PRIMARY KEY (id))"); - handle.execute("CREATE TABLE IF NOT EXISTS test_list_table (id INT, value INT NOT NULL, PRIMARY KEY (id))"); + handle.execute("CREATE TABLE IF NOT EXISTS test_list_table (id INT, \"value\" INT NOT NULL, PRIMARY KEY (id))"); handle.execute("TRUNCATE TABLE test_table"); handle.execute("TRUNCATE TABLE test_list_table"); }); diff --git a/RosettaJdbi3/src/test/java/com/hubspot/rosetta/jdbi3/TestDao.java b/RosettaJdbi3/src/test/java/com/hubspot/rosetta/jdbi3/TestDao.java index c69e1d4d..79573255 100644 --- a/RosettaJdbi3/src/test/java/com/hubspot/rosetta/jdbi3/TestDao.java +++ b/RosettaJdbi3/src/test/java/com/hubspot/rosetta/jdbi3/TestDao.java @@ -1,6 +1,7 @@ package com.hubspot.rosetta.jdbi3; import java.util.List; + import org.jdbi.v3.sqlobject.SqlObject; import org.jdbi.v3.sqlobject.config.RegisterRowMapperFactory; import org.jdbi.v3.sqlobject.customizer.BindList.EmptyHandling; @@ -16,27 +17,27 @@ public interface TestDao extends SqlObject { @SqlQuery("SELECT * FROM test_list_table") List getAllList(); - @SqlQuery("SELECT * FROM test_list_table WHERE value IN ()") + @SqlQuery("SELECT * FROM test_list_table WHERE \"value\" IN ()") List getWithValue(@BindListWithRosetta("values") List values); - @SqlQuery("SELECT * FROM test_list_table WHERE value NOT IN ()") + @SqlQuery("SELECT * FROM test_list_table WHERE \"value\" NOT IN ()") List getWithoutValueEmptyToNull(@BindListWithRosetta(value = "values", onEmpty = EmptyHandling.NULL) List values); - @SqlQuery("SELECT * FROM test_list_table WHERE value NOT IN ()") + @SqlQuery("SELECT * FROM test_list_table WHERE \"value\" NOT IN ()") List getWithoutValueEmptyToVoid(@BindListWithRosetta(value = "values", onEmpty = EmptyHandling.VOID) List values); - @SqlQuery("SELECT * FROM test_list_table WHERE value IN ()") + @SqlQuery("SELECT * FROM test_list_table WHERE \"value\" IN ()") List getWithFieldValue(@BindListWithRosetta(value = "values", field = "value") List values); - @SqlQuery("SELECT * FROM test_list_table WHERE value IN ()") + @SqlQuery("SELECT * FROM test_list_table WHERE \"value\" IN ()") List getWithListFieldValue(@BindListWithRosetta(value = "values", field = "stringValues") List values); - @SqlQuery("SELECT * FROM test_list_table WHERE value IN ()") + @SqlQuery("SELECT * FROM test_list_table WHERE \"value\" IN ()") List getWithObjectFieldValue(@BindListWithRosetta(value = "values", field = "objectValue") List values); @SqlUpdate("INSERT INTO test_table (id, name) VALUES (:id, :name)") int insert(@BindWithRosetta TestObject object); - @SqlUpdate("INSERT INTO test_list_table (id, value) VALUES (:id, :value)") + @SqlUpdate("INSERT INTO test_list_table (id, \"value\") VALUES (:id, :value)") int insert(@BindWithRosetta TestListObject object); }