sequel 4.26.0 → 4.27.0

data/spec/extensions/before_after_save_spec.rb

@@ -0,0 +1,40 @@
+require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+
+describe "Sequel::Plugins::BeforeAfterSave" do
+  before do
+    @db = Sequel.mock(:numrows=>1, :fetch=>{:id=>1, :name=>'b'})
+    @c = Class.new(Sequel::Model(@db[:test]))
+    @ds = @c.dataset
+    @c.columns :id, :name
+    @c.plugin :before_after_save
+    @c.plugin :instance_hooks
+    @o = @c.new
+    @db.sqls
+  end
+
+  it "should reset modified flag before calling after hooks" do
+    a = []
+    @o.after_create_hook{@o.modified?.must_equal false; a << 1}
+    @o.after_save_hook{@o.modified?.must_equal false; a << 2}
+
+    @o.modified!
+    @o.save
+    a.must_equal [1, 2]
+
+    @o.after_save_hook{@o.modified?.must_equal false; a << 2}
+    @o.after_update_hook{@o.modified?.must_equal false; a << 3}
+    a = []
+    @o.modified!
+    @o.save
+    a.must_equal [3, 2]
+  end
+
+  it "should refresh the instance before calling after hooks" do
+    a = []
+    @o.after_create_hook{@o.values.must_equal(:id=>1, :name=>'b'); a << 1}
+    @o.after_save_hook{@o.values.must_equal(:id=>1, :name=>'b'); a << 2}
+
+    @o.save
+    a.must_equal [1, 2]
+  end
+end

data/spec/extensions/pg_json_ops_spec.rb

@@ -108,6 +108,11 @@ describe "Sequel::Postgres::JSONOp" do
     @l[@jb.array_elements_text].must_equal "jsonb_array_elements_text(j)"
   end
 
+  it "should have #strip_nulls use the json_strip_nulls function" do
+    @l[@j.strip_nulls].must_equal "json_strip_nulls(j)"
+    @l[@jb.strip_nulls].must_equal "jsonb_strip_nulls(j)"
+  end
+
   it "should have #typeof use the json_typeof function" do
     @l[@j.typeof].must_equal "json_typeof(j)"
     @l[@jb.typeof].must_equal "jsonb_typeof(j)"
@@ -173,6 +178,47 @@ describe "Sequel::Postgres::JSONOp" do
     @l[@jb.contained_by([1, 2])].must_equal "(j <@ '[1,2]'::jsonb)"
   end
 
+  it "#concat should use the || operator" do
+    @l[@jb.concat(:h1)].must_equal "(j || h1)"
+  end
+
+  it "#concat should handle hashes" do
+    @l[@jb.concat('a'=>'b')].must_equal "(j || '{\"a\":\"b\"}'::jsonb)"
+  end
+
+  it "#concat should handle arrays" do
+    @l[@jb.concat([1, 2])].must_equal "(j || '[1,2]'::jsonb)"
+  end
+
+  it "#set should use the jsonb_set function" do
+    @l[@jb.set(:a, :h)].must_equal "jsonb_set(j, a, h, true)"
+    @l[@jb.set(:a, :h, false)].must_equal "jsonb_set(j, a, h, false)"
+  end
+
+  it "#set should handle hashes" do
+    @l[@jb.set(:a, 'a'=>'b')].must_equal "jsonb_set(j, a, '{\"a\":\"b\"}'::jsonb, true)"
+  end
+
+  it "#set should handle arrays" do
+    @l[@jb.set(%w'a b', [1, 2])].must_equal "jsonb_set(j, ARRAY['a','b'], '[1,2]'::jsonb, true)"
+  end
+
+  it "#pretty should use the jsonb_pretty function" do
+    @l[@jb.pretty].must_equal "jsonb_pretty(j)"
+  end
+
+  it "#- should use the - operator" do
+    @l[@jb - 1].must_equal "(j - 1)"
+  end
+
+  it "#delete_path should use the #- operator" do
+    @l[@jb.delete_path(:a)].must_equal "(j #- a)"
+  end
+
+  it "#delete_path should handle arrays" do
+    @l[@jb.delete_path(['a'])].must_equal "(j #- ARRAY['a'])"
+  end
+
   it "#has_key? and aliases should use the ? operator" do
     @l[@jb.has_key?('a')].must_equal "(j ? 'a')"
     @l[@jb.include?('a')].must_equal "(j ? 'a')"

data/spec/extensions/schema_dumper_spec.rb

@@ -36,6 +36,17 @@ describe "Sequel::Schema::Generator dump methods" do
     g.indexes.must_equal g2.indexes
   end
 
+  it "should respect :keep_order option to primary_key" do
+    g = @g.new(@d) do
+      Integer :a
+      primary_key :c, :keep_order=>true
+    end
+    g2 = @g.new(@d) do
+      instance_eval(g.dump_columns, __FILE__, __LINE__)
+    end
+    g.columns.must_equal g2.columns
+  end
+
   it "should allow dumping indexes as separate add_index and drop_index methods" do
     g = @g.new(@d) do
       index :a
@@ -73,6 +84,9 @@ describe "Sequel::Database dump methods" do
       when :t2
         [[:c1, {:db_type=>'integer', :primary_key=>true, :allow_null=>false}],
          [:c2, {:db_type=>'numeric', :primary_key=>true, :allow_null=>false}]]
+      when :t3
+        [[:c2, {:db_type=>'varchar(20)', :allow_null=>true}],
+         [:c1, {:db_type=>'integer', :primary_key=>true, :auto_increment=>true, :allow_null=>false}]]
       when :t5
         [[:c1, {:db_type=>'blahblah', :allow_null=>true}]]
       end
@@ -96,6 +110,10 @@ describe "Sequel::Database dump methods" do
     @d.dump_table_schema(:t6).must_equal "create_table(:t6) do\n  primary_key :c1, :type=>Bignum\nend"
   end
 
+  it "should dump auto incrementing primary keys with :keep_order option if they are not first" do
+    @d.dump_table_schema(:t3).must_equal "create_table(:t3) do\n  String :c2, :size=>20\n  primary_key :c1, :keep_order=>true\nend"
+  end
+
   it "should handle foreign keys" do
     @d.meta_def(:schema){|*s| [[:c1, {:db_type=>'integer', :allow_null=>true}]]}
     @d.meta_def(:supports_foreign_key_parsing?){true}

data/spec/integration/dataset_test.rb

@@ -173,6 +173,20 @@ describe "Simple Dataset operations" do
 
   it "should fetch a single row correctly" do
     @ds.first.must_equal(:id=>1, :number=>10)
+    @ds.single_record.must_equal(:id=>1, :number=>10)
+    @ds.single_record!.must_equal(:id=>1, :number=>10)
+  end
+  
+  it "should work correctly when returning from each without iterating over the whole result set" do
+    @ds.insert(:number=>20)
+    @ds.order(:id).each{|v| break v}.must_equal(:id=>1, :number=>10)
+    @ds.reverse(:id).each{|v| break v}.must_equal(:id=>2, :number=>20)
+  end
+  
+  it "should fetch a single value correctly" do
+    @ds.get(:id).must_equal 1
+    @ds.select(:id).single_value.must_equal 1
+    @ds.select(:id).single_value!.must_equal 1
   end
   
   it "should have distinct work with limit" do

data/spec/integration/schema_test.rb

@@ -259,6 +259,12 @@ describe "Database foreign key parsing" do
     @db.create_table!(:b, :engine=>:InnoDB){Integer :e, :null=>false; Integer :f, :null=>false; Integer :g, :null=>false; foreign_key [:e, :f], :a; foreign_key [:g, :f], :a, :key=>[:d, :c]}
     @pr[:b, [[:e, :f], :a, [:pk, :b, :c]], [[:g, :f], :a, [:d, :c]]]
   end
+
+  it "should handle self-referential composite foreign and primary keys" do
+    @db.create_table!(:a, :engine=>:InnoDB){Integer :b, :null=>false; Integer :c, :null=>false; Integer :d, :null=>false; primary_key [:b, :c]; unique [:d, :b]}
+    @db.alter_table(:a){add_foreign_key [:b, :d], :a; add_foreign_key [:d, :c], :a; add_foreign_key [:c, :b], :a, :key=>[:d, :b]}
+    @pr[:a, [[:b, :d], :a, [:pk, :b, :c]], [[:c, :b], :a, [:d, :b]], [[:d, :c], :a, [:pk, :b, :c]]]
+  end
 end if DB.supports_foreign_key_parsing?
 
 describe "Database schema modifiers" do

data/spec/model/class_dataset_methods_spec.rb

@@ -110,8 +110,12 @@ describe Sequel::Model, "class dataset methods"  do
     @c.set_graph_aliases(:a=>:b).opts[:graph_aliases].must_equal(:a=>[:b, :a])
     @c.single_record.must_equal @c.load(:id=>1)
     @db.sqls.must_equal ["SELECT * FROM items LIMIT 1"]
+    @c.single_record!.must_equal @c.load(:id=>1)
+    @db.sqls.must_equal ["SELECT * FROM items"]
     @c.single_value.must_equal 1
     @db.sqls.must_equal ["SELECT * FROM items LIMIT 1"]
+    @c.single_value!.must_equal 1
+    @db.sqls.must_equal ["SELECT * FROM items"]
     @c.sum(:id).must_equal 1
     @db.sqls.must_equal ["SELECT sum(id) AS sum FROM items LIMIT 1"]
     @c.to_hash(:id, :id).must_equal(1=>1)

data/spec/model/model_spec.rb

@@ -474,7 +474,7 @@ describe Sequel::Model, ".finder" do
     @c.each_foo(3, 4){|r| a << r}
     a.must_equal [@o]
 
-    @c.get_foo(5, 6).must_equal [:id, 1]
+    @c.get_foo(5, 6).must_equal 1
 
     @db.sqls.must_equal ["SELECT * FROM items WHERE (bar = 1) ORDER BY 2", "SELECT * FROM items WHERE (bar = 3) ORDER BY 4", "SELECT * FROM items WHERE (bar = 5) ORDER BY 6 LIMIT 1"]
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequel
 version: !ruby/object:Gem::Version
-  version: 4.26.0
+  version: 4.27.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-01 00:00:00.000000000 Z
+date: 2015-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -227,6 +227,7 @@ extra_rdoc_files:
 - doc/release_notes/4.24.0.txt
 - doc/release_notes/4.25.0.txt
 - doc/release_notes/4.26.0.txt
+- doc/release_notes/4.27.0.txt
 files:
 - CHANGELOG
 - MIT-LICENSE
@@ -341,6 +342,7 @@ files:
 - doc/release_notes/4.24.0.txt
 - doc/release_notes/4.25.0.txt
 - doc/release_notes/4.26.0.txt
+- doc/release_notes/4.27.0.txt
 - doc/release_notes/4.3.0.txt
 - doc/release_notes/4.4.0.txt
 - doc/release_notes/4.5.0.txt
@@ -530,6 +532,7 @@ files:
 - lib/sequel/plugins/association_pks.rb
 - lib/sequel/plugins/association_proxies.rb
 - lib/sequel/plugins/auto_validations.rb
+- lib/sequel/plugins/before_after_save.rb
 - lib/sequel/plugins/blacklist_security.rb
 - lib/sequel/plugins/boolean_readers.rb
 - lib/sequel/plugins/caching.rb
@@ -630,6 +633,7 @@ files:
 - spec/extensions/association_pks_spec.rb
 - spec/extensions/association_proxies_spec.rb
 - spec/extensions/auto_validations_spec.rb
+- spec/extensions/before_after_save_spec.rb
 - spec/extensions/blacklist_security_spec.rb
 - spec/extensions/blank_spec.rb
 - spec/extensions/boolean_readers_spec.rb
@@ -854,3 +858,4 @@ signing_key:
 specification_version: 4
 summary: The Database Toolkit for Ruby
 test_files: []
+has_rdoc: true