postgres_ext 0.0.10 → 0.1.0

data/Gemfile

@@ -2,3 +2,11 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in postgres_ext.gemspec
 gemspec
+unless ENV['CI']
+  if RUBY_PLATFORM =~ /java/
+    gem 'ruby-debug'
+  elsif RUBY_VERSION == '1.9.3'
+    gem 'debugger', '~> 1.1.2'
+  end
+end
+gem 'fivemat'

data/lib/postgres_ext/active_record/connection_adapters/postgres_adapter.rb

@@ -11,6 +11,7 @@ module ActiveRecord
     class PostgreSQLColumn
       include PgArrayParser
       attr_accessor :array
+
       def initialize_with_extended_types(name, default, sql_type = nil, null = true)
         if sql_type =~ /\[\]$/
           @array = true
@@ -21,6 +22,7 @@ module ActiveRecord
         end
       end
       alias_method_chain :initialize, :extended_types
+
       def klass_with_extended_types
         case type
         when :inet, :cidr   then IPAddr
@@ -29,6 +31,7 @@ module ActiveRecord
         end
       end
       alias_method_chain :klass, :extended_types
+
       def type_cast_with_extended_types(value)
         return nil if value.nil?
         return coder.load(value) if encoded?
@@ -47,6 +50,7 @@ module ActiveRecord
         end
       end
       alias_method_chain :type_cast, :extended_types
+
       def string_to_array(value)
         if Array === value
           value
@@ -119,22 +123,14 @@ module ActiveRecord
     end
 
     class PostgreSQLAdapter
+      class UnsupportedFeature < Exception; end
+
       EXTENDED_TYPES = {:inet => {:name => 'inet'}, :cidr => {:name => 'cidr'}, :macaddr => {:name => 'macaddr'}, :uuid => {:name => 'uuid'}}
+
       class ColumnDefinition < ActiveRecord::ConnectionAdapters::ColumnDefinition
         attr_accessor :array
       end
 
-      # Translate from the current database encoding to the encoding we
-      # will force string array components into on retrievial.
-      def encoding_for_ruby
-        @database_encoding ||= case ActiveRecord::Base.connection.encoding
-                               when 'UTF8'
-                                 'UTF-8'
-                               else
-                                 ActiveRecord::Base.connection.encoding
-                               end
-      end
-
       class TableDefinition
         EXTENDED_TYPES.keys.map(&:to_s).each do |column_type|
           class_eval <<-EOV, __FILE__, __LINE__ + 1
@@ -157,6 +153,7 @@ module ActiveRecord
         end
 
         private
+
         def new_column_definition(base, name, type)
           definition = ColumnDefinition.new base, name, type
           @columns << definition
@@ -192,6 +189,21 @@ module ActiveRecord
 
       NATIVE_DATABASE_TYPES.merge!(EXTENDED_TYPES)
 
+      # Translate from the current database encoding to the encoding we
+      # will force string array components into on retrievial.
+      def encoding_for_ruby
+        @database_encoding ||= case ActiveRecord::Base.connection.encoding
+                               when 'UTF8'
+                                 'UTF-8'
+                               else
+                                 ActiveRecord::Base.connection.encoding
+                               end
+      end
+
+      def supports_extensions?
+        postgresql_version > 90100
+      end
+
       def add_column_options!(sql, options)
         if options[:array] || options[:column].try(:array)
           sql << '[]'
@@ -210,7 +222,8 @@ module ActiveRecord
       end
 
       def add_extension(extension_name, options={})
-        execute "CREATE extension if not exists \"#{extension_name}\""
+        raise UnsupportedFeature.new('Extensions are not support by this version of PostgreSQL') unless supports_extensions?
+        execute "CREATE extension IF NOT EXISTS \"#{extension_name}\""
       end
 
       def change_table(table_name, options = {})

data/lib/postgres_ext/active_record/schema_dumper.rb

@@ -10,7 +10,7 @@ module ActiveRecord
     def dump(stream)
       header(stream)
       # added
-      extensions(stream)
+      extensions(stream) if @connection.supports_extensions?
       # /added
       tables(stream)
       trailer(stream)
@@ -20,7 +20,7 @@ module ActiveRecord
     private
 
     def extensions(stream)
-      exts=@connection.extensions
+      exts = @connection.extensions
 
       unless exts.empty?
         stream.puts exts.map { |name| "  add_extension \"#{name}\""}.join("\n") + "\n\n"
@@ -119,7 +119,7 @@ module ActiveRecord
           # changed from rails 2.3
           statement_parts << (':where => ' + index.where.inspect) if index.where
           statement_parts << (':index_type => ' + index.index_type.inspect) if index.index_type
-          statement_parts << (':index_opclass => ' + index.index_opclass.inspect) if index.index_opclass
+          statement_parts << (':index_opclass => ' + index.index_opclass.inspect) if index.index_opclass.present?
           # /changed
 
           '  ' + statement_parts.join(', ')

data/lib/postgres_ext/version.rb

@@ -1,3 +1,3 @@
 module PostgresExt
-  VERSION = '0.0.10'
+  VERSION = '0.1.0'
 end

data/postgres_ext.gemspec

@@ -26,12 +26,4 @@ Gem::Specification.new do |gem|
   else
     gem.add_development_dependency 'pg', '~> 0.13.2'
   end
-  unless ENV['CI']
-    if RUBY_PLATFORM =~ /java/
-      gem.add_development_dependency 'ruby-debug'
-    elsif RUBY_VERSION == '1.9.3'
-      gem.add_development_dependency 'debugger', '~> 1.1.2'
-    end
-  end
-  gem.add_development_dependency 'fivemat'
 end

data/spec/migrations/index_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'index migrations' do
+describe 'Index migrations' do
   let!(:connection) { ActiveRecord::Base.connection }
 
   before do
@@ -35,7 +35,7 @@ describe 'index migrations' do
     index_2.where.should            match /col2 > 50/
   end
 
-  it 'creates indexes with operator classes' do
+  it 'creates indexes with operator classes', :if => ActiveRecord::Base.connection.supports_extensions? do
     lambda do
       connection.add_index(:index_types, :col3, :index_type => :gin, :index_opclass => :gin_trgm_ops)
     end.should_not raise_exception

data/spec/schema_dumper/extension_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'extension schema dump' do
+describe 'extension schema dump', :if => ActiveRecord::Base.connection.supports_extensions? do
   let!(:connection) { ActiveRecord::Base.connection }
   it 'correctly creates and exports database extensions' do
     stream = StringIO.new

data/spec/schema_dumper/index_spec.rb

@@ -22,6 +22,7 @@ describe 'Index schema dumper' do
 
     output.should match /:index_type => :gin/
     output.should_not match /:index_type => :btree/
+    output.should_not match /:index_opclass =>/
   end
 
   it 'handles index where clauses' do
@@ -34,7 +35,7 @@ describe 'Index schema dumper' do
     output.should match /:where => "\(col2 > 50\)"/
   end
 
-  it 'dumps index operator classes' do
+  it 'dumps index operator classes', :if => ActiveRecord::Base.connection.supports_extensions? do
     connection.add_index(:index_types, :col3, :index_type => :gin, :index_opclass => :gin_trgm_ops)
 
     stream = StringIO.new

data/spec/spec_helper.rb

@@ -12,9 +12,10 @@ ENGINE_RAILS_ROOT=File.join(File.dirname(__FILE__), '../')
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
 Dir[File.join(ENGINE_RAILS_ROOT, 'spec/support/**/*.rb')].each { |f| require f }
+require 'postgres_ext'
 
 RSpec.configure do |config|
-  config.before(:suite) { ActiveRecord::Base.connection.add_extension('pg_trgm') }
+  config.before(:suite) { ActiveRecord::Base.connection.add_extension('pg_trgm') if ActiveRecord::Base.connection.supports_extensions?}
   config.use_transactional_fixtures = false
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.mock_with :mocha

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: postgres_ext
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-16 00:00:00.000000000 Z
+date: 2012-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -107,38 +107,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.13.2
-- !ruby/object:Gem::Dependency
-  name: debugger
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.1.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.1.2
-- !ruby/object:Gem::Dependency
-  name: fivemat
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Adds missing native PostgreSQL data types to ActiveRecord
 email:
 - git@danmcclain.net
@@ -256,7 +224,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1227873910843194517
+      hash: -3677858070850987585
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -265,7 +233,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1227873910843194517
+      hash: -3677858070850987585
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23