Skip to content
Browse files

Silence errors occurring when reloading classes

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@27 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent a682d20 commit ac3c8a54f83418b5cac4b093fc1bae29f59f3a1f @dhh dhh committed Nov 30, 2004
View
1 activerecord/lib/active_record.rb
@@ -25,6 +25,7 @@
$:.unshift(File.dirname(__FILE__))
require 'active_record/support/clean_logger'
+require 'active_record/support/misc'
require 'active_record/base'
require 'active_record/observer'
View
2 activerecord/lib/active_record/associations.rb
@@ -562,7 +562,7 @@ def #{method_prefix + collection_name}(attributes = nil)
def require_association_class(class_name)
begin
- require(Inflector.underscore(class_name))
+ require_or_load(Inflector.underscore(class_name))
rescue LoadError
# Failed to load the associated class -- let's hope the developer is doing the requiring himself.
end
View
4 activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
@@ -86,13 +86,13 @@ def insert_record(record)
end
def insert_record_with_join_attributes(record, join_attributes)
- attributes = { @association_class_primary_key_name => @owner.id, @association_foreign_key => record.id }.update(join_attributes)
+ attributes = { @association_class_primary_key_name => @owner.id, @association_foreign_key => record.id }.update(join_attributes)
sql =
"INSERT INTO #{@join_table} (#{@owner.send(:quoted_column_names, attributes).join(', ')}) " +
"VALUES (#{attributes.values.collect { |value| @owner.send(:quote, value) }.join(', ')})"
@owner.connection.execute(sql)
end
-
+
def delete_records(records)
if sql = @options[:delete_sql]
records.each { |record| @owner.connection.execute(sql) }
View
4 activerecord/lib/active_record/base.rb
@@ -549,7 +549,7 @@ def benchmark(title)
def require_or_load(file_name)
if !associations_loaded.include?(file_name)
associations_loaded << file_name
- reload_associations ? load("#{file_name}.rb") : require(file_name)
+ reload_associations ? silence_warnings { load("#{file_name}.rb") } : require(file_name)
end
end
@@ -1048,4 +1048,4 @@ def has_yaml_encoding_header?(string)
string[0..3] == "--- "
end
end
-end
+end
View
6 activerecord/lib/active_record/support/misc.rb
@@ -0,0 +1,6 @@
+def silence_warnings
+ old_verbose, $VERBOSE = $VERBOSE, nil
+ result = yield
+ $VERBOSE = old_verbose
+ return result
+end

0 comments on commit ac3c8a5

Please sign in to comment.
Something went wrong with that request. Please try again.