aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test
diff options
context:
space:
mode:
authorAaron Patterson <tenderlove@github.com>2019-01-28 12:35:47 -0800
committerGitHub <noreply@github.com>2019-01-28 12:35:47 -0800
commitc0154b5f9e27471a9b8ba7e9131eb56acd3fc588 (patch)
tree332da77c85e69290ed1bd0c36fdd6432dd7b5486 /activerecord/test
parent30f666f87ab873258b797b39f29cf852f7621bea (diff)
parentc6d7e70be4bf4c52499cc94936e89943ed3478c8 (diff)
downloadrails-c0154b5f9e27471a9b8ba7e9131eb56acd3fc588.tar.gz
rails-c0154b5f9e27471a9b8ba7e9131eb56acd3fc588.tar.bz2
rails-c0154b5f9e27471a9b8ba7e9131eb56acd3fc588.zip
Merge pull request #35062 from larskanis/native-timestamps
PostgreSQL: Use native timestamp decoders of pg-1.1
Diffstat (limited to 'activerecord/test')
-rw-r--r--activerecord/test/cases/cache_key_test.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/test/cases/cache_key_test.rb b/activerecord/test/cases/cache_key_test.rb
index 3a06b1c795..c27eb8a65d 100644
--- a/activerecord/test/cases/cache_key_test.rb
+++ b/activerecord/test/cases/cache_key_test.rb
@@ -51,7 +51,7 @@ module ActiveRecord
end
test "cache_version is the same when it comes from the DB or from the user" do
- skip("Mysql2 does not return a string value for updated_at") if current_adapter?(:Mysql2Adapter)
+ skip("Mysql2 and PostgreSQL don't return a string value for updated_at") if current_adapter?(:Mysql2Adapter, :PostgreSQLAdapter)
record = CacheMeWithVersion.create
record_from_db = CacheMeWithVersion.find(record.id)
@@ -63,7 +63,7 @@ module ActiveRecord
end
test "cache_version does not truncate zeros when timestamp ends in zeros" do
- skip("Mysql2 does not return a string value for updated_at") if current_adapter?(:Mysql2Adapter)
+ skip("Mysql2 and PostgreSQL don't return a string value for updated_at") if current_adapter?(:Mysql2Adapter, :PostgreSQLAdapter)
travel_to Time.now.beginning_of_day do
record = CacheMeWithVersion.create
@@ -84,7 +84,7 @@ module ActiveRecord
end
test "cache_version does NOT call updated_at when value is from the database" do
- skip("Mysql2 does not return a string value for updated_at") if current_adapter?(:Mysql2Adapter)
+ skip("Mysql2 and PostgreSQL don't return a string value for updated_at") if current_adapter?(:Mysql2Adapter, :PostgreSQLAdapter)
record = CacheMeWithVersion.create
record_from_db = CacheMeWithVersion.find(record.id)