postgres_ext 0.1.0 → 0.2.0

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

@@ -2,11 +2,9 @@ class CreatePeople < ActiveRecord::Migration
   def change
     create_table :people do |t|
       t.inet :ip
-      t.cidr :subnet, :subnet2
-      t.integer :arrayzerd, :array => true
-      t.inet :inet_arrayzerd, :array => true
-      t.string :str_arrayzerd, :array => true, :limit => 5
-      t.string :test
+      t.cidr :subnet
+      t.inet :tag_ids, :array => true
+      t.string :tags, :array => true
 
       t.timestamps
     end

data/spec/dummy/db/schema.rb

@@ -14,17 +14,21 @@
 ActiveRecord::Schema.define(:version => 20120501163758) do
 
   add_extension "hstore"
+  add_extension "pg_trgm"
+  add_extension "citext"
 
   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
+    t.inet     "tag_ids",                    :array => true
+    t.string   "tags",                       :array => true
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "sanity_tests", :force => true do |t|
+    t.string  "tags",    :array => true
+    t.integer "tag_ids", :array => true
   end
 
 end

data/spec/migrations/array_spec.rb

@@ -34,16 +34,32 @@ describe 'Array migrations' 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
+      context 'no default' 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)
+          columns = connection.columns(:data_types)
 
-        array_5 = columns.detect { |c| c.name == 'array_5'}
-        array_5.sql_type.should eq 'cidr[]'
+          array_5 = columns.detect { |c| c.name == 'array_5'}
+          array_5.sql_type.should eq 'cidr[]'
+        end
       end
+
+      context 'with default' do
+        it 'creates an array column' do
+          lambda do
+            connection.add_column :data_types, :array_6, :integer, :array => true, :default => []
+          end.should_not raise_exception
+
+          columns = connection.columns(:data_types)
+
+          array_6 = columns.detect { |c| c.name == 'array_6'}
+          array_6.sql_type.should eq 'integer[]'
+        end
+      end
+
     end
 
     describe 'Change table methods' do

data/spec/migrations/citext_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+describe 'CITEXT migrations' do
+  let!(:connection) { ActiveRecord::Base.connection }
+  before(:all) { ActiveRecord::Base.connection.add_extension('citext') if ActiveRecord::Base.connection.supports_extensions? }
+  after { connection.drop_table :data_types }
+  it 'creates an citext column' do
+    lambda do
+      connection.create_table :data_types do |t|
+        t.citext :citext_1
+        t.citext :citext_2, :citext_3
+        t.column :citext_4, :citext
+      end
+    end.should_not raise_exception
+
+    columns = connection.columns(:data_types)
+    citext_1 = columns.detect { |c| c.name == 'citext_1'}
+    citext_2 = columns.detect { |c| c.name == 'citext_2'}
+    citext_3 = columns.detect { |c| c.name == 'citext_3'}
+    citext_4 = columns.detect { |c| c.name == 'citext_4'}
+
+    citext_1.sql_type.should eq 'citext'
+    citext_2.sql_type.should eq 'citext'
+    citext_3.sql_type.should eq 'citext'
+    citext_4.sql_type.should eq 'citext'
+  end
+end

data/spec/queries/array_queries_spec.rb

@@ -0,0 +1,57 @@
+require 'spec_helper'
+
+describe 'Array queries' do
+  let(:equality_regex) { %r{\"people\"\.\"tags\" = '\{\"working\"\}'} }
+  let(:overlap_regex)  { %r{\"people\"\.\"tag_ids\" && '\{1,2\}'} }
+  let(:any_regex)      { %r{2 = ANY\(\"people\"\.\"tag_ids\"\)} }
+  let(:all_regex)      { %r{2 = ALL\(\"people\"\.\"tag_ids\"\)} }
+
+  describe '.where(:array_column => [])' do
+    it 'returns an array string instead of IN ()' do
+      query = Person.where(:tags => ['working']).to_sql
+      query.should match equality_regex
+    end
+  end
+
+  describe '.where.overlap(:column => value)' do
+    it 'generates the appropriate where clause' do
+      query = Person.where.overlap(:tag_ids => [1,2])
+      query.to_sql.should match overlap_regex
+    end
+
+    it 'allows chaining' do
+      query = Person.where.overlap(:tag_ids => [1,2]).where(:tags => ['working']).to_sql
+
+      query.should match overlap_regex
+      query.should match equality_regex
+    end
+  end
+
+  describe '.where.any(:column => value)' do
+    it 'generates the appropriate where clause' do
+      query = Person.where.any(:tag_ids => 2)
+      query.to_sql.should match any_regex
+    end
+
+    it 'allows chaining' do
+      query = Person.where.any(:tag_ids => 2).where(:tags => ['working']).to_sql
+
+      query.should match any_regex
+      query.should match equality_regex
+    end
+  end
+
+  describe '.where.all(:column => value)' do
+    it 'generates the appropriate where clause' do
+      query = Person.where.all(:tag_ids => 2)
+      query.to_sql.should match all_regex
+    end
+
+    it 'allows chaining' do
+      query = Person.where.all(:tag_ids => 2).where(:tags => ['working']).to_sql
+
+      query.should match all_regex
+      query.should match equality_regex
+    end
+  end
+end

data/spec/queries/contains_querie_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+describe 'Contains queries' do
+  let(:contained_within_regex)        { %r{\"people\"\.\"ip\" << '127.0.0.1/24'} }
+  let(:contained_within_equals_regex) { %r{\"people\"\.\"ip\" <<= '127.0.0.1/24'} }
+  let(:contains_regex)                { %r{\"people\"\.\"ip\" >> '127.0.0.1'} }
+  let(:contains_equals_regex)         { %r{\"people\"\.\"ip\" >>= '127.0.0.1'} }
+
+  describe '.where.contained_within(:column, value)' do
+    it 'generates the appropriate where clause' do
+      query = Person.where.contained_within(:ip => '127.0.0.1/24')
+      query.to_sql.should match contained_within_regex
+    end
+  end
+
+  describe '.where.contained_within_or_equals(:column, value)' do
+    it 'generates the appropriate where clause' do
+      query = Person.where.contained_within_or_equals(:ip => '127.0.0.1/24')
+      query.to_sql.should match contained_within_equals_regex
+    end
+  end
+
+  describe '.where.contains(:column, value)' do
+    it 'generates the appropriate where clause' do
+      query = Person.where.contains(:ip => '127.0.0.1')
+      query.to_sql.should match contains_regex
+    end
+  end
+
+  describe '.where.contained_within_or_equals(:column, value)' do
+    it 'generates the appropriate where clause' do
+      query = Person.where.contains_or_equals(:ip => '127.0.0.1')
+      query.to_sql.should match contains_equals_regex
+    end
+  end
+end

data/spec/queries/sanity_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe 'Ensure that we don\'t stomp on Active Record\'s queries' do
+  let!(:adapter) { ActiveRecord::Base.connection }
+
+  before do
+    adapter.create_table :sanity_tests, :force => true do |t|
+      t.string :tags, :array => true
+      t.integer :tag_ids, :array => true
+    end
+
+    class SanityTest < ActiveRecord::Base
+      attr_accessible :tags, :tags_ids
+    end
+  end
+  describe '.where' do
+    it 'generates IN clauses for non array columns' do
+      query = SanityTest.where(:id => [1,2,3]).to_sql
+
+      query.should match /IN \(1, 2, 3\)/
+    end
+  end
+end

data/spec/schema_dumper/citext_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe 'CITEXT schema dump' do
+  let!(:connection) { ActiveRecord::Base.connection }
+  after { connection.drop_table :testings }
+  it 'correctly generates citext column statements' do
+    stream = StringIO.new
+    connection.create_table :testings do |t|
+      t.citext :citext_column
+    end
+
+    ActiveRecord::SchemaDumper.dump(connection, stream)
+    output = stream.string
+
+    output.should match /t\.citext/
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: postgres_ext
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-24 00:00:00.000000000 Z
+date: 2013-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.9.0
+        version: 2.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.9.0
+        version: 2.12.0
 - !ruby/object:Gem::Dependency
   name: bourne
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -123,10 +123,17 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- docs/indexes.md
+- docs/migrations.md
+- docs/querying.md
+- docs/type_casting.md
 - lib/postgres_ext.rb
 - 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/relation.rb
+- lib/postgres_ext/active_record/relation/predicate_builder.rb
+- lib/postgres_ext/active_record/relation/query_methods.rb
 - lib/postgres_ext/active_record/sanitization.rb
 - lib/postgres_ext/active_record/schema_dumper.rb
 - lib/postgres_ext/arel.rb
@@ -134,6 +141,7 @@ files:
 - 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
@@ -196,14 +204,19 @@ files:
 - spec/migrations/active_record_migration_spec.rb
 - spec/migrations/array_spec.rb
 - spec/migrations/cidr_spec.rb
+- spec/migrations/citext_spec.rb
 - spec/migrations/index_spec.rb
 - spec/migrations/inet_spec.rb
 - spec/migrations/macaddr_spec.rb
 - spec/migrations/uuid_spec.rb
 - spec/models/array_spec.rb
 - spec/models/inet_spec.rb
+- spec/queries/array_queries_spec.rb
+- spec/queries/contains_querie_spec.rb
+- spec/queries/sanity_spec.rb
 - spec/schema_dumper/array_spec.rb
 - spec/schema_dumper/cidr_spec.rb
+- spec/schema_dumper/citext_spec.rb
 - spec/schema_dumper/extension_spec.rb
 - spec/schema_dumper/index_spec.rb
 - spec/schema_dumper/inet_spec.rb
@@ -224,7 +237,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3677858070850987585
+      hash: -3214971167706041644
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -233,7 +246,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3677858070850987585
+      hash: -3214971167706041644
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -300,14 +313,19 @@ test_files:
 - spec/migrations/active_record_migration_spec.rb
 - spec/migrations/array_spec.rb
 - spec/migrations/cidr_spec.rb
+- spec/migrations/citext_spec.rb
 - spec/migrations/index_spec.rb
 - spec/migrations/inet_spec.rb
 - spec/migrations/macaddr_spec.rb
 - spec/migrations/uuid_spec.rb
 - spec/models/array_spec.rb
 - spec/models/inet_spec.rb
+- spec/queries/array_queries_spec.rb
+- spec/queries/contains_querie_spec.rb
+- spec/queries/sanity_spec.rb
 - spec/schema_dumper/array_spec.rb
 - spec/schema_dumper/cidr_spec.rb
+- spec/schema_dumper/citext_spec.rb
 - spec/schema_dumper/extension_spec.rb
 - spec/schema_dumper/index_spec.rb
 - spec/schema_dumper/inet_spec.rb