postgres_ext 0.0.9 → 0.0.10

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+## 0.0.10
+
+ * Fixes parsing of number arrays when they are set from a string array - Alexey Noskov (@alno)
+ * Cleans up spec organization  - Dan McClain (@danmcclain)
+ * Adds support for index operator classes (:index_opclass) in
+migrations and schema dumps - & Dan McClain (@danmcclain)
+ * Fixes Arel Nodes created by postgres_ext  - Dan McClain (@danmcclain)
+ * Add support to schema.rb to export and import extensions - Keenan
+Brock (@kbrock)
+ * Handles PostgreSQL strings when passed in as defaults by fixing the
+quote method
+ * Documentation updates. - Dan McClain & Doug Yun (@danmcclain
+@duggieawesome)
+ * Fixes #update_column calls - Dan McClain (@danmcclain)
+
+
 ## 0.0.9
 
  * Fixes #<attribute_name>?, Adds (pending) test case for #update_column - Dan McClain (@danmcclain)

data/CONTRIBUTING.md

@@ -6,7 +6,7 @@ If you need to open a new issue you *must* provide the following:
 
 1. Version of Rails
 
-Failure to include the above mentioned requirements will result in the
+Failure to include the aforementioned requirements will result in the
 issue being closed.
 
 If you want to ensure that your issue gets fixed *fast* you should
@@ -28,8 +28,8 @@ If you'd like to submit a pull request please adhere to the following:
 8. Follow Tim Pope's [model for git commit messages](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html). This will make it 
    much easier to generate change logs and navigate through the logs
 
-Plase note that you must adhere to each of the above mentioned rules.
+Please note that you must adhere to each of the aforementioned rules.
 Failure to do so will result in an immediate closing of the pull
 request. If you update and rebase the pull request to follow the
 guidelines your pull request will be re-opened and considered for
-inclusion.
+inclusion.

data/README.md

@@ -34,12 +34,45 @@ ActiveRecord's data type handling.
  * [Querying PostgreSQL datatypes](#querying-postgresql-datatypes)
 
 ### Usage Notes
-Take care when dealing with arrays and other types that allow you to
-update their value in place. In place changes are not currently tracked
-in Rails (see [this issue](https://github.com/rails/rails/issues/6954)).
-To track changes that happen via `#<<` or other instance methods, be
-sure to call `<attribute>_will_change!` so that Active Record knows to
-persist the change.
+Avoid the use of in place operators (ie `Array#<<`). These changes are
+*not* tracked by Rails ([this issue](https://github.com/rails/rails/issues/6954))
+explains why). In place modifications also modify the default object.
+
+Assuming we have the following model:
+
+```ruby
+create_table :items do |t|
+  t.string :names, :array => true, :default => []
+end
+
+class Item < ActiveRecord::Base
+end
+```
+
+The following will modify the default value of the names attribute.
+
+```ruby
+a = Item.new
+a.names << 'foo'
+
+b = Item.new
+puts b.names
+# => ['foo']
+```
+
+The supported way of modifying `a.names`:
+
+```ruby
+a = Item.new
+a.names += 'foo'
+
+b = Item.new
+puts b.names
+# => []
+```
+
+As a result, in place operators are discouraged and will not be
+supported in postgres\_ext at this time. 
 
 ## Migration/Schema.rb support
 
@@ -188,7 +221,8 @@ predicate for the `&&` operator.
 ```ruby
 user_arel = User.arel_table
 
-User.where(user_arel[:tags].array_overlap(['one','two'])).to_sql
+# Execute the query
+User.where(user_arel[:tags].array_overlap(['one','two']))
 # => SELECT \"users\".* FROM \"users\" WHERE \"users\".\"tags\" && '{one,two}'
 ```
 
@@ -220,9 +254,9 @@ user_arel = User.arel_table
 any_tags_function = Arel::Nodes::NamedFunction.new('ANY', [user_arel[:tags]])
 predicate = Arel::Nodes::Equality.new('test', any_tags_function)
 
-User.where(predicate).to_sql
+# Execute the query
+User.where(predicate)
 #=> SELECT \"users\".* FROM \"users\" WHERE 'test' = ANY(\"users\".\"tags\")
-
 ```
 
 The ALL version of this same predicate can be generated by swap `'ANY'`
@@ -250,7 +284,8 @@ predicate for the `<<` operator.
 ```ruby
 user_arel = User.arel_table
 
-User.where(user_arel[:ip_address].contained_witin('127.0.0.1/24')).to_sql
+# Execute the query
+User.where(user_arel[:ip_address].contained_witin('127.0.0.1/24'))
 # => SELECT \"users\".* FROM \"users\" WHERE \"users\".\"ip_address\" << '127.0.0.1/24'
 ```
 
@@ -258,10 +293,12 @@ User.where(user_arel[:ip_address].contained_witin('127.0.0.1/24')).to_sql
 
 ### Index types
 
-Postgres\_ext allows you to specify an index type at index creation.
+Postgres\_ext allows you to specify index type and index operator
+class at index creation.
 
 ```ruby
 add_index :table_name, :column, :index_type => :gin
+add_index :table_name, :column, :index_type => :gin, :index_opclass => :gin_trgm_ops
 ```
 
 ### Where clauses

data/lib/postgres_ext/active_record.rb

@@ -1,2 +1,3 @@
+require 'postgres_ext/active_record/sanitization'
 require 'postgres_ext/active_record/connection_adapters'
 require 'postgres_ext/active_record/schema_dumper'

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

@@ -4,9 +4,8 @@ require 'pg_array_parser'
 
 module ActiveRecord
   module ConnectionAdapters
-    # class IndexDefinition < Struct.new(:table, :name, :unique, :columns, :lengths, :orders, :where, :index_type)
     class IndexDefinition
-      attr_accessor :index_type, :where
+      attr_accessor :index_type, :where, :index_opclass
     end
 
     class PostgreSQLColumn
@@ -205,8 +204,13 @@ module ActiveRecord
         if options.is_a? Hash
           index_type = options[:index_type] ? " USING #{options[:index_type]} " : ""
           index_options = options[:where] ? " WHERE #{options[:where]}" : ""
+          index_opclass = options[:index_opclass]
         end
-        execute "CREATE #{unique} INDEX #{quote_column_name(index_name)} ON #{quote_table_name(table_name)}#{index_type}(#{index_columns})#{index_options}"
+        execute "CREATE #{unique} INDEX #{quote_column_name(index_name)} ON #{quote_table_name(table_name)}#{index_type}(#{index_columns} #{index_opclass})#{index_options}"
+      end
+
+      def add_extension(extension_name, options={})
+        execute "CREATE extension if not exists \"#{extension_name}\""
       end
 
       def change_table(table_name, options = {})
@@ -268,15 +272,22 @@ module ActiveRecord
           "'#{type_cast(value, column)}'"
         elsif value.is_a? Array
           "'#{array_to_string(value, column, true)}'"
+        elsif column.respond_to?(:array) && column.array && value =~ /^\{.*\}$/
+          "'#{value}'"
         else
           quote_without_extended_types(value, column)
         end
       end
       alias_method_chain :quote, :extended_types
 
+      def opclasses
+        @opclasses ||= select_rows('SELECT opcname FROM pg_opclass').flatten.uniq
+      end
+
       # this is based upon rails 4 changes to include different index methods
       # Returns an array of indexes for the given table.
       def indexes(table_name, name = nil)
+        opclasses
          result = select_rows(<<-SQL, name)
            SELECT distinct i.relname, d.indisunique, d.indkey, pg_get_indexdef(d.indexrelid), t.oid
            FROM pg_class t
@@ -309,10 +320,15 @@ module ActiveRecord
           #changed from rails 3.2
           where = inddef.scan(/WHERE (.+)$/).flatten[0]
           index_type = inddef.scan(/USING (.+?) /).flatten[0].to_sym
+          if index_type
+            index_op = inddef.scan(/USING .+? \(.+? (#{opclasses.join('|')})\)/).flatten
+            index_op = index_op[0].to_sym if index_op.present?
+          end
           if column_names.present?
             index_def = IndexDefinition.new(table_name, index_name, unique, column_names, [], orders)
             index_def.where = where
             index_def.index_type = index_type if index_type && index_type != :btree
+            index_def.index_opclass = index_op if index_type && index_type != :btree && index_op
             index_def
           # else nil
           end
@@ -320,6 +336,10 @@ module ActiveRecord
         end.compact
       end
 
+      def extensions
+        select_rows('select extname from pg_extension', 'extensions').map { |row| row[0] }.delete_if {|name| name == 'plpgsql'}
+      end
+
       private
 
       def ipaddr_to_string(value)
@@ -331,25 +351,28 @@ module ActiveRecord
       end
 
       def item_to_string(value, column, encode_single_quotes = false)
-        if value.nil?
-          'NULL'
-        elsif value.is_a? String
-          value = type_cast(value, column, true).dup
+        return 'NULL' if value.nil?
+
+        casted_value = type_cast(value, column, true)
+
+        if casted_value.is_a? String
+          casted_value = casted_value.dup
           # Encode backslashes.  One backslash becomes 4 in the resulting SQL.
           # (why 4, and not 2?  Trial and error shows 4 works, 2 fails to parse.)
-          value.gsub!('\\', '\\\\\\\\')
+          casted_value.gsub!('\\', '\\\\\\\\')
           # Encode a bare " in the string as \"
-          value.gsub!('"', '\\"')
+          casted_value.gsub!('"', '\\"')
           # PostgreSQL parses the string values differently if they are quoted for
           # use in a statement, or if it will be used as part of a bound argument.
           # For directly-inserted values (UPDATE foo SET bar='{"array"}') we need to
           # escape ' as ''.  For bound arguments, do not escape them.
           if encode_single_quotes
-            value.gsub!("'", "''")
+            casted_value.gsub!("'", "''")
           end
-          "\"#{value}\""
+
+          "\"#{casted_value}\""
         else
-          type_cast(value, column, true)
+          casted_value
         end
       end
     end

data/lib/postgres_ext/active_record/sanitization.rb

@@ -0,0 +1,30 @@
+require 'active_record/sanitization'
+
+module ActiveRecord
+  module Sanitization
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+      def sanitize_sql_hash_for_assignment(attrs)
+        attrs.map do |attr, value|
+          "#{connection.quote_column_name(attr)} = #{quote_bound_value(value, attr)}"
+        end.join(', ')
+      end
+
+      def quote_bound_value(value, column = nil, c = connection)
+        if column.present? && column != c
+          record_column = self.columns.select {|col| col.name == column}.first
+          c.quote(value, record_column)
+        elsif value.respond_to?(:map) && !value.acts_like?(:string)
+          if value.respond_to?(:empty?) && value.empty?
+            c.quote(nil)
+          else
+            value.map { |v| c.quote(v) }.join(',')
+          end
+        else
+          c.quote(value)
+        end
+      end
+    end
+  end
+end

data/lib/postgres_ext/active_record/schema_dumper.rb

@@ -7,7 +7,26 @@ module ActiveRecord
       VALID_COLUMN_SPEC_KEYS
     end
 
+    def dump(stream)
+      header(stream)
+      # added
+      extensions(stream)
+      # /added
+      tables(stream)
+      trailer(stream)
+      stream
+    end
+
     private
+
+    def extensions(stream)
+      exts=@connection.extensions
+
+      unless exts.empty?
+        stream.puts exts.map { |name| "  add_extension \"#{name}\""}.join("\n") + "\n\n"
+      end
+    end
+
     def table(table, stream)
       columns = @connection.columns(table)
       begin
@@ -100,6 +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
           # /changed
 
           '  ' + statement_parts.join(', ')

data/lib/postgres_ext/arel/nodes/contained_within.rb

@@ -6,6 +6,7 @@ module Arel
     end
 
     class ArrayOverlap < Arel::Nodes::Binary
+      def operator; '&&' end
     end
   end
 end

data/lib/postgres_ext/arel/visitors.rb

@@ -1 +1 @@
-require 'postgres_ext/arel/visitors/to_sql'
+require 'postgres_ext/arel/visitors/visitor'

data/lib/postgres_ext/arel/visitors/{to_sql.rb → visitor.rb}

@@ -1,7 +1,8 @@
-require 'arel/visitors/to_sql'
+require 'arel/visitors/visitor'
 module Arel
   module Visitors
-    class ToSql
+    class Visitor
+      # We are adding our visitors to the main visitor for the time being until the right spot is found to monkey patch
       private
       def visit_Arel_Nodes_ContainedWithin o
         "#{visit o.left} << #{visit o.right}"

data/lib/postgres_ext/version.rb

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

data/spec/arel/arel_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+describe 'Don\'t stomp all over the default ActiveRecord queries' do
+  let!(:adapter) { ActiveRecord::Base.connection }
+
+  before do
+    adapter.create_table :cars, :force => true do |t|
+      t.string :make
+      t.string :model
+      t.timestamps
+    end
+
+    class Car < ActiveRecord::Base
+      attr_accessible :make, :model
+    end
+  end
+
+  after do
+    adapter.drop_table :cars
+    Object.send(:remove_const, :Car)
+  end
+
+  describe 'Where Queries' do
+    describe 'Set query' do
+      it '' do
+        Car.where('id in (?)', [1,2]).to_sql.should eq "SELECT \"cars\".* FROM \"cars\"  WHERE (id in (1,2))"
+      end
+    end
+  end
+end

data/spec/arel/array_spec.rb

@@ -32,15 +32,26 @@ describe 'Array Column Predicates' do
       arel_table.where(arel_table[:tag_ids].array_overlap([1,2])).to_sql.should match /&& '\{1,2\}'/
     end
 
+    it 'works with count (and other predicates)' do
+      arel_table = ArelArray.arel_table
+
+      ArelArray.where(arel_table[:tag_ids].array_overlap([1,2])).count.should eq 0
+    end
+
     it 'returns matched records' do
       one = ArelArray.create!(:tags => ['one'])
       two = ArelArray.create!(:tags => ['two'])
       arel_table = ArelArray.arel_table
 
-      ArelArray.where(arel_table[:tags].array_overlap(['one'])).should include(one)
-      ArelArray.where(arel_table[:tags].array_overlap(['two'])).should include(two)
-      ArelArray.where(arel_table[:tags].array_overlap(['two','one'])).should include(two)
-      ArelArray.where(arel_table[:tags].array_overlap(['two','one'])).should include(one)
+      query = arel_table.where(arel_table[:tags].array_overlap(['one'])).project(Arel.sql('*'))
+      ArelArray.find_by_sql(query.to_sql).should include(one)
+
+      query = arel_table.where(arel_table[:tags].array_overlap(['two'])).project(Arel.sql('*'))
+      ArelArray.find_by_sql(query.to_sql).should include(two)
+
+      query = arel_table.where(arel_table[:tags].array_overlap(['two','one'])).project(Arel.sql('*'))
+      ArelArray.find_by_sql(query.to_sql).should include(two)
+      ArelArray.find_by_sql(query.to_sql).should include(one)
     end
   end
 end

data/spec/dummy/db/migrate/20120501163758_create_people.rb

@@ -3,9 +3,9 @@ class CreatePeople < ActiveRecord::Migration
     create_table :people do |t|
       t.inet :ip
       t.cidr :subnet, :subnet2
-      t.integer_array :arrayzerd
-      t.inet_array :inet_arrayzerd
-      t.string_array :str_arrayzerd, :limit => 5
+      t.integer :arrayzerd, :array => true
+      t.inet :inet_arrayzerd, :array => true
+      t.string :str_arrayzerd, :array => true, :limit => 5
       t.string :test
 
       t.timestamps

data/spec/dummy/db/schema.rb

@@ -13,20 +13,18 @@
 
 ActiveRecord::Schema.define(:version => 20120501163758) do
 
-  create_table "people", :force => true do |t|
-    t.inet          "ip"
-    t.cidr          "subnet"
-    t.cidr          "subnet2"
-    t.integer_array "arrayzerd"
-    t.inet_array    "inet_arrayzerd"
-    t.string_array  "str_arrayzerd",  :limit => 5
-    t.string        "test"
-    t.datetime      "created_at",                  :null => false
-    t.datetime      "updated_at",                  :null => false
-  end
+  add_extension "hstore"
 
-  create_table "test", :id => false, :force => true do |t|
-    t.string "test_a"
+  create_table "people", :force => true do |t|
+    t.inet     "ip"
+    t.cidr     "subnet"
+    t.cidr     "subnet2"
+    t.integer  "arrayzerd",                                   :array => true
+    t.inet     "inet_arrayzerd",                              :array => true
+    t.string   "str_arrayzerd",  :limit => 5,                 :array => true
+    t.string   "test"
+    t.datetime "created_at",                  :null => false
+    t.datetime "updated_at",                  :null => false
   end
 
 end

data/spec/migrations/active_record_migration_spec.rb

@@ -1,11 +1,16 @@
 require 'spec_helper'
 
-describe 'activerecord migrations' do
+describe 'ActiveRecord Migrations' do
   let!(:connection) { ActiveRecord::Base.connection }
+  after { connection.drop_table :generic_data_types }
   it 'creates non-postgres_ext columns' do
-
     lambda do
-      DoMigration.new.up
+      connection.create_table :generic_data_types do |t|
+        t.integer :col_1
+        t.string :col_2
+        t.datetime :col_3
+      end
+      connection.add_column :generic_data_types, :col_4, :text
     end.should_not raise_exception
 
     columns = connection.columns(:generic_data_types)
@@ -22,15 +27,3 @@ describe 'activerecord migrations' do
   end
 end
 
-
-class DoMigration < ActiveRecord::Migration
-  def up
-    create_table :generic_data_types do |t|
-      t.integer :col_1
-      t.string :col_2
-      t.datetime :col_3
-    end
-    add_column :generic_data_types, :col_4, :text
-  end
-end
-

data/spec/migrations/array_spec.rb

@@ -1,47 +1,120 @@
 require 'spec_helper'
 
-describe 'array migrations' do
+describe 'Array migrations' do
   let!(:connection) { ActiveRecord::Base.connection }
-  it 'creates an cidr column' do
-    lambda do
-      connection.create_table :data_types do |t|
-        t.cidr :cidr_1, :array => true
-        t.cidr :cidr_2, :cidr_3, :array => true
-        t.column :cidr_4, :cidr, :array => true
+
+  context 'New Table' do
+    after { connection.drop_table :data_types }
+    describe 'Create table methods' do
+      it 'creates an array column' do
+        lambda do
+          connection.create_table :data_types do |t|
+            t.cidr :array_1, :array => true
+            t.cidr :array_2, :array_3, :array => true
+            t.column :array_4, :cidr, :array => true
+          end
+        end.should_not raise_exception
+
+        columns = connection.columns(:data_types)
+
+        array_1 = columns.detect { |c| c.name == 'array_1'}
+        array_2 = columns.detect { |c| c.name == 'array_2'}
+        array_3 = columns.detect { |c| c.name == 'array_3'}
+        array_4 = columns.detect { |c| c.name == 'array_4'}
+
+        array_1.sql_type.should eq 'cidr[]'
+        array_2.sql_type.should eq 'cidr[]'
+        array_3.sql_type.should eq 'cidr[]'
+        array_4.sql_type.should eq 'cidr[]'
+      end
+    end
+  end
+
+  context 'Existing Table' do
+    before { connection.create_table :data_types }
+    after  { connection.drop_table   :data_types }
+    describe 'Add Column' do
+      it 'creates an array column' do
+        lambda do
+          connection.add_column :data_types, :array_5, :cidr, :array => true
+        end.should_not raise_exception
+
+        columns = connection.columns(:data_types)
+
+        array_5 = columns.detect { |c| c.name == 'array_5'}
+        array_5.sql_type.should eq 'cidr[]'
       end
-    end.should_not raise_exception
+    end
 
-    lambda do
-      connection.add_column :data_types, :cidr_5, :cidr, :array => true
-    end.should_not raise_exception
+    describe 'Change table methods' do
+      it 'creates an array column' do
+        lambda do
+          connection.change_table :data_types do |t|
+            t.column :array_6, :cidr, :array => true
+            t.cidr :array_7, :array => true
+          end
+        end.should_not raise_exception
 
-    lambda do
-      connection.change_table :data_types do |t|
-        t.column :cidr_6, :cidr, :array => true
+        columns = connection.columns(:data_types)
+
+        array_6 = columns.detect { |c| c.name == 'array_6'}
+        array_7 = columns.detect { |c| c.name == 'array_7'}
+
+        array_6.sql_type.should eq 'cidr[]'
+        array_7.sql_type.should eq 'cidr[]'
       end
-    end.should_not raise_exception
+    end
+  end
+
+  context 'Default Values' do
+    describe 'String defaults' do
+      after { connection.drop_table :default_strings }
+      it 'creates array column with proper defaults' do
+        lambda do
+          connection.create_table :default_strings do |t|
+            t.string :names_1, :array => true, :default => []
+            t.string :names_2, :array => true, :default => '{}'
+            t.string :names_3, :array => true, :default => ['something']
+            t.string :names_4, :array => true, :default => '{something}'
+          end
+        end.should_not raise_exception
+        columns = connection.columns(:default_strings)
+
+        names_1 = columns.detect { |c| c.name == 'names_1' }
+        names_2 = columns.detect { |c| c.name == 'names_2' }
+        names_3 = columns.detect { |c| c.name == 'names_3' }
+        names_4 = columns.detect { |c| c.name == 'names_4' }
+
+        names_1.default.should eq []
+        names_2.default.should eq []
+        names_3.default.should eq ['something']
+        names_4.default.should eq ['something']
+      end
+    end
+
+    describe 'Integer defaults' do
+      after { connection.drop_table :default_integers }
+      it 'creates array column with proper defaults' do
+        lambda do
+          connection.create_table :default_integers do |t|
+            t.integer :numbers_1, :array => true, :default => []
+            t.integer :numbers_2, :array => true, :default => '{}'
+            t.integer :numbers_3, :array => true, :default => [3]
+            t.integer :numbers_4, :array => true, :default => '{4}'
+          end
+        end.should_not raise_exception
+        columns = connection.columns(:default_integers)
+
+        numbers_1 = columns.detect { |c| c.name == 'numbers_1' }
+        numbers_2 = columns.detect { |c| c.name == 'numbers_2' }
+        numbers_3 = columns.detect { |c| c.name == 'numbers_3' }
+        numbers_4 = columns.detect { |c| c.name == 'numbers_4' }
 
-    lambda do
-      connection.change_table :data_types do |t|
-        t.cidr :cidr_7, :array => true
+        numbers_1.default.should eq []
+        numbers_2.default.should eq []
+        numbers_3.default.should eq [3]
+        numbers_4.default.should eq [4]
       end
-    end.should_not raise_exception
-
-    columns = connection.columns(:data_types)
-    cidr_1 = columns.detect { |c| c.name == 'cidr_1'}
-    cidr_2 = columns.detect { |c| c.name == 'cidr_2'}
-    cidr_3 = columns.detect { |c| c.name == 'cidr_3'}
-    cidr_4 = columns.detect { |c| c.name == 'cidr_4'}
-    cidr_5 = columns.detect { |c| c.name == 'cidr_5'}
-    cidr_6 = columns.detect { |c| c.name == 'cidr_6'}
-    cidr_7 = columns.detect { |c| c.name == 'cidr_7'}
-
-    cidr_1.sql_type.should eq 'cidr[]'
-    cidr_2.sql_type.should eq 'cidr[]'
-    cidr_3.sql_type.should eq 'cidr[]'
-    cidr_4.sql_type.should eq 'cidr[]'
-    cidr_5.sql_type.should eq 'cidr[]'
-    cidr_6.sql_type.should eq 'cidr[]'
-    cidr_7.sql_type.should eq 'cidr[]'
+    end
   end
 end

data/spec/migrations/cidr_spec.rb

@@ -2,6 +2,7 @@ require 'spec_helper'
 
 describe 'CIDR migrations' do
   let!(:connection) { ActiveRecord::Base.connection }
+  after { connection.drop_table :data_types }
   it 'creates an cidr column' do
     lambda do
       connection.create_table :data_types do |t|

data/spec/migrations/index_spec.rb

@@ -2,21 +2,48 @@ require 'spec_helper'
 
 describe 'index migrations' do
   let!(:connection) { ActiveRecord::Base.connection }
+
+  before do
+    connection.create_table :index_types do |t|
+      t.integer :col1, :array => true
+      t.integer :col2
+      t.text    :col3
+    end
+  end
+
+  after { connection.drop_table :index_types }
+
   it 'creates special index' do
     lambda do
-      connection.create_table :index_types do |t|
-        t.integer :col1, :array => true
-        t.integer :col2
-      end
       connection.add_index(:index_types, :col1, :index_type => :gin)
-      connection.add_index(:index_types, :col2, :where => '(col2 > 50)')
     end.should_not raise_exception
 
     indexes = connection.indexes(:index_types)
     index_1 = indexes.detect { |c| c.columns.map(&:to_s) == ['col1']}
+
+    index_1.index_type.to_s.should  eq    'gin'
+  end
+
+  it 'creates indexes with where clauses' do
+    lambda do
+      connection.add_index(:index_types, :col2, :where => '(col2 > 50)')
+    end.should_not raise_exception
+
+    indexes = connection.indexes(:index_types)
     index_2 = indexes.detect { |c| c.columns.map(&:to_s) == ['col2']}
 
-    index_1.index_type.to_s.should eq 'gin'
-    index_2.where.should match /col2 > 50/
+    index_2.where.should            match /col2 > 50/
+  end
+
+  it 'creates indexes with operator classes' do
+    lambda do
+      connection.add_index(:index_types, :col3, :index_type => :gin, :index_opclass => :gin_trgm_ops)
+    end.should_not raise_exception
+
+    indexes = connection.indexes(:index_types)
+    index_3 = indexes.detect { |c| c.columns.map(&:to_s) == ['col3']}
+
+    index_3.index_type.should       eq    :gin
+    index_3.index_opclass.should    eq    :gin_trgm_ops
   end
 end

data/spec/migrations/inet_spec.rb

@@ -2,6 +2,7 @@ require 'spec_helper'
 
 describe 'INET migrations' do
   let!(:connection) { ActiveRecord::Base.connection }
+  after { connection.drop_table :data_types }
   it 'creates an inet column' do
     lambda do
       connection.create_table :data_types do |t|

data/spec/migrations/macaddr_spec.rb

@@ -2,6 +2,7 @@ require 'spec_helper'
 
 describe 'MACADDR migrations' do
   let!(:connection) { ActiveRecord::Base.connection }
+  after { connection.drop_table :data_types }
   it 'creates an macaddr column' do
     lambda do
       connection.create_table :data_types do |t|

data/spec/migrations/uuid_spec.rb

@@ -2,6 +2,7 @@ require 'spec_helper'
 
 describe 'UUID migrations' do
   let!(:connection) { ActiveRecord::Base.connection }
+  after { connection.drop_table :data_types }
   it 'creates an uuid column' do
     lambda do
       connection.create_table :data_types do |t|

data/spec/models/array_spec.rb

@@ -41,6 +41,18 @@ describe 'Models with array columns' do
           u.reload
           u.nick_names.should eq ['some', 'things']
         end
+
+        it 'creates a user with an int array of some values' do
+          u = User.create(:favorite_numbers => [2,3,5])
+          u.reload
+          u.favorite_numbers.should eq [2,3,5]
+        end
+
+        it 'creates a user with an int array of string values' do
+          u = User.create(:favorite_numbers => ['2','3','5'])
+          u.reload
+          u.favorite_numbers.should eq [2,3,5]
+        end
       end
     end
 
@@ -97,7 +109,6 @@ describe 'Models with array columns' do
     context '#update_column' do
       describe 'setting a value via update_column' do
         it 'returns the value set when the record is retrieved' do
-          pending #This fails, not sure where to fix this, takes different code path than #update_attribute
           user = User.create(:nick_names => [])
           user.reload
 

data/spec/schema_dumper/array_spec.rb

@@ -2,6 +2,7 @@ require 'spec_helper'
 
 describe 'array schema dump' do
   let!(:connection) { ActiveRecord::Base.connection }
+  after { connection.drop_table :testings }
   it 'correctly generates cidr column statements' do
     stream = StringIO.new
     connection.create_table :testings do |t|

data/spec/schema_dumper/cidr_spec.rb

@@ -2,6 +2,7 @@ require 'spec_helper'
 
 describe 'CIDR schema dump' do
   let!(:connection) { ActiveRecord::Base.connection }
+  after { connection.drop_table :testings }
   it 'correctly generates cidr column statements' do
     stream = StringIO.new
     connection.create_table :testings do |t|

data/spec/schema_dumper/extension_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+describe 'extension schema dump' do
+  let!(:connection) { ActiveRecord::Base.connection }
+  it 'correctly creates and exports database extensions' do
+    stream = StringIO.new
+    connection.add_extension 'hstore'
+
+    ActiveRecord::SchemaDumper.dump(connection, stream)
+    output = stream.string
+
+    output.should match /add_extension "hstore"/
+  end
+end

data/spec/schema_dumper/index_spec.rb

@@ -1,14 +1,20 @@
 require 'spec_helper'
 
-describe 'index schema dumper' do
+describe 'Index schema dumper' do
   let!(:connection) { ActiveRecord::Base.connection }
-  it 'correctly generates index statements' do
+
+  before do
     connection.create_table :index_types do |t|
       t.integer :col1, :array => true
       t.integer :col2
+      t.text    :col3
     end
+  end
+
+  after { connection.drop_table :index_types }
+
+  it 'handles index type parameters' do
     connection.add_index(:index_types, :col1, :index_type => :gin)
-    connection.add_index(:index_types, :col2, :where => '(col2 > 50)')
 
     stream = StringIO.new
     ActiveRecord::SchemaDumper.dump(connection, stream)
@@ -16,6 +22,25 @@ describe 'index schema dumper' do
 
     output.should match /:index_type => :gin/
     output.should_not match /:index_type => :btree/
+  end
+
+  it 'handles index where clauses' do
+    connection.add_index(:index_types, :col2, :where => '(col2 > 50)')
+
+    stream = StringIO.new
+    ActiveRecord::SchemaDumper.dump(connection, stream)
+    output = stream.string
+
     output.should match /:where => "\(col2 > 50\)"/
   end
+
+  it 'dumps index operator classes' do
+    connection.add_index(:index_types, :col3, :index_type => :gin, :index_opclass => :gin_trgm_ops)
+
+    stream = StringIO.new
+    ActiveRecord::SchemaDumper.dump(connection, stream)
+    output = stream.string
+
+    output.should match /:index_type => :gin,\s+:index_opclass => :gin_trgm_ops/
+  end
 end

data/spec/schema_dumper/inet_spec.rb

@@ -2,6 +2,7 @@ require 'spec_helper'
 
 describe 'INET schema dump' do
   let!(:connection) { ActiveRecord::Base.connection }
+  after { connection.drop_table :testings }
   it 'correctly generates inet column statements' do
     stream = StringIO.new
     connection.create_table :testings do |t|

data/spec/schema_dumper/macaddr_spec.rb

@@ -2,6 +2,7 @@ require 'spec_helper'
 
 describe 'MACADDR schema dump' do
   let!(:connection) { ActiveRecord::Base.connection }
+  after { connection.drop_table :testings }
   it 'correctly generates macaddr column statements' do
     stream = StringIO.new
     connection.create_table :testings do |t|

data/spec/schema_dumper/uuid_spec.rb

@@ -2,6 +2,7 @@ require 'spec_helper'
 
 describe 'UUID schema dump' do
   let!(:connection) { ActiveRecord::Base.connection }
+  after { connection.drop_table :testings }
   it 'correctly generates uuid column statements' do
     stream = StringIO.new
     connection.create_table :testings do |t|

data/spec/spec_helper.rb

@@ -5,6 +5,7 @@ require File.expand_path('../dummy/config/environment.rb',  __FILE__)
 require 'rspec/rails'
 require 'rspec/autorun'
 require 'bourne'
+require 'debugger' unless ENV['CI'] || (RUBY_PLATFORM =~ /java/)
 
 ENGINE_RAILS_ROOT=File.join(File.dirname(__FILE__), '../')
 
@@ -13,8 +14,10 @@ ENGINE_RAILS_ROOT=File.join(File.dirname(__FILE__), '../')
 Dir[File.join(ENGINE_RAILS_ROOT, 'spec/support/**/*.rb')].each { |f| require f }
 
 RSpec.configure do |config|
+  config.before(:suite) { ActiveRecord::Base.connection.add_extension('pg_trgm') }
+  config.use_transactional_fixtures = false
+  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.mock_with :mocha
-  config.use_transactional_fixtures = true
   config.backtrace_clean_patterns = [
     #/\/lib\d*\/ruby\//,
     #/bin\//,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: postgres_ext
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-12 00:00:00.000000000 Z
+date: 2012-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -159,15 +159,17 @@ files:
 - lib/postgres_ext/active_record.rb
 - lib/postgres_ext/active_record/connection_adapters.rb
 - lib/postgres_ext/active_record/connection_adapters/postgres_adapter.rb
+- lib/postgres_ext/active_record/sanitization.rb
 - lib/postgres_ext/active_record/schema_dumper.rb
 - lib/postgres_ext/arel.rb
 - lib/postgres_ext/arel/nodes.rb
 - lib/postgres_ext/arel/nodes/contained_within.rb
 - lib/postgres_ext/arel/predications.rb
 - lib/postgres_ext/arel/visitors.rb
-- lib/postgres_ext/arel/visitors/to_sql.rb
+- lib/postgres_ext/arel/visitors/visitor.rb
 - lib/postgres_ext/version.rb
 - postgres_ext.gemspec
+- spec/arel/arel_spec.rb
 - spec/arel/array_spec.rb
 - spec/arel/inet_spec.rb
 - spec/columns/array_spec.rb
@@ -234,6 +236,7 @@ files:
 - spec/models/inet_spec.rb
 - spec/schema_dumper/array_spec.rb
 - spec/schema_dumper/cidr_spec.rb
+- spec/schema_dumper/extension_spec.rb
 - spec/schema_dumper/index_spec.rb
 - spec/schema_dumper/inet_spec.rb
 - spec/schema_dumper/macaddr_spec.rb
@@ -253,7 +256,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -842218502147903775
+      hash: 1227873910843194517
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -262,7 +265,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -842218502147903775
+      hash: 1227873910843194517
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -270,6 +273,7 @@ signing_key:
 specification_version: 3
 summary: Extends ActiveRecord to handle native PostgreSQL data types
 test_files:
+- spec/arel/arel_spec.rb
 - spec/arel/array_spec.rb
 - spec/arel/inet_spec.rb
 - spec/columns/array_spec.rb
@@ -336,6 +340,7 @@ test_files:
 - spec/models/inet_spec.rb
 - spec/schema_dumper/array_spec.rb
 - spec/schema_dumper/cidr_spec.rb
+- spec/schema_dumper/extension_spec.rb
 - spec/schema_dumper/index_spec.rb
 - spec/schema_dumper/inet_spec.rb
 - spec/schema_dumper/macaddr_spec.rb