Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

better error message for java object error (#74315)

dpsutton00f42511fe3b
diff --git a/src/metabase/driver/h2.clj b/src/metabase/driver/h2.clj
index d290d6466d1..6d3c3c677c3 100644
--- a/src/metabase/driver/h2.clj
+++ b/src/metabase/driver/h2.clj
@@ -32,7 +32,7 @@
[metabase.util.malli :as mu]
[metabase.util.performance :refer [every? some]])
(:import
- (java.sql Clob Connection ResultSet ResultSetMetaData SQLException Statement)
+ (java.sql Clob Connection ResultSet ResultSetMetaData SQLException Statement Types)
(java.time OffsetTime)
(org.h2.command CommandInterface Parser)
(org.h2.engine SessionLocal)))
@@ -605,13 +605,19 @@
;; de-CLOB any CLOB values that come back
(defmethod sql-jdbc.execute/read-column-thunk :h2
[_ ^ResultSet rs ^ResultSetMetaData rsmeta ^Integer i]
- (let [classname (some-> (.getColumnClassName rsmeta i)
- (Class/forName true (driver-api/the-classloader)))]
- (if (isa? classname Clob)
- (fn []
- (driver-api/clob->str (.getObject rs i)))
- (fn []
- (.getObject rs i)))))
+ (let [col-type (.getColumnType rsmeta i)]
+ (when (= col-type Types/JAVA_OBJECT)
+ (throw (ex-info "Unable to parse jdbc type"
+ {:column-index i
+ :column-name (.getColumnName rsmeta i)
+ :column-type col-type})))
+ (let [classname (some-> (.getColumnClassName rsmeta i)
+ (Class/forName true (driver-api/the-classloader)))]
+ (if (isa? classname Clob)
+ (fn []
+ (driver-api/clob->str (.getObject rs i)))
+ (fn []
+ (.getObject rs i))))))
(defmethod sql-jdbc.execute/set-parameter [:h2 OffsetTime]
[driver prepared-statement i t]