diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2017-10-24 18:30:47 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-24 18:30:47 -0400 |
| commit | 2c845f6b03ddf2aa233b00385d24d769a4a34fa6 (patch) | |
| tree | 6124061bdb955df20b6dbe1d766d396d0b678418 /activerecord/lib/active_record | |
| parent | 9a55eb055fe02c1b462d9df08ff199688f974f42 (diff) | |
| parent | 5cd6f1792e9710979ce53943c28b2b38dae34e98 (diff) | |
| download | rails-2c845f6b03ddf2aa233b00385d24d769a4a34fa6.tar.gz rails-2c845f6b03ddf2aa233b00385d24d769a4a34fa6.tar.bz2 rails-2c845f6b03ddf2aa233b00385d24d769a4a34fa6.zip | |
Merge pull request #30976 from yahonda/supports_extensions_always_true
`supports_extensions?` return always true since PostgreSQL 9.1
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb index e9ae861bfb..2c3c1df2a9 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb @@ -337,18 +337,12 @@ module ActiveRecord end def extension_enabled?(name) - if supports_extensions? - res = exec_query("SELECT EXISTS(SELECT * FROM pg_available_extensions WHERE name = '#{name}' AND installed_version IS NOT NULL) as enabled", "SCHEMA") - res.cast_values.first - end + res = exec_query("SELECT EXISTS(SELECT * FROM pg_available_extensions WHERE name = '#{name}' AND installed_version IS NOT NULL) as enabled", "SCHEMA") + res.cast_values.first end def extensions - if supports_extensions? - exec_query("SELECT extname FROM pg_extension", "SCHEMA").cast_values - else - super - end + exec_query("SELECT extname FROM pg_extension", "SCHEMA").cast_values end # Returns the configured supported identifier length supported by PostgreSQL |