Skip to content

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

Support all kinds of identity types on sqlserver (#69871)

metamben12e6b4611892
diff --git a/modules/drivers/sqlserver/src/metabase/driver/sqlserver.clj b/modules/drivers/sqlserver/src/metabase/driver/sqlserver.clj
index e9a0b947f85..3be20d85f78 100644
--- a/modules/drivers/sqlserver/src/metabase/driver/sqlserver.clj
+++ b/modules/drivers/sqlserver/src/metabase/driver/sqlserver.clj
@@ -124,7 +124,13 @@
:varbinary :type/*
:varchar :type/Text
:xml :type/*
- (keyword "int identity") :type/Integer} column-type)) ; auto-incrementing integer (ie pk) field
+ ;; auto-incrementing integer (ie pk) field
+ (keyword "tinyint identity") :type/Integer
+ (keyword "smallint identity") :type/Integer
+ (keyword "int identity") :type/Integer
+ (keyword "bigint identity") :type/BigInteger
+ (keyword "decimal identity") :type/Decimal
+ (keyword "numeric identity") :type/Decimal} column-type))
(defmulti ^:private type->database-type
"Internal type->database-type multimethod for SQL Server that dispatches on type."
diff --git a/modules/drivers/sqlserver/test/metabase/driver/sqlserver_test.clj b/modules/drivers/sqlserver/test/metabase/driver/sqlserver_test.clj
index 0c80ef82185..a389876a537 100644
--- a/modules/drivers/sqlserver/test/metabase/driver/sqlserver_test.clj
+++ b/modules/drivers/sqlserver/test/metabase/driver/sqlserver_test.clj
@@ -26,7 +26,8 @@
[metabase.test.util.timezone :as test.tz]
[metabase.util.date-2 :as u.date]
[metabase.util.honey-sql-2 :as h2x]
- [next.jdbc]))
+ [next.jdbc]
+ [toucan2.core :as t2]))
(set! *warn-on-reflection* true)
@@ -761,6 +762,19 @@
driver-api/qp.add.source-table driver-api/qp.add.none
driver-api/qp.add.desired-alias nil}]})))))))
+(mt/defdataset ^:private bigint-identity-data
+ [["bigint_identity_test"
+ [{:field-name "id", :base-type {:native "BIGINT IDENTITY(1,1)"}, :pk? true}
+ {:field-name "name", :base-type :type/Text}]
+ []]])
+
+(deftest bigint-identity-base-type-test
+ (testing "BIGINT IDENTITY columns should sync as :type/BigInteger, not :type/* (#68631)"
+ (mt/test-driver :sqlserver
+ (mt/dataset bigint-identity-data
+ (is (= :type/BigInteger
+ (t2/select-one-fn :base_type :model/Field (mt/id :bigint_identity_test :id))))))))
+
(deftest ^:parallel type->database-type-test
(testing "type->database-type multimethod returns correct SQL Server types"
(are [base-type expected] (= expected (driver/type->database-type :sqlserver base-type))