From 349fc90996b6372caf5fcfdad2c26b319868b9c4 Mon Sep 17 00:00:00 2001 From: kennyj Date: Wed, 8 May 2013 02:45:35 +0900 Subject: Also support extensions in PostgreSQL 9.1, because this has been supported since 9.1. --- activerecord/CHANGELOG.md | 4 ++++ .../lib/active_record/connection_adapters/postgresql_adapter.rb | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'activerecord') diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index 772fd5999b..858c33c4e5 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -1,3 +1,7 @@ +* Also support extentions in PostgreSQL 9.1. This feature has been supported since 9.1. + + *kennyj* + * Deprecate `ConnectionAdapters::SchemaStatements#distinct`, as it is no longer used by internals. diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb index 88b09e7999..d5a603cadc 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb @@ -622,9 +622,9 @@ module ActiveRecord true end - # Returns true if pg > 9.2 + # Returns true if pg > 9.1 def supports_extensions? - postgresql_version >= 90200 + postgresql_version >= 90100 end # Range datatypes weren't introduced until PostgreSQL 9.2 @@ -646,9 +646,9 @@ module ActiveRecord 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)", + res = exec_query "SELECT EXISTS(SELECT * FROM pg_available_extensions WHERE name = '#{name}' AND installed_version IS NOT NULL) as enabled", 'SCHEMA' - res.column_types['exists'].type_cast res.rows.first.first + res.column_types['enabled'].type_cast res.rows.first.first end end -- cgit v1.2.3 From 91c4d0b1e713ee21a9078ce714faa4037df7ad57 Mon Sep 17 00:00:00 2001 From: kennyj Date: Wed, 8 May 2013 02:48:45 +0900 Subject: Remove unnecessary code, because this extension is created on demand in hstore_test.rb. --- activerecord/Rakefile | 2 -- 1 file changed, 2 deletions(-) (limited to 'activerecord') diff --git a/activerecord/Rakefile b/activerecord/Rakefile index 0523314128..cd73489cbe 100644 --- a/activerecord/Rakefile +++ b/activerecord/Rakefile @@ -125,8 +125,6 @@ namespace :postgresql do %w(arunit arunit2).each do |db| if version < "9.1.0" puts "Please prepare hstore data type. See http://www.postgresql.org/docs/9.0/static/hstore.html" - else - %x( psql #{config[db]['database']} -c "CREATE EXTENSION hstore;" ) end end end -- cgit v1.2.3