Skip to content

Commit 62f7a78

Browse files
committed
Remove all remaining traces of our internal columns cache.
1 parent a72f8ca commit 62f7a78

File tree

1 file changed

+0
-36
lines changed

1 file changed

+0
-36
lines changed

lib/active_record/connection_adapters/sqlserver/schema_statements.rb

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -39,32 +39,16 @@ def indexes(table_name, name = nil)
3939

4040
def columns(table_name, name = nil)
4141
return [] if table_name.blank?
42-
cache_key = unqualify_table_name(table_name)
4342
column_definitions(table_name).collect do |ci|
4443
sqlserver_options = ci.except(:name,:default_value,:type,:null).merge(:database_year=>database_year)
4544
SQLServerColumn.new ci[:name], ci[:default_value], ci[:type], ci[:null], sqlserver_options
4645
end
4746
end
4847

49-
def create_table(table_name, options = {})
50-
super
51-
remove_sqlserver_columns_cache_for(table_name)
52-
end
53-
5448
def rename_table(table_name, new_name)
5549
do_execute "EXEC sp_rename '#{table_name}', '#{new_name}'"
5650
end
5751

58-
def drop_table(table_name, options = {})
59-
super
60-
remove_sqlserver_columns_cache_for(table_name)
61-
end
62-
63-
def add_column(table_name, column_name, type, options = {})
64-
super
65-
remove_sqlserver_columns_cache_for(table_name)
66-
end
67-
6852
def remove_column(table_name, *column_names)
6953
raise ArgumentError.new("You must specify at least one column name. Example: remove_column(:people, :first_name)") if column_names.empty?
7054
column_names.flatten.each do |column_name|
@@ -73,7 +57,6 @@ def remove_column(table_name, *column_names)
7357
remove_indexes(table_name, column_name)
7458
do_execute "ALTER TABLE #{quote_table_name(table_name)} DROP COLUMN #{quote_column_name(column_name)}"
7559
end
76-
remove_sqlserver_columns_cache_for(table_name)
7760
end
7861

7962
def change_column(table_name, column_name, type, options = {})
@@ -86,23 +69,19 @@ def change_column(table_name, column_name, type, options = {})
8669
remove_default_constraint(table_name,column_name)
8770
end
8871
if options_include_default?(options)
89-
remove_sqlserver_columns_cache_for(table_name)
9072
sql_commands << "ALTER TABLE #{quote_table_name(table_name)} ADD CONSTRAINT #{default_constraint_name(table_name,column_name)} DEFAULT #{quote(options[:default])} FOR #{quote_column_name(column_name)}"
9173
end
9274
sql_commands.each { |c| do_execute(c) }
93-
remove_sqlserver_columns_cache_for(table_name)
9475
end
9576

9677
def change_column_default(table_name, column_name, default)
9778
remove_default_constraint(table_name, column_name)
9879
do_execute "ALTER TABLE #{quote_table_name(table_name)} ADD CONSTRAINT #{default_constraint_name(table_name, column_name)} DEFAULT #{quote(default)} FOR #{quote_column_name(column_name)}"
99-
remove_sqlserver_columns_cache_for(table_name)
10080
end
10181

10282
def rename_column(table_name, column_name, new_column_name)
10383
detect_column_for!(table_name,column_name)
10484
do_execute "EXEC sp_rename '#{table_name}.#{column_name}', '#{new_column_name}', 'COLUMN'"
105-
remove_sqlserver_columns_cache_for(table_name)
10685
end
10786

10887
def remove_index!(table_name, index_name)
@@ -341,21 +320,6 @@ def views_real_column_name(table_name,column_name)
341320

342321
# === SQLServer Specific (Column/View Caches) =================== #
343322

344-
def columns_cache_key(table_name)
345-
table_schema = unqualify_table_schema(table_name)
346-
table_name = unqualify_table_name(table_name)
347-
if table_schema
348-
"#{table_schema}.#{table_name}"
349-
else
350-
table_name
351-
end
352-
end
353-
354-
def remove_sqlserver_columns_cache_for(table_name)
355-
cache_key = unqualify_table_name(table_name)
356-
initialize_sqlserver_caches(false)
357-
end
358-
359323
def initialize_sqlserver_caches(reset_columns=true)
360324
@sqlserver_views_cache = nil
361325
@sqlserver_view_information_cache = {}

0 commit comments

Comments
 (0)