Skip to content

Commit 629cddd

Browse files
committed
Change column does not use column_name in quote. Removes Object#type warnings seen in test output.
1 parent 84f24e3 commit 629cddd

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

lib/active_record/connection_adapters/sqlserver_adapter.rb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -636,7 +636,7 @@ def change_column(table_name, column_name, type, options = {})
636636

637637
def change_column_default(table_name, column_name, default)
638638
remove_default_constraint(table_name, column_name)
639-
execute "ALTER TABLE #{table_name} ADD CONSTRAINT DF_#{table_name}_#{column_name} DEFAULT #{quote(default, column_name)} FOR #{quote_column_name(column_name)}"
639+
execute "ALTER TABLE #{quote_table_name(table_name)} ADD CONSTRAINT DF_#{table_name}_#{column_name} DEFAULT #{quote(default)} FOR #{quote_column_name(column_name)}"
640640
end
641641

642642
def rename_column(table_name, column_name, new_column_name)
@@ -760,7 +760,6 @@ def pk_and_sequence_for(table_name)
760760

761761
def remove_default_constraint(table_name, column_name)
762762
constraints = select "SELECT def.name FROM sysobjects def, syscolumns col, sysobjects tab WHERE col.cdefault = def.id AND col.name = '#{column_name}' AND tab.name = '#{table_name}' AND col.id = tab.id"
763-
764763
constraints.each do |constraint|
765764
execute "ALTER TABLE #{table_name} DROP CONSTRAINT #{constraint["name"]}"
766765
end

0 commit comments

Comments
 (0)