aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2017-06-15 00:18:38 -0400
committerGitHub <noreply@github.com>2017-06-15 00:18:38 -0400
commitf2af91a7908d3474746e20781a3118379189a7aa (patch)
treef0576e5469a21163f2e929433d3e1732cb5d37a1 /activerecord
parentf4840e1c76c25a9712a8e3db97aa0d7e209d4f23 (diff)
parentb0180c910ee28efa8dd972401156062c8800707d (diff)
downloadrails-f2af91a7908d3474746e20781a3118379189a7aa.tar.gz
rails-f2af91a7908d3474746e20781a3118379189a7aa.tar.bz2
rails-f2af91a7908d3474746e20781a3118379189a7aa.zip
Merge pull request #29409 from eugeneius/skip_test_uuid_column_default
Allow `uuid_test.rb` to be loaded on all adapters
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/test/cases/adapters/postgresql/uuid_test.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/activerecord/test/cases/adapters/postgresql/uuid_test.rb b/activerecord/test/cases/adapters/postgresql/uuid_test.rb
index d124b64861..8eddd81c38 100644
--- a/activerecord/test/cases/adapters/postgresql/uuid_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/uuid_test.rb
@@ -40,7 +40,8 @@ class PostgresqlUUIDTest < ActiveRecord::PostgreSQLTestCase
drop_table "uuid_data_type"
end
- if ActiveRecord::Base.connection.supports_pgcrypto_uuid?
+ if ActiveRecord::Base.connection.respond_to?(:supports_pgcrypto_uuid?) &&
+ ActiveRecord::Base.connection.supports_pgcrypto_uuid?
def test_uuid_column_default
connection.add_column :uuid_data_type, :thingy, :uuid, null: false, default: "gen_random_uuid()"
UUIDType.reset_column_information