From 1928d995987dea705f4e6ef77fe1a48611b2c721 Mon Sep 17 00:00:00 2001
From: "Mateusz \"Serafin\" Gajewski" <mateusz.gajewski@gmail.com>
Date: Thu, 23 May 2024 20:23:34 +0200
Subject: [PATCH 1/2] Produce non-shaded trino-jdbc along with a shaded version

Non-shaded version allows usage of classes like InMemoryTrinoResultSet which depend on the trino-client classes
which are shaded. This will cause a class mismatch in the runtime (non-shaded class vs shaded-one).
---
 client/trino-jdbc/pom.xml | 16 ++++++++++++++++
 pom.xml                   |  7 +++++++
 2 files changed, 23 insertions(+)

diff --git a/client/trino-jdbc/pom.xml b/client/trino-jdbc/pom.xml
index 1cd873d3f019..573c6d4aea19 100644
--- a/client/trino-jdbc/pom.xml
+++ b/client/trino-jdbc/pom.xml
@@ -366,6 +366,21 @@
         </pluginManagement>
 
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>non-shaded</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                        <configuration>
+                            <classifier>non-shaded</classifier>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -389,6 +404,7 @@
                 <artifactId>maven-shade-plugin</artifactId>
                 <executions>
                     <execution>
+                        <id>shaded</id>
                         <goals>
                             <goal>shade</goal>
                         </goals>
diff --git a/pom.xml b/pom.xml
index 9ecf3657d4e6..c57bfaec69b5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1192,6 +1192,13 @@
                 <version>${project.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>io.trino</groupId>
+                <artifactId>trino-jdbc</artifactId>
+                <version>${project.version}</version>
+                <classifier>non-shaded</classifier>
+            </dependency>
+
             <dependency>
                 <groupId>io.trino</groupId>
                 <artifactId>trino-jmx</artifactId>

From ade8d5c42cdd24dfe855367c99b6d37fdd651c1e Mon Sep 17 00:00:00 2001
From: "Mateusz \"Serafin\" Gajewski" <mateusz.gajewski@gmail.com>
Date: Sat, 25 May 2024 13:25:55 +0200
Subject: [PATCH 2/2] Open InMemoryTrinoResultSet for public usage

It's useful for testing when one would like to mock ResultSet.
---
 .../src/main/java/io/trino/jdbc/InMemoryTrinoResultSet.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/trino-jdbc/src/main/java/io/trino/jdbc/InMemoryTrinoResultSet.java b/client/trino-jdbc/src/main/java/io/trino/jdbc/InMemoryTrinoResultSet.java
index ca0cdb16b840..a704010ea72f 100644
--- a/client/trino-jdbc/src/main/java/io/trino/jdbc/InMemoryTrinoResultSet.java
+++ b/client/trino-jdbc/src/main/java/io/trino/jdbc/InMemoryTrinoResultSet.java
@@ -20,7 +20,7 @@
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-class InMemoryTrinoResultSet
+public class InMemoryTrinoResultSet
         extends AbstractTrinoResultSet
 {
     private final AtomicBoolean closed = new AtomicBoolean();