Binary basic columns should be limitable (#1253)

rails-sqlserver · Oct 22, 2024 · 111d33b · 111d33b
1 parent 63b6854
commit 111d33b
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 34 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 - [#1244](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1244) Allow INSERT statements with SELECT notation
 - [#1247](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1247) Fix queries with date and date-time placeholder conditions
+- [#1249](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1249) Binary basic columns should be limitable
 
 ## v7.2.1
 

diff --git a/lib/active_record/connection_adapters/sqlserver/schema_statements.rb b/lib/active_record/connection_adapters/sqlserver/schema_statements.rb
@@ -291,7 +291,7 @@ def check_constraints(table_name)
         end
 
         def type_to_sql(type, limit: nil, precision: nil, scale: nil, **)
-          type_limitable = %w(string integer float char nchar varchar nvarchar).include?(type.to_s)
+          type_limitable = %w(string integer float char nchar varchar nvarchar binary_basic).include?(type.to_s)
           limit = nil unless type_limitable
 
           case type.to_s

diff --git a/test/cases/schema_dumper_test_sqlserver.rb b/test/cases/schema_dumper_test_sqlserver.rb
@@ -93,39 +93,41 @@ class SchemaDumperTestSQLServer < ActiveRecord::TestCase
     assert_line :binary_col,                 type: "binary"
 
     # Our type methods.
-    _(columns["real_col"].sql_type).must_equal          "real"
-    _(columns["money_col"].sql_type).must_equal         "money"
-    _(columns["smalldatetime_col"].sql_type).must_equal "smalldatetime"
-    _(columns["datetime2_col"].sql_type).must_equal     "datetime2(7)"
-    _(columns["datetimeoffset"].sql_type).must_equal    "datetimeoffset(7)"
-    _(columns["smallmoney_col"].sql_type).must_equal    "smallmoney"
-    _(columns["char_col"].sql_type).must_equal          "char(1)"
-    _(columns["varchar_col"].sql_type).must_equal       "varchar(8000)"
-    _(columns["text_basic_col"].sql_type).must_equal    "text"
-    _(columns["nchar_col"].sql_type).must_equal         "nchar(1)"
-    _(columns["ntext_col"].sql_type).must_equal         "ntext"
-    _(columns["binary_basic_col"].sql_type).must_equal  "binary(1)"
-    _(columns["varbinary_col"].sql_type).must_equal     "varbinary(8000)"
-    _(columns["uuid_col"].sql_type).must_equal          "uniqueidentifier"
-    _(columns["sstimestamp_col"].sql_type).must_equal   "timestamp"
-    _(columns["json_col"].sql_type).must_equal          "nvarchar(max)"
-
-    assert_line :real_col,          type: "real"
-    assert_line :money_col,         type: "money",                      precision: 19,  scale: 4
-    assert_line :smalldatetime_col, type: "smalldatetime"
-    assert_line :datetime2_col,     type: "datetime",                   precision: 7
-    assert_line :datetimeoffset,    type: "datetimeoffset",             precision: 7
-    assert_line :smallmoney_col,    type: "smallmoney",                 precision: 10,  scale: 4
-    assert_line :char_col,          type: "char",           limit: 1
-    assert_line :varchar_col,       type: "varchar"
-    assert_line :text_basic_col,    type: "text_basic"
-    assert_line :nchar_col,         type: "nchar",          limit: 1
-    assert_line :ntext_col,         type: "ntext"
-    assert_line :binary_basic_col,  type: "binary_basic",   limit: 1
-    assert_line :varbinary_col,     type: "varbinary"
-    assert_line :uuid_col,          type: "uuid"
-    assert_line :sstimestamp_col,   type: "ss_timestamp",                                           null: false
-    assert_line :json_col,          type: "text"
+    _(columns["real_col"].sql_type).must_equal            "real"
+    _(columns["money_col"].sql_type).must_equal           "money"
+    _(columns["smalldatetime_col"].sql_type).must_equal   "smalldatetime"
+    _(columns["datetime2_col"].sql_type).must_equal       "datetime2(7)"
+    _(columns["datetimeoffset"].sql_type).must_equal      "datetimeoffset(7)"
+    _(columns["smallmoney_col"].sql_type).must_equal      "smallmoney"
+    _(columns["char_col"].sql_type).must_equal            "char(1)"
+    _(columns["varchar_col"].sql_type).must_equal         "varchar(8000)"
+    _(columns["text_basic_col"].sql_type).must_equal      "text"
+    _(columns["nchar_col"].sql_type).must_equal           "nchar(1)"
+    _(columns["ntext_col"].sql_type).must_equal           "ntext"
+    _(columns["binary_basic_col"].sql_type).must_equal    "binary(1)"
+    _(columns["binary_basic_16_col"].sql_type).must_equal "binary(16)"
+    _(columns["varbinary_col"].sql_type).must_equal       "varbinary(8000)"
+    _(columns["uuid_col"].sql_type).must_equal            "uniqueidentifier"
+    _(columns["sstimestamp_col"].sql_type).must_equal     "timestamp"
+    _(columns["json_col"].sql_type).must_equal            "nvarchar(max)"
+
+    assert_line :real_col,            type: "real"
+    assert_line :money_col,           type: "money",                      precision: 19,  scale: 4
+    assert_line :smalldatetime_col,   type: "smalldatetime"
+    assert_line :datetime2_col,       type: "datetime",                   precision: 7
+    assert_line :datetimeoffset,      type: "datetimeoffset",             precision: 7
+    assert_line :smallmoney_col,      type: "smallmoney",                 precision: 10,  scale: 4
+    assert_line :char_col,            type: "char",           limit: 1
+    assert_line :varchar_col,         type: "varchar"
+    assert_line :text_basic_col,      type: "text_basic"
+    assert_line :nchar_col,           type: "nchar",          limit: 1
+    assert_line :ntext_col,           type: "ntext"
+    assert_line :binary_basic_col,    type: "binary_basic",   limit: 1
+    assert_line :binary_basic_16_col, type: "binary_basic",   limit: 16
+    assert_line :varbinary_col,       type: "varbinary"
+    assert_line :uuid_col,            type: "uuid"
+    assert_line :sstimestamp_col,     type: "ss_timestamp",                                           null: false
+    assert_line :json_col,            type: "text"
   end
 
   it "dump column collation" do

diff --git a/test/schema/sqlserver_specific_schema.rb b/test/schema/sqlserver_specific_schema.rb
@@ -33,6 +33,7 @@
     t.nchar          :nchar_col
     t.ntext          :ntext_col
     t.binary_basic   :binary_basic_col
+    t.binary_basic   :binary_basic_16_col, limit: 16
     t.varbinary      :varbinary_col
     t.uuid           :uuid_col
     t.ss_timestamp   :sstimestamp_col