Skip to content

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

Revert formatting-breaking commits (#74921)

Cam Saul7fa844b5bbe6
diff --git a/bb.edn b/bb.edn
index bfe5fe04679..79f4318708f 100644
--- a/bb.edn
+++ b/bb.edn
@@ -4,7 +4,7 @@
:paths ["mage/src" "mage/test" "bin/lint-migrations-file/src"]
;; use Cam's fork temporarily until a new release with https://github.com/weavejester/cljfmt/pull/420 is cut
;; (release > 0.16.4)
- :deps {dev.weavejester/cljfmt {:git/sha "d7e7bb9130a8315b4b320823380a172e51657eb3"
+ :deps {dev.weavejester/cljfmt {:git/sha "05886be17744846685e6a733973fdfbd24e1acd5"
:git/url "https://github.com/camsaul/cljfmt"} ;; run cljfmt from bb
io.github.paintparty/bling {:mvn/version "0.8.8"} ;; printing bells and whistles
medley/medley {:mvn/version "1.3.0"} ;; utilities
diff --git a/modules/drivers/sqlserver/src/metabase/driver/sqlserver.clj b/modules/drivers/sqlserver/src/metabase/driver/sqlserver.clj
index 0bda2362395..81d47ec0188 100644
--- a/modules/drivers/sqlserver/src/metabase/driver/sqlserver.clj
+++ b/modules/drivers/sqlserver/src/metabase/driver/sqlserver.clj
@@ -629,8 +629,10 @@
(-> %
(driver-api/assoc-field-options ::sql.qp/wrap-in-case true)
(driver-api/assoc-field-options ::sql.qp/add-cast :bit))
+
(sql.qp.boolean-to-comparison/boolean-expression-clause? %)
(driver-api/assoc-field-options % ::sql.qp/add-cast :bit)
+
:else
%)]
(->> (update query :fields #(mapv maybe-add-cast %))
diff --git a/src/metabase/lib/schema/expression.cljc b/src/metabase/lib/schema/expression.cljc
index f4e8611b545..7331731553b 100644
--- a/src/metabase/lib/schema/expression.cljc
+++ b/src/metabase/lib/schema/expression.cljc
@@ -266,9 +266,12 @@
#(cond
(vector? %) ;; non-literal (checked above)
true
+
(not (int? %))
false
+
(not (pos? %))
false
+
:else
true)]])