Skip to content

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

Replace a solitary usage of clojure.data.xml with clojure.xml (#66573)

Oleksandr Yakushevbe2e7054af19
diff --git a/deps.edn b/deps.edn
index 06d2e03d449..ec2004ebd3c 100644
--- a/deps.edn
+++ b/deps.edn
@@ -151,7 +151,6 @@
org.clojure/core.match {:mvn/version "1.1.0"}
org.clojure/core.memoize {:mvn/version "1.1.266"} ; useful FIFO, LRU, etc. caching mechanisms
org.clojure/data.csv {:mvn/version "1.1.0"} ; CSV parsing / generation
- org.clojure/data.xml {:mvn/version "0.2.0-alpha9"} ; XML parsing / generation
org.clojure/java.classpath {:mvn/version "1.1.0"} ; examine the Java classpath from Clojure programs
org.clojure/java.jdbc {:mvn/version "0.7.12"} ; basic JDBC access from Clojure
org.clojure/java.jmx {:mvn/version "1.1.0"} ; JMX bean library, for exporting diagnostic info
diff --git a/modules/drivers/sqlserver/src/metabase/driver/sqlserver.clj b/modules/drivers/sqlserver/src/metabase/driver/sqlserver.clj
index 5560e5f56b4..2646f62fd5e 100644
--- a/modules/drivers/sqlserver/src/metabase/driver/sqlserver.clj
+++ b/modules/drivers/sqlserver/src/metabase/driver/sqlserver.clj
@@ -2,10 +2,10 @@
"Driver for SQLServer databases. Uses the official Microsoft JDBC driver under the hood (pre-0.25.0, used jTDS)."
(:refer-clojure :exclude [mapv])
(:require
- [clojure.data.xml :as xml]
[clojure.java.io :as io]
[clojure.java.jdbc :as jdbc]
[clojure.string :as str]
+ [clojure.xml :as xml]
[honey.sql :as sql]
[honey.sql.helpers :as sql.helpers]
[java-time.api :as t]
@@ -420,7 +420,7 @@
I.e {\"Asia/Tokyo\" \"Tokyo Standard Time\"}"}
zone-id->windows-zone
(let [parsed (-> (io/resource "timezones/windowsZones.xml")
- io/reader
+ io/input-stream
xml/parse)
sanitized (sanitize-contents parsed)
data (-> sanitized :content second :content first :content)]