sequel 4.22.0 → 4.23.0

data/spec/extensions/pg_inet_spec.rb

@@ -8,45 +8,45 @@ describe "pg_inet extension" do
   end
 
   it "should literalize IPAddr v4 instances to strings correctly" do
-    @db.literal(IPAddr.new('127.0.0.1')).should == "'127.0.0.1/32'"
-    @db.literal(IPAddr.new('127.0.0.0/8')).should == "'127.0.0.0/8'"
+    @db.literal(IPAddr.new('127.0.0.1')).must_equal "'127.0.0.1/32'"
+    @db.literal(IPAddr.new('127.0.0.0/8')).must_equal "'127.0.0.0/8'"
   end
 
   it "should literalize IPAddr v6 instances to strings correctly" do
-    @db.literal(IPAddr.new('2001:4f8:3:ba::/64')).should == "'2001:4f8:3:ba::/64'"
-    @db.literal(IPAddr.new('2001:4f8:3:ba:2e0:81ff:fe22:d1f1')).should == "'2001:4f8:3:ba:2e0:81ff:fe22:d1f1/128'"
+    @db.literal(IPAddr.new('2001:4f8:3:ba::/64')).must_equal "'2001:4f8:3:ba::/64'"
+    @db.literal(IPAddr.new('2001:4f8:3:ba:2e0:81ff:fe22:d1f1')).must_equal "'2001:4f8:3:ba:2e0:81ff:fe22:d1f1/128'"
   end unless ipv6_broken
 
   it "should not affect literalization of custom objects" do
     o = Object.new
     def o.sql_literal(ds) 'v' end
-    @db.literal(o).should == 'v'
+    @db.literal(o).must_equal 'v'
   end
 
   it "should support using IPAddr as bound variables" do
-    @db.bound_variable_arg(1, nil).should == 1
-    @db.bound_variable_arg(IPAddr.new('127.0.0.1'), nil).should == '127.0.0.1/32'
+    @db.bound_variable_arg(1, nil).must_equal 1
+    @db.bound_variable_arg(IPAddr.new('127.0.0.1'), nil).must_equal '127.0.0.1/32'
   end
 
   it "should support using IPAddr instances in array types in bound variables" do
-    @db.bound_variable_arg(Sequel.pg_array([IPAddr.new('127.0.0.1')]), nil).should == '{"127.0.0.1/32"}'
+    @db.bound_variable_arg(Sequel.pg_array([IPAddr.new('127.0.0.1')]), nil).must_equal '{"127.0.0.1/32"}'
   end
 
   it "should parse inet/cidr type from the schema correctly" do
     @db.fetch = [{:name=>'id', :db_type=>'integer'}, {:name=>'i', :db_type=>'inet'}, {:name=>'c', :db_type=>'cidr'}]
-    @db.schema(:items).map{|e| e[1][:type]}.should == [:integer, :ipaddr, :ipaddr]
+    @db.schema(:items).map{|e| e[1][:type]}.must_equal [:integer, :ipaddr, :ipaddr]
   end
 
   it "should support typecasting for the ipaddr type" do
     ip = IPAddr.new('127.0.0.1')
-    @db.typecast_value(:ipaddr, ip).should equal(ip)
-    @db.typecast_value(:ipaddr, ip.to_s).should == ip
-    proc{@db.typecast_value(:ipaddr, '')}.should raise_error(Sequel::InvalidValue)
-    proc{@db.typecast_value(:ipaddr, 1)}.should raise_error(Sequel::InvalidValue)
+    @db.typecast_value(:ipaddr, ip).must_be_same_as(ip)
+    @db.typecast_value(:ipaddr, ip.to_s).must_equal ip
+    proc{@db.typecast_value(:ipaddr, '')}.must_raise(Sequel::InvalidValue)
+    proc{@db.typecast_value(:ipaddr, 1)}.must_raise(Sequel::InvalidValue)
   end
 
   it "should return correct results for Database#schema_type_class" do
-    @db.schema_type_class(:ipaddr).should == IPAddr
-    @db.schema_type_class(:integer).should == Integer
+    @db.schema_type_class(:ipaddr).must_equal IPAddr
+    @db.schema_type_class(:integer).must_equal Integer
   end
 end

data/spec/extensions/pg_interval_spec.rb

@@ -12,65 +12,65 @@ describe "pg_interval extension" do
   end
 
   it "should literalize ActiveSupport::Duration instances to strings correctly" do
-    @db.literal(ActiveSupport::Duration.new(0, [])).should == "'0'::interval"
-    @db.literal(ActiveSupport::Duration.new(0, [[:seconds, 0]])).should == "'0'::interval"
-    @db.literal(ActiveSupport::Duration.new(0, [[:seconds, 10], [:minutes, 20], [:days, 3], [:months, 4], [:years, 6]])).should == "'6 years 4 months 3 days 20 minutes 10 seconds '::interval"
-    @db.literal(ActiveSupport::Duration.new(0, [[:seconds, -10.000001], [:minutes, -20], [:days, -3], [:months, -4], [:years, -6]])).should == "'-6 years -4 months -3 days -20 minutes -10.000001 seconds '::interval"
+    @db.literal(ActiveSupport::Duration.new(0, [])).must_equal "'0'::interval"
+    @db.literal(ActiveSupport::Duration.new(0, [[:seconds, 0]])).must_equal "'0'::interval"
+    @db.literal(ActiveSupport::Duration.new(0, [[:seconds, 10], [:minutes, 20], [:days, 3], [:months, 4], [:years, 6]])).must_equal "'6 years 4 months 3 days 20 minutes 10 seconds '::interval"
+    @db.literal(ActiveSupport::Duration.new(0, [[:seconds, -10.000001], [:minutes, -20], [:days, -3], [:months, -4], [:years, -6]])).must_equal "'-6 years -4 months -3 days -20 minutes -10.000001 seconds '::interval"
   end
 
   it "should literalize ActiveSupport::Duration instances with repeated parts correctly" do
-    @db.literal(ActiveSupport::Duration.new(0, [[:seconds, 2], [:seconds, 1]])).should == "'3 seconds '::interval"
-    @db.literal(ActiveSupport::Duration.new(0, [[:seconds, 2], [:seconds, 1], [:days, 1], [:days, 4]])).should == "'5 days 3 seconds '::interval"
+    @db.literal(ActiveSupport::Duration.new(0, [[:seconds, 2], [:seconds, 1]])).must_equal "'3 seconds '::interval"
+    @db.literal(ActiveSupport::Duration.new(0, [[:seconds, 2], [:seconds, 1], [:days, 1], [:days, 4]])).must_equal "'5 days 3 seconds '::interval"
   end
 
   it "should not affect literalization of custom objects" do
     o = Object.new
     def o.sql_literal(ds) 'v' end
-    @db.literal(o).should == 'v'
+    @db.literal(o).must_equal 'v'
   end
 
   it "should support using ActiveSupport::Duration instances as bound variables" do
-    @db.bound_variable_arg(1, nil).should == 1
-    @db.bound_variable_arg(ActiveSupport::Duration.new(0, [[:seconds, 0]]), nil).should == '0'
-    @db.bound_variable_arg(ActiveSupport::Duration.new(0, [[:seconds, -10.000001], [:minutes, -20], [:days, -3], [:months, -4], [:years, -6]]), nil).should == '-6 years -4 months -3 days -20 minutes -10.000001 seconds '
+    @db.bound_variable_arg(1, nil).must_equal 1
+    @db.bound_variable_arg(ActiveSupport::Duration.new(0, [[:seconds, 0]]), nil).must_equal '0'
+    @db.bound_variable_arg(ActiveSupport::Duration.new(0, [[:seconds, -10.000001], [:minutes, -20], [:days, -3], [:months, -4], [:years, -6]]), nil).must_equal '-6 years -4 months -3 days -20 minutes -10.000001 seconds '
   end
 
   it "should support using ActiveSupport::Duration instances in array types in bound variables" do
-    @db.bound_variable_arg(Sequel.pg_array([ActiveSupport::Duration.new(0, [[:seconds, 0]])]), nil).should == '{"0"}'
-    @db.bound_variable_arg(Sequel.pg_array([ActiveSupport::Duration.new(0, [[:seconds, -10.000001], [:minutes, -20], [:days, -3], [:months, -4], [:years, -6]])]), nil).should == '{"-6 years -4 months -3 days -20 minutes -10.000001 seconds "}'
+    @db.bound_variable_arg(Sequel.pg_array([ActiveSupport::Duration.new(0, [[:seconds, 0]])]), nil).must_equal '{"0"}'
+    @db.bound_variable_arg(Sequel.pg_array([ActiveSupport::Duration.new(0, [[:seconds, -10.000001], [:minutes, -20], [:days, -3], [:months, -4], [:years, -6]])]), nil).must_equal '{"-6 years -4 months -3 days -20 minutes -10.000001 seconds "}'
   end
 
   it "should parse interval type from the schema correctly" do
     @db.fetch = [{:name=>'id', :db_type=>'integer'}, {:name=>'i', :db_type=>'interval'}]
-    @db.schema(:items).map{|e| e[1][:type]}.should == [:integer, :interval]
+    @db.schema(:items).map{|e| e[1][:type]}.must_equal [:integer, :interval]
   end
 
   it "should support typecasting for the interval type" do
     d = ActiveSupport::Duration.new(31557600 + 2*86400*30 + 3*86400*7 + 4*86400 + 5*3600 + 6*60 + 7, [[:years, 1], [:months, 2], [:days, 25], [:seconds, 18367]])
-    @db.typecast_value(:interval, d).object_id.should == d.object_id
+    @db.typecast_value(:interval, d).object_id.must_equal d.object_id
 
-    @db.typecast_value(:interval, "1 year 2 mons 25 days 05:06:07").is_a?(ActiveSupport::Duration).should == true
-    @db.typecast_value(:interval, "1 year 2 mons 25 days 05:06:07").should == d
-    @db.typecast_value(:interval, "1 year 2 mons 25 days 05:06:07").parts.sort_by{|k,v| k.to_s}.should == d.parts.sort_by{|k,v| k.to_s}
-    @db.typecast_value(:interval, "1 year 2 mons 25 days 05:06:07.0").parts.sort_by{|k,v| k.to_s}.should == d.parts.sort_by{|k,v| k.to_s}
+    @db.typecast_value(:interval, "1 year 2 mons 25 days 05:06:07").is_a?(ActiveSupport::Duration).must_equal true
+    @db.typecast_value(:interval, "1 year 2 mons 25 days 05:06:07").must_equal d
+    @db.typecast_value(:interval, "1 year 2 mons 25 days 05:06:07").parts.sort_by{|k,v| k.to_s}.must_equal d.parts.sort_by{|k,v| k.to_s}
+    @db.typecast_value(:interval, "1 year 2 mons 25 days 05:06:07.0").parts.sort_by{|k,v| k.to_s}.must_equal d.parts.sort_by{|k,v| k.to_s}
 
-    @db.typecast_value(:interval, "1 year 2 mons 25 days 5 hours 6 mins 7 secs").is_a?(ActiveSupport::Duration).should == true
-    @db.typecast_value(:interval, "1 year 2 mons 25 days 5 hours 6 mins 7 secs").should == d
-    @db.typecast_value(:interval, "1 year 2 mons 25 days 5 hours 6 mins 7 secs").parts.sort_by{|k,v| k.to_s}.should == d.parts.sort_by{|k,v| k.to_s}
-    @db.typecast_value(:interval, "1 year 2 mons 25 days 5 hours 6 mins 7.0 secs").parts.sort_by{|k,v| k.to_s}.should == d.parts.sort_by{|k,v| k.to_s}
+    @db.typecast_value(:interval, "1 year 2 mons 25 days 5 hours 6 mins 7 secs").is_a?(ActiveSupport::Duration).must_equal true
+    @db.typecast_value(:interval, "1 year 2 mons 25 days 5 hours 6 mins 7 secs").must_equal d
+    @db.typecast_value(:interval, "1 year 2 mons 25 days 5 hours 6 mins 7 secs").parts.sort_by{|k,v| k.to_s}.must_equal d.parts.sort_by{|k,v| k.to_s}
+    @db.typecast_value(:interval, "1 year 2 mons 25 days 5 hours 6 mins 7.0 secs").parts.sort_by{|k,v| k.to_s}.must_equal d.parts.sort_by{|k,v| k.to_s}
 
     d2 = ActiveSupport::Duration.new(1, [[:seconds, 1]])
-    @db.typecast_value(:interval, 1).is_a?(ActiveSupport::Duration).should == true
-    @db.typecast_value(:interval, 1).should == d2
-    @db.typecast_value(:interval, 1).parts.sort_by{|k,v| k.to_s}.should == d2.parts.sort_by{|k,v| k.to_s}
+    @db.typecast_value(:interval, 1).is_a?(ActiveSupport::Duration).must_equal true
+    @db.typecast_value(:interval, 1).must_equal d2
+    @db.typecast_value(:interval, 1).parts.sort_by{|k,v| k.to_s}.must_equal d2.parts.sort_by{|k,v| k.to_s}
 
-    proc{@db.typecast_value(:interval, 'foo')}.should raise_error(Sequel::InvalidValue)
-    proc{@db.typecast_value(:interval, Object.new)}.should raise_error(Sequel::InvalidValue)
+    proc{@db.typecast_value(:interval, 'foo')}.must_raise(Sequel::InvalidValue)
+    proc{@db.typecast_value(:interval, Object.new)}.must_raise(Sequel::InvalidValue)
   end
 
   it "should return correct results for Database#schema_type_class" do
-    @db.schema_type_class(:interval).should == ActiveSupport::Duration
-    @db.schema_type_class(:integer).should == Integer
+    @db.schema_type_class(:interval).must_equal ActiveSupport::Duration
+    @db.schema_type_class(:integer).must_equal Integer
   end
 end
 end

data/spec/extensions/pg_json_ops_spec.rb

@@ -11,217 +11,219 @@ describe "Sequel::Postgres::JSONOp" do
   end
 
   it "should have #[] get the element" do
-    @l[@j[1]].should == "(j -> 1)"
-    @l[@j['a']].should == "(j -> 'a')"
+    @l[@j[1]].must_equal "(j -> 1)"
+    @l[@j['a']].must_equal "(j -> 'a')"
   end
 
   it "should have #[] accept an array" do
-    @l[@j[%w'a b']].should == "(j #> ARRAY['a','b'])"
-    @l[@j[Sequel.pg_array(%w'a b')]].should == "(j #> ARRAY['a','b'])"
-    @l[@j[Sequel.pg_array(:a)]].should == "(j #> a)"
+    @l[@j[%w'a b']].must_equal "(j #> ARRAY['a','b'])"
+    @l[@j[Sequel.pg_array(%w'a b')]].must_equal "(j #> ARRAY['a','b'])"
+    @l[@j[Sequel.pg_array(:a)]].must_equal "(j #> a)"
   end
 
-  it "should have #[] return a JSONOp" do
-    @l[@j[1][2]].should == "((j -> 1) -> 2)"
-    @l[@j[%w'a b'][2]].should == "((j #> ARRAY['a','b']) -> 2)"
+  it "should have #[] return an object of the same class" do
+    @l[@j[1].to_recordset].must_equal "json_to_recordset((j -> 1))"
+    @l[@j[%w'a b'][2]].must_equal "((j #> ARRAY['a','b']) -> 2)"
+    @l[@jb[1].to_recordset].must_equal "jsonb_to_recordset((j -> 1))"
+    @l[@jb[%w'a b'][2]].must_equal "((j #> ARRAY['a','b']) -> 2)"
   end
 
   it "should have #get be an alias to #[]" do
-    @l[@j.get(1)].should == "(j -> 1)"
-    @l[@j.get(%w'a b')].should == "(j #> ARRAY['a','b'])"
+    @l[@j.get(1)].must_equal "(j -> 1)"
+    @l[@j.get(%w'a b')].must_equal "(j #> ARRAY['a','b'])"
   end
 
   it "should have #get_text get the element as text" do
-    @l[@j.get_text(1)].should == "(j ->> 1)"
-    @l[@j.get_text('a')].should == "(j ->> 'a')"
+    @l[@j.get_text(1)].must_equal "(j ->> 1)"
+    @l[@j.get_text('a')].must_equal "(j ->> 'a')"
   end
 
   it "should have #get_text accept an array" do
-    @l[@j.get_text(%w'a b')].should == "(j #>> ARRAY['a','b'])"
-    @l[@j.get_text(Sequel.pg_array(%w'a b'))].should == "(j #>> ARRAY['a','b'])"
-    @l[@j.get_text(Sequel.pg_array(:a))].should == "(j #>> a)"
+    @l[@j.get_text(%w'a b')].must_equal "(j #>> ARRAY['a','b'])"
+    @l[@j.get_text(Sequel.pg_array(%w'a b'))].must_equal "(j #>> ARRAY['a','b'])"
+    @l[@j.get_text(Sequel.pg_array(:a))].must_equal "(j #>> a)"
   end
 
   it "should have #get_text return an SQL::StringExpression" do
-    @l[@j.get_text(1) + 'a'].should == "((j ->> 1) || 'a')"
-    @l[@j.get_text(%w'a b') + 'a'].should == "((j #>> ARRAY['a','b']) || 'a')"
+    @l[@j.get_text(1) + 'a'].must_equal "((j ->> 1) || 'a')"
+    @l[@j.get_text(%w'a b') + 'a'].must_equal "((j #>> ARRAY['a','b']) || 'a')"
   end
 
   it "should have #array_length use the json_array_length function" do
-    @l[@j.array_length].should == "json_array_length(j)"
-    @l[@jb.array_length].should == "jsonb_array_length(j)"
+    @l[@j.array_length].must_equal "json_array_length(j)"
+    @l[@jb.array_length].must_equal "jsonb_array_length(j)"
   end
 
   it "should have #array_length return a numeric expression" do
-    @l[@j.array_length & 1].should == "(json_array_length(j) & 1)"
-    @l[@jb.array_length & 1].should == "(jsonb_array_length(j) & 1)"
+    @l[@j.array_length & 1].must_equal "(json_array_length(j) & 1)"
+    @l[@jb.array_length & 1].must_equal "(jsonb_array_length(j) & 1)"
   end
 
   it "should have #each use the json_each function" do
-    @l[@j.each].should == "json_each(j)"
-    @l[@jb.each].should == "jsonb_each(j)"
+    @l[@j.each].must_equal "json_each(j)"
+    @l[@jb.each].must_equal "jsonb_each(j)"
   end
 
   it "should have #each_text use the json_each_text function" do
-    @l[@j.each_text].should == "json_each_text(j)"
-    @l[@jb.each_text].should == "jsonb_each_text(j)"
+    @l[@j.each_text].must_equal "json_each_text(j)"
+    @l[@jb.each_text].must_equal "jsonb_each_text(j)"
   end
 
   it "should have #extract use the json_extract_path function" do
-    @l[@j.extract('a')].should == "json_extract_path(j, 'a')"
-    @l[@j.extract('a', 'b')].should == "json_extract_path(j, 'a', 'b')"
-    @l[@jb.extract('a')].should == "jsonb_extract_path(j, 'a')"
-    @l[@jb.extract('a', 'b')].should == "jsonb_extract_path(j, 'a', 'b')"
+    @l[@j.extract('a')].must_equal "json_extract_path(j, 'a')"
+    @l[@j.extract('a', 'b')].must_equal "json_extract_path(j, 'a', 'b')"
+    @l[@jb.extract('a')].must_equal "jsonb_extract_path(j, 'a')"
+    @l[@jb.extract('a', 'b')].must_equal "jsonb_extract_path(j, 'a', 'b')"
   end
 
   it "should have #extract return a JSONOp" do
-    @l[@j.extract('a')[1]].should == "(json_extract_path(j, 'a') -> 1)"
-    @l[@jb.extract('a')[1]].should == "(jsonb_extract_path(j, 'a') -> 1)"
+    @l[@j.extract('a')[1]].must_equal "(json_extract_path(j, 'a') -> 1)"
+    @l[@jb.extract('a')[1]].must_equal "(jsonb_extract_path(j, 'a') -> 1)"
   end
 
   it "should have #extract_text use the json_extract_path_text function" do
-    @l[@j.extract_text('a')].should == "json_extract_path_text(j, 'a')"
-    @l[@j.extract_text('a', 'b')].should == "json_extract_path_text(j, 'a', 'b')"
-    @l[@jb.extract_text('a')].should == "jsonb_extract_path_text(j, 'a')"
-    @l[@jb.extract_text('a', 'b')].should == "jsonb_extract_path_text(j, 'a', 'b')"
+    @l[@j.extract_text('a')].must_equal "json_extract_path_text(j, 'a')"
+    @l[@j.extract_text('a', 'b')].must_equal "json_extract_path_text(j, 'a', 'b')"
+    @l[@jb.extract_text('a')].must_equal "jsonb_extract_path_text(j, 'a')"
+    @l[@jb.extract_text('a', 'b')].must_equal "jsonb_extract_path_text(j, 'a', 'b')"
   end
 
   it "should have #extract_text return an SQL::StringExpression" do
-    @l[@j.extract_text('a') + 'a'].should == "(json_extract_path_text(j, 'a') || 'a')"
-    @l[@jb.extract_text('a') + 'a'].should == "(jsonb_extract_path_text(j, 'a') || 'a')"
+    @l[@j.extract_text('a') + 'a'].must_equal "(json_extract_path_text(j, 'a') || 'a')"
+    @l[@jb.extract_text('a') + 'a'].must_equal "(jsonb_extract_path_text(j, 'a') || 'a')"
   end
 
   it "should have #keys use the json_object_keys function" do
-    @l[@j.keys].should == "json_object_keys(j)"
-    @l[@jb.keys].should == "jsonb_object_keys(j)"
+    @l[@j.keys].must_equal "json_object_keys(j)"
+    @l[@jb.keys].must_equal "jsonb_object_keys(j)"
   end
 
   it "should have #array_elements use the json_array_elements function" do
-    @l[@j.array_elements].should == "json_array_elements(j)"
-    @l[@jb.array_elements].should == "jsonb_array_elements(j)"
+    @l[@j.array_elements].must_equal "json_array_elements(j)"
+    @l[@jb.array_elements].must_equal "jsonb_array_elements(j)"
   end
 
   it "should have #array_elements use the json_array_elements_text function" do
-    @l[@j.array_elements_text].should == "json_array_elements_text(j)"
-    @l[@jb.array_elements_text].should == "jsonb_array_elements_text(j)"
+    @l[@j.array_elements_text].must_equal "json_array_elements_text(j)"
+    @l[@jb.array_elements_text].must_equal "jsonb_array_elements_text(j)"
   end
 
   it "should have #typeof use the json_typeof function" do
-    @l[@j.typeof].should == "json_typeof(j)"
-    @l[@jb.typeof].should == "jsonb_typeof(j)"
+    @l[@j.typeof].must_equal "json_typeof(j)"
+    @l[@jb.typeof].must_equal "jsonb_typeof(j)"
   end
 
   it "should have #to_record use the json_to_record function" do
-    @l[@j.to_record].should == "json_to_record(j)"
-    @l[@jb.to_record].should == "jsonb_to_record(j)"
+    @l[@j.to_record].must_equal "json_to_record(j)"
+    @l[@jb.to_record].must_equal "jsonb_to_record(j)"
   end
 
   it "should have #to_recordset use the json_to_recordsetfunction" do
-    @l[@j.to_recordset].should == "json_to_recordset(j)"
-    @l[@jb.to_recordset].should == "jsonb_to_recordset(j)"
+    @l[@j.to_recordset].must_equal "json_to_recordset(j)"
+    @l[@jb.to_recordset].must_equal "jsonb_to_recordset(j)"
   end
 
   it "should have #populate use the json_populate_record function" do
-    @l[@j.populate(:a)].should == "json_populate_record(a, j)"
-    @l[@jb.populate(:a)].should == "jsonb_populate_record(a, j)"
+    @l[@j.populate(:a)].must_equal "json_populate_record(a, j)"
+    @l[@jb.populate(:a)].must_equal "jsonb_populate_record(a, j)"
   end
 
   it "should have #populate_set use the json_populate_record function" do
-    @l[@j.populate_set(:a)].should == "json_populate_recordset(a, j)"
-    @l[@jb.populate_set(:a)].should == "jsonb_populate_recordset(a, j)"
+    @l[@j.populate_set(:a)].must_equal "json_populate_recordset(a, j)"
+    @l[@jb.populate_set(:a)].must_equal "jsonb_populate_recordset(a, j)"
   end
 
   it "#contain_all should use the ?& operator" do
-    @l[@jb.contain_all(:h1)].should == "(j ?& h1)"
+    @l[@jb.contain_all(:h1)].must_equal "(j ?& h1)"
   end
 
   it "#contain_all handle arrays" do
-    @l[@jb.contain_all(%w'h1')].should == "(j ?& ARRAY['h1'])"
+    @l[@jb.contain_all(%w'h1')].must_equal "(j ?& ARRAY['h1'])"
   end
 
   it "#contain_any should use the ?| operator" do
-    @l[@jb.contain_any(:h1)].should == "(j ?| h1)"
+    @l[@jb.contain_any(:h1)].must_equal "(j ?| h1)"
   end
 
   it "#contain_any should handle arrays" do
-    @l[@jb.contain_any(%w'h1')].should == "(j ?| ARRAY['h1'])"
+    @l[@jb.contain_any(%w'h1')].must_equal "(j ?| ARRAY['h1'])"
   end
 
   it "#contains should use the @> operator" do
-    @l[@jb.contains(:h1)].should == "(j @> h1)"
+    @l[@jb.contains(:h1)].must_equal "(j @> h1)"
   end
 
   it "#contains should handle hashes" do
-    @l[@jb.contains('a'=>'b')].should == "(j @> '{\"a\":\"b\"}'::jsonb)"
+    @l[@jb.contains('a'=>'b')].must_equal "(j @> '{\"a\":\"b\"}'::jsonb)"
   end
 
   it "#contains should handle arrays" do
-    @l[@jb.contains([1, 2])].should == "(j @> '[1,2]'::jsonb)"
+    @l[@jb.contains([1, 2])].must_equal "(j @> '[1,2]'::jsonb)"
   end
 
   it "#contained_by should use the <@ operator" do
-    @l[@jb.contained_by(:h1)].should == "(j <@ h1)"
+    @l[@jb.contained_by(:h1)].must_equal "(j <@ h1)"
   end
 
   it "#contained_by should handle hashes" do
-    @l[@jb.contained_by('a'=>'b')].should == "(j <@ '{\"a\":\"b\"}'::jsonb)"
+    @l[@jb.contained_by('a'=>'b')].must_equal "(j <@ '{\"a\":\"b\"}'::jsonb)"
   end
 
   it "#contained_by should handle arrays" do
-    @l[@jb.contained_by([1, 2])].should == "(j <@ '[1,2]'::jsonb)"
+    @l[@jb.contained_by([1, 2])].must_equal "(j <@ '[1,2]'::jsonb)"
   end
 
   it "#has_key? and aliases should use the ? operator" do
-    @l[@jb.has_key?('a')].should == "(j ? 'a')"
-    @l[@jb.include?('a')].should == "(j ? 'a')"
+    @l[@jb.has_key?('a')].must_equal "(j ? 'a')"
+    @l[@jb.include?('a')].must_equal "(j ? 'a')"
   end
 
   it "#pg_json should return self" do
-    @j.pg_json.should equal(@j)
-    @jb.pg_jsonb.should equal(@jb)
+    @j.pg_json.must_be_same_as(@j)
+    @jb.pg_jsonb.must_be_same_as(@jb)
   end
 
   it "Sequel.pg_json_op should return arg for JSONOp" do
-    Sequel.pg_json_op(@j).should equal(@j)
-    Sequel.pg_jsonb_op(@jb).should equal(@jb)
+    Sequel.pg_json_op(@j).must_be_same_as(@j)
+    Sequel.pg_jsonb_op(@jb).must_be_same_as(@jb)
   end
 
   it "should be able to turn expressions into json ops using pg_json" do
-    @db.literal(Sequel.qualify(:b, :a).pg_json[1]).should == "(b.a -> 1)"
-    @db.literal(Sequel.function(:a, :b).pg_json[1]).should == "(a(b) -> 1)"
-    @db.literal(Sequel.qualify(:b, :a).pg_jsonb[1]).should == "(b.a -> 1)"
-    @db.literal(Sequel.function(:a, :b).pg_jsonb[1]).should == "(a(b) -> 1)"
+    @db.literal(Sequel.qualify(:b, :a).pg_json[1]).must_equal "(b.a -> 1)"
+    @db.literal(Sequel.function(:a, :b).pg_json[1]).must_equal "(a(b) -> 1)"
+    @db.literal(Sequel.qualify(:b, :a).pg_jsonb[1]).must_equal "(b.a -> 1)"
+    @db.literal(Sequel.function(:a, :b).pg_jsonb[1]).must_equal "(a(b) -> 1)"
   end
 
   it "should be able to turn literal strings into json ops using pg_json" do
-    @db.literal(Sequel.lit('a').pg_json[1]).should == "(a -> 1)"
-    @db.literal(Sequel.lit('a').pg_jsonb[1]).should == "(a -> 1)"
+    @db.literal(Sequel.lit('a').pg_json[1]).must_equal "(a -> 1)"
+    @db.literal(Sequel.lit('a').pg_jsonb[1]).must_equal "(a -> 1)"
   end
 
   it "should be able to turn symbols into json ops using Sequel.pg_json_op" do
-    @db.literal(Sequel.pg_json_op(:a)[1]).should == "(a -> 1)"
-    @db.literal(Sequel.pg_jsonb_op(:a)[1]).should == "(a -> 1)"
+    @db.literal(Sequel.pg_json_op(:a)[1]).must_equal "(a -> 1)"
+    @db.literal(Sequel.pg_jsonb_op(:a)[1]).must_equal "(a -> 1)"
   end
 
   it "should be able to turn symbols into json ops using Sequel.pg_json" do
-    @db.literal(Sequel.pg_json(:a)[1]).should == "(a -> 1)"
-    @db.literal(Sequel.pg_jsonb(:a)[1]).should == "(a -> 1)"
-    @db.literal(Sequel.pg_jsonb(:a).contains('a'=>1)).should == "(a @> '{\"a\":1}'::jsonb)"
+    @db.literal(Sequel.pg_json(:a)[1]).must_equal "(a -> 1)"
+    @db.literal(Sequel.pg_jsonb(:a)[1]).must_equal "(a -> 1)"
+    @db.literal(Sequel.pg_jsonb(:a).contains('a'=>1)).must_equal "(a @> '{\"a\":1}'::jsonb)"
   end
 
   it "should allow transforming JSONArray instances into ArrayOp instances" do
-    @db.literal(Sequel.pg_json([1,2]).op[1]).should == "('[1,2]'::json -> 1)"
+    @db.literal(Sequel.pg_json([1,2]).op[1]).must_equal "('[1,2]'::json -> 1)"
   end
 
   it "should allow transforming JSONHash instances into ArrayOp instances" do
-    @db.literal(Sequel.pg_json('a'=>1).op['a']).should == "('{\"a\":1}'::json -> 'a')"
+    @db.literal(Sequel.pg_json('a'=>1).op['a']).must_equal "('{\"a\":1}'::json -> 'a')"
   end
 
   it "should allow transforming JSONBArray instances into ArrayOp instances" do
-    @db.literal(Sequel.pg_jsonb([1,2]).op[1]).should == "('[1,2]'::jsonb -> 1)"
+    @db.literal(Sequel.pg_jsonb([1,2]).op[1]).must_equal "('[1,2]'::jsonb -> 1)"
   end
 
   it "should allow transforming JSONBHash instances into ArrayOp instances" do
-    @db.literal(Sequel.pg_jsonb('a'=>1).op['a']).should == "('{\"a\":1}'::jsonb -> 'a')"
+    @db.literal(Sequel.pg_jsonb('a'=>1).op['a']).must_equal "('{\"a\":1}'::jsonb -> 'a')"
   end
 end