aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-06-28 05:30:46 -0700
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-06-28 05:30:46 -0700
commite70ac2ae6580255507c3117a903cec0100eaa18a (patch)
treec322760b84222c1bb5aa77b44b355364389b40ab /activerecord
parent3dc753fa51fef19663b3d666211cdaccd5de010f (diff)
parent88de905ce2c73ebab0165fffddbd1dc5b5d5f9af (diff)
downloadrails-e70ac2ae6580255507c3117a903cec0100eaa18a.tar.gz
rails-e70ac2ae6580255507c3117a903cec0100eaa18a.tar.bz2
rails-e70ac2ae6580255507c3117a903cec0100eaa18a.zip
Merge pull request #6890 from yahonda/address_test_setting_time_attribute_oracle
Skip test_setting_time_attribute for Oracle database
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/test/cases/attribute_methods_test.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/activerecord/test/cases/attribute_methods_test.rb b/activerecord/test/cases/attribute_methods_test.rb
index 6c5a968454..ae24c2c655 100644
--- a/activerecord/test/cases/attribute_methods_test.rb
+++ b/activerecord/test/cases/attribute_methods_test.rb
@@ -792,6 +792,8 @@ class AttributeMethodsTest < ActiveRecord::TestCase
end
def test_setting_time_attribute
+ return skip "Oracle does not have TIME data type" if current_adapter? :OracleAdapter
+
topic = Topic.new( "bonus_time(4i)"=> "01", "bonus_time(5i)" => "05" )
assert_equal 1, topic.bonus_time.hour
assert_equal 5, topic.bonus_time.min