sequel 4.44.0 → 4.45.0

data/spec/model/record_spec.rb

@@ -195,7 +195,7 @@ describe "Model#save" do
     o.changed_columns.must_equal []
   end
 
-  it "should store previous value of @new in @was_new and as well as the hash used for updating in @columns_updated until after hooks finish running" do
+  deprecated "should store previous value of @new in @was_new and as well as the hash used for updating in @columns_updated until after hooks finish running" do
     res = nil
     @c.send(:define_method, :after_save){ res = [@columns_updated, @was_new]}
     o = @c.new(:x => 1, :y => nil)
@@ -209,7 +209,9 @@ describe "Model#save" do
     o = @c.load(:id => 23,:x => 1, :y => nil)
     o[:x] = 2
     o.save
-    res.must_equal [{:x => 2, :y => nil}, nil]
+    res[0].fetch(:x).must_equal 2
+    res[0].fetch(:y).must_be_nil
+    res.fetch(1).must_be_nil
     o.after_save
     res.must_equal [nil, nil]
 
@@ -218,7 +220,8 @@ describe "Model#save" do
     o[:x] = 2
     o[:y] = 22
     o.save(:columns=>:x)
-    res.must_equal [{:x=>2},nil]
+    res[0].fetch(:x).must_equal 2
+    res.fetch(1).must_be_nil
     o.after_save
     res.must_equal [nil, nil]
   end
@@ -265,7 +268,7 @@ describe "Model#save" do
     DB.sqls.must_equal ["BEGIN", "UPDATE items SET y = NULL WHERE (id = 3)", "COMMIT"]
   end
 
-  it "should rollback if before_save returns false and raise_on_save_failure = true" do
+  deprecated "should rollback if before_save returns false and raise_on_save_failure = true" do
     o = @c.load(:id => 3, :x => 1, :y => nil)
     o.use_transactions = true
     o.raise_on_save_failure = true
@@ -287,23 +290,23 @@ describe "Model#save" do
     DB.sqls.must_equal ["BEGIN", "ROLLBACK"]
   end
 
-  it "should rollback if before_save returns false and :raise_on_failure option is true" do
+  it "should rollback if before_save calls cancel_action and :raise_on_failure option is true" do
     o = @c.load(:id => 3, :x => 1, :y => nil)
     o.use_transactions = true
     o.raise_on_save_failure = false
     def o.before_save
-      false
+      cancel_action
     end
     proc { o.save(:columns=>:y, :raise_on_failure => true) }.must_raise(Sequel::HookFailed)
     DB.sqls.must_equal ["BEGIN", "ROLLBACK"]
   end
 
-  it "should not rollback outer transactions if before_save returns false and raise_on_save_failure = false" do
+  it "should not rollback outer transactions if before_save calls cancel_action and raise_on_save_failure = false" do
     o = @c.load(:id => 3, :x => 1, :y => nil)
     o.use_transactions = true
     o.raise_on_save_failure = false
     def o.before_save
-      false
+      cancel_action
     end
     DB.transaction do
       o.save(:columns=>:y).must_be_nil
@@ -312,12 +315,12 @@ describe "Model#save" do
     DB.sqls.must_equal ["BEGIN", "BLAH", "COMMIT"]
   end
 
-  it "should rollback if before_save returns false and raise_on_save_failure = false" do
+  it "should rollback if before_save calls cancel_action and raise_on_save_failure = false" do
     o = @c.load(:id => 3, :x => 1, :y => nil)
     o.use_transactions = true
     o.raise_on_save_failure = false
     def o.before_save
-      false
+      cancel_action
     end
     o.save(:columns=>:y).must_be_nil
     DB.sqls.must_equal ["BEGIN", "ROLLBACK"]
@@ -684,7 +687,7 @@ describe "Model#save_changes" do
 
   it "should take options passed to save" do
     o = @c.new(:x => 1)
-    def o.before_validation; false; end
+    def o.before_validation; cancel_action; end
     proc{o.save_changes}.must_raise(Sequel::HookFailed)
     DB.sqls.must_equal []
     o.save_changes(:validate=>false)

data/spec/model/spec_helper.rb

@@ -11,9 +11,15 @@ gem 'minitest'
 require 'minitest/autorun'
 require 'minitest/hooks/default'
 
+require "#{File.dirname(File.dirname(__FILE__))}/deprecation_helper.rb"
+
+# SEQUEL5: Remove
+output = Sequel::Deprecation.output
+Sequel::Deprecation.output = nil
 Sequel.quote_identifiers = false
 Sequel.identifier_input_method = nil
 Sequel.identifier_output_method = nil
+Sequel::Deprecation.output = output
 
 class << Sequel::Model
   attr_writer :db_schema
@@ -30,7 +36,7 @@ class << Sequel::Model
 end
 
 Sequel::Model.use_transactions = false
-Sequel.cache_anonymous_models = false
+Sequel::Model.cache_anonymous_models = false
 
 db = Sequel.mock(:fetch=>{:id => 1, :x => 1}, :numrows=>1, :autoid=>proc{|sql| 10})
 def db.schema(*) [[:id, {:primary_key=>true}]] end

data/spec/sequel_warning.rb

@@ -2,3 +2,14 @@ if ENV['WARNING']
   require 'warning'
   Warning.ignore([:missing_ivar, :method_redefined], File.dirname(File.dirname(__FILE__)))
 end
+
+# SEQUEL5: Remove
+if RUBY_VERSION >= '2.4'
+  begin
+    require 'warning'
+  rescue LoadError
+    # nothing
+  else
+    Warning.ignore(/warning: constant Sequel::[a-zA-z:]+ is deprecated/, File.dirname(File.dirname(__FILE__)))
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequel
 version: !ruby/object:Gem::Version
-  version: 4.44.0
+  version: 4.45.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-01 00:00:00.000000000 Z
+date: 2017-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -246,6 +246,7 @@ extra_rdoc_files:
 - doc/release_notes/4.42.0.txt
 - doc/release_notes/4.43.0.txt
 - doc/release_notes/4.44.0.txt
+- doc/release_notes/4.45.0.txt
 files:
 - CHANGELOG
 - MIT-LICENSE
@@ -381,6 +382,7 @@ files:
 - doc/release_notes/4.42.0.txt
 - doc/release_notes/4.43.0.txt
 - doc/release_notes/4.44.0.txt
+- doc/release_notes/4.45.0.txt
 - doc/release_notes/4.5.0.txt
 - doc/release_notes/4.6.0.txt
 - doc/release_notes/4.7.0.txt
@@ -431,6 +433,7 @@ files:
 - lib/sequel/adapters/odbc.rb
 - lib/sequel/adapters/odbc/db2.rb
 - lib/sequel/adapters/odbc/mssql.rb
+- lib/sequel/adapters/odbc/oracle.rb
 - lib/sequel/adapters/odbc/progress.rb
 - lib/sequel/adapters/oracle.rb
 - lib/sequel/adapters/postgres.rb
@@ -493,6 +496,7 @@ files:
 - lib/sequel/dataset/sql.rb
 - lib/sequel/deprecated.rb
 - lib/sequel/exceptions.rb
+- lib/sequel/extensions/_deprecated_identifier_mangling.rb
 - lib/sequel/extensions/_model_constraint_validations.rb
 - lib/sequel/extensions/_model_pg_row.rb
 - lib/sequel/extensions/_pretty_table.rb
@@ -594,6 +598,7 @@ files:
 - lib/sequel/plugins/class_table_inheritance.rb
 - lib/sequel/plugins/column_conflicts.rb
 - lib/sequel/plugins/column_select.rb
+- lib/sequel/plugins/columns_updated.rb
 - lib/sequel/plugins/composition.rb
 - lib/sequel/plugins/constraint_validations.rb
 - lib/sequel/plugins/csv_serializer.rb
@@ -654,6 +659,7 @@ files:
 - lib/sequel/plugins/uuid.rb
 - lib/sequel/plugins/validate_associated.rb
 - lib/sequel/plugins/validation_class_methods.rb
+- lib/sequel/plugins/validation_contexts.rb
 - lib/sequel/plugins/validation_helpers.rb
 - lib/sequel/plugins/xml_serializer.rb
 - lib/sequel/sql.rb
@@ -687,6 +693,8 @@ files:
 - spec/core_extensions_spec.rb
 - spec/core_model_spec.rb
 - spec/core_spec.rb
+- spec/deprecation_helper.rb
+- spec/extensions/_deprecated_identifier_mangling_spec.rb
 - spec/extensions/accessed_columns_spec.rb
 - spec/extensions/active_model_spec.rb
 - spec/extensions/after_initialize_spec.rb
@@ -705,6 +713,7 @@ files:
 - spec/extensions/column_conflicts_spec.rb
 - spec/extensions/column_select_spec.rb
 - spec/extensions/columns_introspection_spec.rb
+- spec/extensions/columns_updated_spec.rb
 - spec/extensions/composition_spec.rb
 - spec/extensions/connection_expiration_spec.rb
 - spec/extensions/connection_validator_spec.rb
@@ -829,6 +838,7 @@ files:
 - spec/extensions/uuid_spec.rb
 - spec/extensions/validate_associated_spec.rb
 - spec/extensions/validation_class_methods_spec.rb
+- spec/extensions/validation_contexts_spec.rb
 - spec/extensions/validation_helpers_spec.rb
 - spec/extensions/xml_serializer_spec.rb
 - spec/files/bad_down_migration/001_create_alt_basic.rb
@@ -943,7 +953,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: The Database Toolkit for Ruby