test/queries/contains_test.rb in postgres_ext-2.2.0 vs test/queries/contains_test.rb in postgres_ext-2.3.0

@@ -1,12 +1,15 @@
 require 'test_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_ip_regex)             { %r{\"people\"\.\"ip\" >> '127.0.0.1'} }
+  let(:contains_array_regex)          { %r{\"people\"\.\"tag_ids\" @> '\{1,2\}'} }
+  let(:contains_hstore_regex)         { %r{\"people\"\.\"data\" @> '\"nickname\"=>"Dan"'} }
   let(:contains_equals_regex)         { %r{\"people\"\.\"ip\" >>= '127.0.0.1'} }
+  let(:equality_regex) { %r{\"people\"\.\"tags\" = '\{\"working\"\}'} }
 
   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.must_match contained_within_regex
@@ -18,19 +21,36 @@
       query = Person.where.contained_within_or_equals(:ip => '127.0.0.1/24')
       query.to_sql.must_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.must_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.must_match contains_equals_regex
+    end
+  end
+
+  describe '.where.contains(:column => value)' do
+    it 'generates the appropriate where clause for inet columns' do
+      query = Person.where.contains(:ip => '127.0.0.1')
+      query.to_sql.must_match contains_ip_regex
+    end
+
+    it 'generates the appropriate where clause for array columns' do
+      query = Person.where.contains(:tag_ids => [1,2])
+      query.to_sql.must_match contains_array_regex
+    end
+
+    it 'generates the appropriate where clause for array columns' do
+      query = Person.where.contains(data: { nickname: 'Dan' })
+      query.to_sql.must_match contains_hstore_regex
+    end
+
+    it 'allows chaining' do
+      query = Person.where.contains(:tag_ids => [1,2]).where(:tags => ['working']).to_sql
+
+      query.must_match contains_array_regex
+      query.must_match equality_regex
     end
   end
 end