Skip to content

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

fix: enumerate cols to fix sql server (#77373)

Nicola Momettoe5bd3a34eb2e
diff --git a/enterprise/backend/test/metabase_enterprise/transforms/incremental_test.clj b/enterprise/backend/test/metabase_enterprise/transforms/incremental_test.clj
index c77b44a2216..8402827af25 100644
--- a/enterprise/backend/test/metabase_enterprise/transforms/incremental_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/transforms/incremental_test.clj
@@ -81,11 +81,11 @@
(let [{:keys [field-name]} checkpoint-config
table-id (mt/id :transforms_products)
timestamp-sql (first (sql/format (sql.qp/current-datetime-honeysql-form driver/*driver*)))
- query (format "SELECT *, %s AS %s FROM {{source_table}} AS %s ORDER BY %s"
- timestamp-sql
- (sql.u/quote-name driver/*driver* :field "load_timestamp")
- (sql.u/quote-name driver/*driver* :field "source_table")
- (sql.u/quote-name driver/*driver* :field field-name))]
+ quoted (fn [field] (sql.u/quote-name driver/*driver* :field field))
+ query (format "SELECT %s, %s, %s, %s, %s AS %s FROM {{source_table}} AS %s ORDER BY %s"
+ (quoted "name") (quoted "category") (quoted "price") (quoted "created_at")
+ timestamp-sql (quoted "load_timestamp") (quoted "source_table")
+ (quoted field-name))]
{:database (mt/id)
:type :native
:native {:query query
@@ -98,10 +98,13 @@
(defn- make-incremental-mbql-query
"Create an MBQL query for incremental transforms. "
+
[checkpoint-config]
(let [{:keys [field-name]} checkpoint-config]
- (mt/mbql-query transforms_products {:expressions {"load_timestamp" [:now]}
- :order-by [[:asc [:field (mt/id :transforms_products (keyword field-name))]]]})))
+ (mt/mbql-query transforms_products
+ {:expressions {"load_timestamp" [:now]}
+ :fields [$name $category $price $created_at [:expression "load_timestamp"]]
+ :order-by [[:asc [:field (mt/id :transforms_products (keyword field-name))]]]})))
(def incremental-python-body
(str "import pandas as pd\n"
diff --git a/modules/drivers/sqlserver/src/metabase/driver/sqlserver.clj b/modules/drivers/sqlserver/src/metabase/driver/sqlserver.clj
index de73a343ef8..c70f71395f3 100644
--- a/modules/drivers/sqlserver/src/metabase/driver/sqlserver.clj
+++ b/modules/drivers/sqlserver/src/metabase/driver/sqlserver.clj
@@ -30,7 +30,6 @@
[metabase.util :as u]
[metabase.util.honey-sql-2 :as h2x]
[metabase.util.i18n :refer [tru]]
- [metabase.util.json :as json]
[metabase.util.log :as log]
[metabase.util.malli :as mu]
[metabase.util.match :as match]
@@ -1086,20 +1085,11 @@
[_ e]
(= (sql-jdbc/get-sql-state e) "S0002"))
-(defmethod driver/insert-from-source! [:sqlserver :jsonl-file]
- [driver db-id {:keys [columns] :as table-definition} {:keys [file]}]
- (with-open [rdr (io/reader file)]
- (let [lines (line-seq rdr)
- data-rows (map (fn [line]
- (let [m (json/decode line)]
- (mapv (fn [column]
- (let [value (get m (:name column))]
- (if (boolean? value)
- (if value 1 0)
- value)))
- columns)))
- lines)]
- (driver/insert-from-source! driver db-id table-definition {:type :rows :data data-rows}))))
+(defmethod driver/insert-col->val [:sqlserver :jsonl-file]
+ [_driver _ _column-def value]
+ (if (boolean? value)
+ (if value 1 0)
+ value))
(defmethod driver/compile-transform :sqlserver
[driver {:keys [query output-table]}]