From 45f59202f92ff914c00c2a9ad95488e98b07b7b0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 11 Jul 2024 13:34:45 +0000
Subject: [PATCH 1/2] Bump org.sql2o:sql2o from 1.6.0 to 1.8.0

Bumps [org.sql2o:sql2o](https://github.com/aaberg/sql2o) from 1.6.0 to 1.8.0.
- [Release notes](https://github.com/aaberg/sql2o/releases)
- [Commits](https://github.com/aaberg/sql2o/compare/sql2o-parent-1.6.0...1.8.0)

---
updated-dependencies:
- dependency-name: org.sql2o:sql2o
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 21ea804..c203a5f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,7 @@
         <rxjava-jdbc.version>0.7.19</rxjava-jdbc.version>
         <slf4j.version>2.0.13</slf4j.version>
         <spring-jdbc.version>6.1.11</spring-jdbc.version>
-        <sql2o.version>1.6.0</sql2o.version>
+        <sql2o.version>1.8.0</sql2o.version>
         <hamcrest.version>2.2</hamcrest.version>
         <cyclonedx-maven-plugin.version>2.8.0</cyclonedx-maven-plugin.version>
     </properties>

From 73028ff252e87f53c8673139e0fc02c622ffe01a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sondre=20Eikanger=20Kval=C3=B8?= <zapodot@gmail.com>
Date: Thu, 11 Jul 2024 15:44:18 +0200
Subject: [PATCH 2/2] Fiks for sql2o 1.8.0

---
 .../junit/db/EmbeddedDatabaseRuleSql2oTest.java | 17 +++--------------
 .../java/org/zapodot/junit/db/TestElement.java  |  8 ++++++++
 2 files changed, 11 insertions(+), 14 deletions(-)
 create mode 100644 embedded-db-junit/src/test/java/org/zapodot/junit/db/TestElement.java

diff --git a/embedded-db-junit/src/test/java/org/zapodot/junit/db/EmbeddedDatabaseRuleSql2oTest.java b/embedded-db-junit/src/test/java/org/zapodot/junit/db/EmbeddedDatabaseRuleSql2oTest.java
index 685a259..fda9d3a 100644
--- a/embedded-db-junit/src/test/java/org/zapodot/junit/db/EmbeddedDatabaseRuleSql2oTest.java
+++ b/embedded-db-junit/src/test/java/org/zapodot/junit/db/EmbeddedDatabaseRuleSql2oTest.java
@@ -9,17 +9,6 @@
 
 public class EmbeddedDatabaseRuleSql2oTest {
 
-    public static class Element {
-        public final Long id;
-
-        public final String name;
-
-        public Element(final Long id, final String name) {
-            this.id = id;
-            this.name = name;
-        }
-    }
-
     @Rule
     public final EmbeddedDatabaseRule databaseRule = EmbeddedDatabaseRule
             .builder()
@@ -28,7 +17,7 @@ public Element(final Long id, final String name) {
             .build();
 
     @Test
-    public void testUsingSql2oWithTransaction() throws Exception {
+    public void testUsingSql2oWithTransaction() {
         final Sql2o sql2o = new Sql2o(databaseRule.getDataSource());
         final String elementName = "element illegalSqlFromResource";
         try (final Connection transaction = sql2o.beginTransaction()) {
@@ -41,9 +30,9 @@ public void testUsingSql2oWithTransaction() throws Exception {
             transaction.commit();
         }
         try (final Connection read = sql2o.open()) {
-            final Element element = read
+            final TestElement element = read
                     .createQuery("SELECT * from ELEMENT")
-                    .executeAndFetch(Element.class)
+                    .executeAndFetch(TestElement.class)
                     .iterator()
                     .next();
             assertEquals(1L, element.id.longValue());
diff --git a/embedded-db-junit/src/test/java/org/zapodot/junit/db/TestElement.java b/embedded-db-junit/src/test/java/org/zapodot/junit/db/TestElement.java
new file mode 100644
index 0000000..1922ed5
--- /dev/null
+++ b/embedded-db-junit/src/test/java/org/zapodot/junit/db/TestElement.java
@@ -0,0 +1,8 @@
+package org.zapodot.junit.db;
+
+public class TestElement {
+    public Long id;
+
+    public String name;
+
+}