Skip to content

Commit c0ba24b

Browse files
author
Anna
committed
Fix Deprecation warning - call columns with a table name!
1 parent 5b3e2a9 commit c0ba24b

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

lib/active_record/connection_adapters/sqlserver/schema_statements.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ def columns(table_name, name = nil)
4747
def rename_table(table_name, new_name)
4848
do_execute "EXEC sp_rename '#{table_name}', '#{new_name}'"
4949
end
50-
50+
5151
def remove_column(table_name, column_name, type = nil)
5252
raise ArgumentError.new("You must specify at least one column name. Example: remove_column(:people, :first_name)") if (column_name.is_a? Array)
5353
ActiveSupport::Deprecation.warn 'Passing multiple arguments to remove_columns is deprecated, please use just one column name, like: `remove_columns(:posts, :column_name, :type)`', caller if column_name
@@ -59,7 +59,7 @@ def remove_column(table_name, column_name, type = nil)
5959

6060
def change_column(table_name, column_name, type, options = {})
6161
sql_commands = []
62-
column_object = schema_cache.columns[table_name].detect { |c| c.name.to_s == column_name.to_s }
62+
column_object = schema_cache .columns(table_name).detect { |c| c.name.to_s == column_name.to_s }
6363
change_column_sql = "ALTER TABLE #{quote_table_name(table_name)} ALTER COLUMN #{quote_column_name(column_name)} #{type_to_sql(type, options[:limit], options[:precision], options[:scale])}"
6464
change_column_sql << " NOT NULL" if options[:null] == false
6565
sql_commands << change_column_sql
@@ -279,7 +279,7 @@ def default_constraint_name(table_name, column_name)
279279
end
280280

281281
def detect_column_for!(table_name, column_name)
282-
unless column = schema_cache.columns[table_name].detect { |c| c.name == column_name.to_s }
282+
unless column = schema_cache .columns(table_name).detect { |c| c.name == column_name.to_s }
283283
raise ActiveRecordError, "No such column: #{table_name}.#{column_name}"
284284
end
285285
column
@@ -354,9 +354,9 @@ def set_identity_insert(table_name, enable = true)
354354
rescue Exception => e
355355
raise ActiveRecordError, "IDENTITY_INSERT could not be turned #{enable ? 'ON' : 'OFF'} for table #{table_name}"
356356
end
357-
357+
#TODO: DEPRECATION WARNING: call columns with a table name!. (called from identity_column at /Users/acarey/code/source/4/activerecord-sqlserver-adapter/lib/active_record/connection_adapters/sqlserver/schema_statements.rb:359)
358358
def identity_column(table_name)
359-
schema_cache.columns[table_name].detect(&:is_identity?)
359+
schema_cache.columns(table_name).detect(&:is_identity?)
360360
end
361361

362362
end

0 commit comments

Comments
 (0)