diff options
Diffstat (limited to 'activerecord/lib/active_record')
4 files changed, 7 insertions, 7 deletions
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index 10a415899b..5af24caeef 100755 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -1203,7 +1203,7 @@ module ActiveRecord #:nodoc: end def object_from_yaml(string) - return string unless String === string + return string unless string.is_a?(String) if has_yaml_encoding_header?(string) begin YAML::load(string) diff --git a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb index 9eaac85571..a2bab29b42 100755 --- a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb @@ -217,21 +217,21 @@ module ActiveRecord private def string_to_date(string) - return string if Date === string + return string if string.is_a?(Date) date_array = ParseDate.parsedate(string) # treat 0000-00-00 as nil Date.new(date_array[0], date_array[1], date_array[2]) rescue nil end def string_to_time(string) - return string if Time === string + return string if string.is_a?(Time) time_array = ParseDate.parsedate(string).compact # treat 0000-00-00 00:00:00 as nil Time.send(Base.default_timezone, *time_array) rescue nil end def string_to_dummy_time(string) - return string if Time === string + return string if string.is_a?(Time) time_array = ParseDate.parsedate(string) # pad the resulting array with dummy date information time_array[0] = 2000; time_array[1] = 1; time_array[2] = 1; diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb index 3422ebcc36..5299fe0a40 100755 --- a/activerecord/lib/active_record/fixtures.rb +++ b/activerecord/lib/active_record/fixtures.rb @@ -166,7 +166,7 @@ class Fixtures < Hash fixtures.each { |fixture| fixture.insert_fixtures } end - reset_sequences(connection, table_names) if ActiveRecord::ConnectionAdapters::PostgreSQLAdapter === connection + reset_sequences(connection, table_names) if connection.is_a?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter) return fixtures.size > 1 ? fixtures : fixtures.first ensure diff --git a/activerecord/lib/active_record/validations.rb b/activerecord/lib/active_record/validations.rb index d4f75052d3..53942d34f7 100755 --- a/activerecord/lib/active_record/validations.rb +++ b/activerecord/lib/active_record/validations.rb @@ -372,9 +372,9 @@ module ActiveRecord validations = self.class.read_inheritable_attribute(validation_method.to_s) if validations.nil? then return end validations.each do |validation| - if Symbol === validation + if validation.is_a?(Symbol) self.send(validation) - elsif String === validation + elsif validation.is_a?(String) eval(validation, binding) elsif validation_block?(validation) validation.call(self) |