Skip to content

Binary basic columns should be limitable #1249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 22, 2024
Merged

Binary basic columns should be limitable #1249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6f99ea0
Test
aidanharan Oct 17, 2024
ee3eb15
Binary basic is limitable
aidanharan Oct 22, 2024
2bd10fd
Fixed alignment
aidanharan Oct 22, 2024
ce8a2a8
Update CHANGELOG.md
aidanharan Oct 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,6 @@
- [#1228](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1228) Enable identity insert on view's base table
- [#1238](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1238) Allow INSERT statements with SELECT notation
- [#1246](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1246) 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

Please check [7-1-stable](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/blob/7-1-stable/CHANGELOG.md) for previous changes.
2 changes: 1 addition & 1 deletion lib/active_record/connection_adapters/sqlserver/schema_statements.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
68 changes: 35 additions & 33 deletions test/cases/schema_dumper_test_sqlserver.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions test/schema/sqlserver_specific_schema.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading