sequel 3.47.0 → 3.48.0

data/spec/model/plugins_spec.rb

@@ -168,26 +168,22 @@ describe Sequel::Model, ".plugin" do
   it "should extend the class's dataset with a DatasetMethods module if the plugin includes it" do
     @c.plugin @t
     @c.dataset.ghi.should == 345
-    @c.ghi.should == 345
   end
 
   it "should save the DatasetMethods module and apply it later if the class doesn't have a dataset" do
     c = Class.new(Sequel::Model)
     c.plugin @t
-    proc{c.ghi}.should raise_error(Sequel::Error)
     c.dataset = MODEL_DB[:i]
     c.dataset.ghi.should == 345
-    c.ghi.should == 345
   end
   
   it "should save the DatasetMethods module and apply it later if the class has a dataset" do
     @c.plugin @t
     @c.dataset = MODEL_DB[:i]
     @c.dataset.ghi.should == 345
-    @c.ghi.should == 345
   end
 
-  it "should define class methods for all public instance methods in DatasetMethod" do
+  qspecify "should define class methods for all public instance methods in DatasetMethod" do
     m = Module.new do
       self::DatasetMethods = Module.new do
         def a; 1; end
@@ -213,7 +209,6 @@ describe Sequel::Model, ".plugin" do
     @c.dataset.b.should == 2
     lambda{@c.dataset.a}.should raise_error(NoMethodError)
     @c.dataset.send(:a).should == 1
-    @c.b.should == 2
     lambda{@c.a}.should raise_error(NoMethodError)
     lambda{@c.send(:a)}.should raise_error(NoMethodError)
   end

data/spec/model/record_spec.rb

@@ -127,19 +127,25 @@ describe "Model#save" do
     proc{o.save}.should_not raise_error
   end
   
-  it "should update only the given columns if given" do
+  qspecify "should update only the given columns if given" do
     o = @c.load(:id => 3, :x => 1, :y => nil)
     o.save(:y)
     MODEL_DB.sqls.first.should == "UPDATE items SET y = NULL WHERE (id = 3)"
   end
   
+  it "should respect the :columns option to specify the columns to save" do
+    o = @c.load(:id => 3, :x => 1, :y => nil)
+    o.save(:columns=>:y)
+    MODEL_DB.sqls.first.should == "UPDATE items SET y = NULL WHERE (id = 3)"
+  end
+  
   it "should mark saved columns as not changed" do
     o = @c.load(:id => 3, :x => 1, :y => nil)
     o[:y] = 4
     o.changed_columns.should == [:y]
-    o.save(:x)
+    o.save(:columns=>:x)
     o.changed_columns.should == [:y]
-    o.save(:y)
+    o.save(:columns=>:y)
     o.changed_columns.should == []
   end
   
@@ -182,7 +188,7 @@ describe "Model#save" do
     o = @c.load(:id => 23,:x => 2, :y => nil)
     o[:x] = 2
     o[:y] = 22
-    o.save(:x)
+    o.save(:columns=>:x)
     res.should == [{:x=>2},nil]
     o.after_save
     res.should == [nil, nil]
@@ -190,19 +196,19 @@ describe "Model#save" do
   
   it "should use Model's use_transactions setting by default" do
     @c.use_transactions = true
-    @c.load(:id => 3, :x => 1, :y => nil).save(:y)
+    @c.load(:id => 3, :x => 1, :y => nil).save(:columns=>:y)
     MODEL_DB.sqls.should == ["BEGIN", "UPDATE items SET y = NULL WHERE (id = 3)", "COMMIT"]
     @c.use_transactions = false
-    @c.load(:id => 3, :x => 1, :y => nil).save(:y)
+    @c.load(:id => 3, :x => 1, :y => nil).save(:columns=>:y)
     MODEL_DB.sqls.should == ["UPDATE items SET y = NULL WHERE (id = 3)"]
   end
 
   it "should inherit Model's use_transactions setting" do
     @c.use_transactions = true
-    Class.new(@c).load(:id => 3, :x => 1, :y => nil).save(:y)
+    Class.new(@c).load(:id => 3, :x => 1, :y => nil).save(:columns=>:y)
     MODEL_DB.sqls.should == ["BEGIN", "UPDATE items SET y = NULL WHERE (id = 3)", "COMMIT"]
     @c.use_transactions = false
-    Class.new(@c).load(:id => 3, :x => 1, :y => nil).save(:y)
+    Class.new(@c).load(:id => 3, :x => 1, :y => nil).save(:columns=>:y)
     MODEL_DB.sqls.should == ["UPDATE items SET y = NULL WHERE (id = 3)"]
   end
 
@@ -210,23 +216,23 @@ describe "Model#save" do
     o = @c.load(:id => 3, :x => 1, :y => nil)
     o.use_transactions = false
     @c.use_transactions = true
-    o.save(:y)
+    o.save(:columns=>:y)
     MODEL_DB.sqls.should == ["UPDATE items SET y = NULL WHERE (id = 3)"]
     o = @c.load(:id => 3, :x => 1, :y => nil)
     o.use_transactions = true
     @c.use_transactions = false 
-    o.save(:y)
+    o.save(:columns=>:y)
     MODEL_DB.sqls.should == ["BEGIN", "UPDATE items SET y = NULL WHERE (id = 3)", "COMMIT"]
   end
 
   it "should use :transaction option if given" do
     o = @c.load(:id => 3, :x => 1, :y => nil)
     o.use_transactions = true
-    o.save(:y, :transaction=>false)
+    o.save(:columns=>:y, :transaction=>false)
     MODEL_DB.sqls.should == ["UPDATE items SET y = NULL WHERE (id = 3)"]
     o = @c.load(:id => 3, :x => 1, :y => nil)
     o.use_transactions = false
-    o.save(:y, :transaction=>true)
+    o.save(:columns=>:y, :transaction=>true)
     MODEL_DB.sqls.should == ["BEGIN", "UPDATE items SET y = NULL WHERE (id = 3)", "COMMIT"]
   end
 
@@ -237,7 +243,7 @@ describe "Model#save" do
     def o.before_save
       false
     end
-    proc { o.save(:y) }.should raise_error(Sequel::BeforeHookFailed)
+    proc { o.save(:columns=>:y) }.should raise_error(Sequel::BeforeHookFailed)
     MODEL_DB.sqls.should == ["BEGIN", "ROLLBACK"]
   end
 
@@ -248,7 +254,7 @@ describe "Model#save" do
     def o.before_save
       false
     end
-    proc { o.save(:y, :raise_on_failure => true) }.should raise_error(Sequel::BeforeHookFailed)
+    proc { o.save(:columns=>:y, :raise_on_failure => true) }.should raise_error(Sequel::BeforeHookFailed)
     MODEL_DB.sqls.should == ["BEGIN", "ROLLBACK"]
   end
 
@@ -260,7 +266,7 @@ describe "Model#save" do
       false
     end
     MODEL_DB.transaction do
-      o.save(:y).should == nil
+      o.save(:columns=>:y).should == nil
       MODEL_DB.run "BLAH"
     end
     MODEL_DB.sqls.should == ["BEGIN", "BLAH", "COMMIT"]
@@ -273,7 +279,7 @@ describe "Model#save" do
     def o.before_save
       false
     end
-    o.save(:y).should == nil
+    o.save(:columns=>:y).should == nil
     MODEL_DB.sqls.should == ["BEGIN", "ROLLBACK"]
   end
 
@@ -283,7 +289,7 @@ describe "Model#save" do
     def o.before_save
       raise Sequel::Rollback
     end
-    proc { o.save(:y) }.should raise_error(Sequel::Rollback)
+    proc { o.save(:columns=>:y) }.should raise_error(Sequel::Rollback)
     MODEL_DB.sqls.should == []
   end
 
@@ -674,7 +680,7 @@ describe Sequel::Model, "with a primary key" do
     model_a.primary_key.should == :a
   end
 
-  it "should support multi argument composite keys" do
+  qspecify "should support multi argument composite keys" do
     model_a = Class.new(Sequel::Model){ set_primary_key :a, :b }
     model_a.primary_key.should == [:a, :b]
   end
@@ -715,7 +721,7 @@ describe Sequel::Model, "#this" do
   end
 
   it "should support composite primary keys" do
-    @example.set_primary_key :x, :y
+    @example.set_primary_key [:x, :y]
     instance = @example.load(:x => 4, :y => 5)
     instance.this.sql.should =~ /SELECT \* FROM examples WHERE \(\([xy] = [45]\) AND \([xy] = [45]\)\) LIMIT 1/
   end
@@ -858,7 +864,7 @@ describe Sequel::Model, "#set" do
 
   it "should raise error if strict_param_setting is true and column is restricted" do
     @o1.strict_param_setting = true
-    @c.set_restricted_columns :x
+    @c.set_allowed_columns
     proc{@o1.set('x' => 1)}.should raise_error(Sequel::Error)
   end
 
@@ -1087,7 +1093,6 @@ describe Sequel::Model, "#(set|update)_(all|except|only)" do
       set_primary_key :id
       columns :x, :y, :z, :id
       set_allowed_columns :x
-      set_restricted_columns :y
     end
     @c.strict_param_setting = false
     @o1 = @c.new
@@ -1105,7 +1110,10 @@ describe Sequel::Model, "#(set|update)_(all|except|only)" do
     proc{@c.new.set_only({:x => 1, :y => 2, :z=>3}, :x, :y)}.should raise_error(Sequel::Error)
     (o = @c.new).set_only({:x => 1, :y => 2}, :x, :y)
     o.values.should == {:x => 1, :y => 2}
+  end
 
+  qspecify "should raise errors for set_except if not all hash fields can be set and strict_param_setting is true" do
+    @c.strict_param_setting = true
     proc{@c.new.set_except({:x => 1, :y => 2, :z=>3, :id=>4}, :x, :y)}.should raise_error(Sequel::Error)
     proc{@c.new.set_except({:x => 1, :y => 2, :z=>3}, :x, :y)}.should raise_error(Sequel::Error)
     (o = @c.new).set_except({:z => 3}, :x, :y)
@@ -1126,7 +1134,7 @@ describe Sequel::Model, "#(set|update)_(all|except|only)" do
     @o1.values.should == {:x => 9, :y => 8, :id=>7}
   end
 
-  it "#set_except should not set given attributes or the primary key" do
+  qspecify "#set_except should not set given attributes or the primary key" do
     @o1.set_except({:x => 1, :y => 2, :z=>3, :id=>4}, [:y, :z])
     @o1.values.should == {:x => 1}
     @o1.set_except({:x => 4, :y => 2, :z=>3, :id=>4}, :y, :z)
@@ -1149,7 +1157,7 @@ describe Sequel::Model, "#(set|update)_(all|except|only)" do
     MODEL_DB.sqls.should == ["INSERT INTO items (x) VALUES (1)", "SELECT * FROM items WHERE (id = 10) LIMIT 1"]
   end
 
-  it "#update_except should not update given attributes" do
+  qspecify "#update_except should not update given attributes" do
     @o1.update_except({:x => 1, :y => 2, :z=>3, :id=>4}, [:y, :z])
     MODEL_DB.sqls.should == ["INSERT INTO items (x) VALUES (1)", "SELECT * FROM items WHERE (id = 10) LIMIT 1"]
     @c.new.update_except({:x => 1, :y => 2, :z=>3, :id=>4}, :y, :z)
@@ -1255,12 +1263,12 @@ describe Sequel::Model, "#exists?" do
 
   it "should do a query to check if the record exists" do
     @model.load(:id=>1).exists?.should be_true
-    MODEL_DB.sqls.should == ['SELECT 1 FROM items WHERE (id = 1) LIMIT 1']
+    MODEL_DB.sqls.should == ['SELECT 1 AS one FROM items WHERE (id = 1) LIMIT 1']
   end
 
   it "should return false when #this.count == 0" do
     @model.load(:id=>2).exists?.should be_false
-    MODEL_DB.sqls.should == ['SELECT 1 FROM items WHERE (id = 2) LIMIT 1']
+    MODEL_DB.sqls.should == ['SELECT 1 AS one FROM items WHERE (id = 2) LIMIT 1']
   end
 
   it "should return false without issuing a query if the model object is new" do
@@ -1382,10 +1390,10 @@ describe Sequel::Model, "#hash" do
   specify "should be the same only for objects with the same class and pk if pk is composite and all values are non-NULL" do
     z = Class.new(Sequel::Model)
     z.columns :id, :id2, :x
-    z.set_primary_key(:id, :id2)
+    z.set_primary_key([:id, :id2])
     y = Class.new(Sequel::Model)
     y.columns :id, :id2, :x
-    y.set_primary_key(:id, :id2)
+    y.set_primary_key([:id, :id2])
     a = z.load(:id => 1, :id2=>2, :x => 3)
     
     a.hash.should == z.load(:id => 1, :id2=>2, :x => 4).hash
@@ -1396,10 +1404,10 @@ describe Sequel::Model, "#hash" do
   specify "should be the same only for objects with the same class and value if pk is composite and one values is NULL" do
     z = Class.new(Sequel::Model)
     z.columns :id, :id2, :x
-    z.set_primary_key(:id, :id2)
+    z.set_primary_key([:id, :id2])
     y = Class.new(Sequel::Model)
     y.columns :id, :id2, :x
-    y.set_primary_key(:id, :id2)
+    y.set_primary_key([:id, :id2])
 
     a = z.load(:id => 1, :id2 => nil, :x => 3)
     a.hash.should == z.load(:id => 1, :id2=>nil, :x => 3).hash

data/spec/model/spec_helper.rb

@@ -3,12 +3,33 @@ unless Object.const_defined?('Sequel') && Sequel.const_defined?('Model')
   $:.unshift(File.join(File.dirname(File.expand_path(__FILE__)), "../../lib/"))
   require 'sequel/no_core_ext'
 end
+Sequel::Deprecation.backtrace_filter = lambda{|line, lineno| lineno < 4 || line =~ /_spec\.rb/}
 
 if ENV['SEQUEL_COLUMNS_INTROSPECTION']
   Sequel.extension :columns_introspection
   Sequel::Dataset.introspect_all_columns
 end
 
+(defined?(RSpec) ? RSpec::Core::ExampleGroup : Spec::Example::ExampleGroup).class_eval do
+  if ENV['SEQUEL_DEPRECATION_WARNINGS']
+    class << self
+      alias qspecify specify
+    end
+  else
+    def self.qspecify(*a, &block)
+      specify(*a) do
+        begin
+          output = Sequel::Deprecation.output
+          Sequel::Deprecation.output = false
+          instance_exec(&block)
+        ensure
+          Sequel::Deprecation.output = output 
+        end
+      end
+    end
+  end
+end
+
 Sequel.quote_identifiers = false
 Sequel.identifier_input_method = nil
 Sequel.identifier_output_method = nil
@@ -28,9 +49,10 @@ class << Sequel::Model
 end
 
 Sequel::Model.use_transactions = false
-Sequel::Model.cache_anonymous_models = false
+Sequel.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
 def db.reset() sqls end
+def db.supports_schema_parsing?() true end
 Sequel::Model.db = MODEL_DB = db

data/spec/model/validations_spec.rb

@@ -14,16 +14,14 @@ describe Sequel::Model::Errors do
   
   specify "should be empty if there are no errors" do
     @errors.should be_empty
-    @errors[:blah]
-    @errors.should be_empty
   end
   
   specify "should not be empty if there are errors" do
-    @errors[:blah] << "blah"
+    @errors.add(:blah, "blah")
     @errors.should_not be_empty
   end
   
-  specify "should return errors for a specific attribute using #[]" do
+  qspecify "should return errors for a specific attribute using #[]" do
     @errors[:blah].should == []
     @errors[:blah] << 'blah'
     @errors[:blah].should == ['blah']
@@ -32,30 +30,30 @@ describe Sequel::Model::Errors do
   end
   
   specify "should return an array of errors for a specific attribute using #on if there are errors" do
-    @errors[:blah] << 'blah'
+    @errors.add(:blah, 'blah')
     @errors.on(:blah).should == ['blah']
   end
   
   specify "should return nil using #on if there are no errors for that attribute" do
     @errors.on(:blah).should == nil
-    @errors[:blah]
-    @errors.on(:blah).should == nil
   end
   
-  specify "should accept errors using #[] << or #add" do
+  qspecify "should accept errors using #[] <<" do
     @errors[:blah] << 'blah'
     @errors[:blah].should == ['blah']
+  end
     
+  specify "should accept errors using #add" do
     @errors.add :blah, 'zzzz'
-    @errors[:blah].should == ['blah', 'zzzz']
+    @errors[:blah].should == ['zzzz']
   end
   
   specify "should return full messages using #full_messages" do
     @errors.full_messages.should == []
     
-    @errors[:blow] << 'blieuh'
-    @errors[:blow] << 'blich'
-    @errors[:blay] << 'bliu'
+    @errors.add(:blow, 'blieuh')
+    @errors.add(:blow, 'blich')
+    @errors.add(:blay, 'bliu')
     msgs = @errors.full_messages
     msgs.size.should == 3
     msgs.should include('blow blieuh', 'blow blich', 'blay bliu')
@@ -64,9 +62,9 @@ describe Sequel::Model::Errors do
   specify "should not add column names for LiteralStrings" do
     @errors.full_messages.should == []
     
-    @errors[:blow] << 'blieuh'
-    @errors[:blow] << Sequel.lit('blich')
-    @errors[:blay] << 'bliu'
+    @errors.add(:blow, 'blieuh')
+    @errors.add(:blow, Sequel.lit('blich'))
+    @errors.add(:blay, 'bliu')
     msgs = @errors.full_messages
     msgs.size.should == 3
     msgs.should include('blow blieuh', 'blich', 'blay bliu')
@@ -103,7 +101,7 @@ describe Sequel::Model do
     @c = Class.new(Sequel::Model) do
       columns :score
       def validate
-        errors[:score] << 'too low' if score < 87
+        errors.add(:score, 'too low') if score < 87
       end
     end
     
@@ -125,7 +123,7 @@ describe Sequel::Model do
     @o.score = 86
     @o.should_not be_valid
     @o.errors[:score].should == ['too low']
-    @o.errors[:blah].should be_empty
+    @o.errors.on(:blah).should be_nil
   end
   
   specify "should allow raising of ValidationFailed with a Model instance with errors" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequel
 version: !ruby/object:Gem::Version
-  version: 3.47.0
+  version: 3.48.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-01 00:00:00.000000000 Z
+date: 2013-06-01 00:00:00.000000000 Z
 dependencies: []
 description: The Database Toolkit for Ruby
 email: code@jeremyevans.net
@@ -45,6 +45,7 @@ extra_rdoc_files:
 - doc/bin_sequel.rdoc
 - doc/security.rdoc
 - doc/postgresql.rdoc
+- doc/code_order.rdoc
 - doc/release_notes/1.0.txt
 - doc/release_notes/1.1.txt
 - doc/release_notes/1.3.txt
@@ -111,6 +112,7 @@ extra_rdoc_files:
 - doc/release_notes/3.45.0.txt
 - doc/release_notes/3.46.0.txt
 - doc/release_notes/3.47.0.txt
+- doc/release_notes/3.48.0.txt
 files:
 - MIT-LICENSE
 - CHANGELOG
@@ -195,6 +197,7 @@ files:
 - doc/release_notes/3.45.0.txt
 - doc/release_notes/3.46.0.txt
 - doc/release_notes/3.47.0.txt
+- doc/release_notes/3.48.0.txt
 - doc/sharding.rdoc
 - doc/sql.rdoc
 - doc/validations.rdoc
@@ -209,6 +212,7 @@ files:
 - doc/bin_sequel.rdoc
 - doc/security.rdoc
 - doc/postgresql.rdoc
+- doc/code_order.rdoc
 - spec/adapters/firebird_spec.rb
 - spec/adapters/informix_spec.rb
 - spec/adapters/mssql_spec.rb
@@ -226,6 +230,7 @@ files:
 - spec/core/object_graph_spec.rb
 - spec/core/schema_generator_spec.rb
 - spec/core/spec_helper.rb
+- spec/core/deprecated_spec.rb
 - spec/core/version_spec.rb
 - spec/core/mock_adapter_spec.rb
 - spec/extensions/active_model_spec.rb
@@ -324,6 +329,15 @@ files:
 - spec/extensions/unlimited_update_spec.rb
 - spec/extensions/error_splitter_spec.rb
 - spec/extensions/input_transformer_spec.rb
+- spec/extensions/filter_having_spec.rb
+- spec/extensions/hash_aliases_spec.rb
+- spec/extensions/after_initialize_spec.rb
+- spec/extensions/set_overrides_spec.rb
+- spec/extensions/graph_each_spec.rb
+- spec/extensions/blacklist_security_spec.rb
+- spec/extensions/sequel_3_dataset_methods_spec.rb
+- spec/extensions/empty_array_ignore_nulls_spec.rb
+- spec/extensions/scissors_spec.rb
 - spec/integration/associations_test.rb
 - spec/integration/database_test.rb
 - spec/integration/dataset_test.rb
@@ -349,6 +363,7 @@ files:
 - spec/model/record_spec.rb
 - spec/model/spec_helper.rb
 - spec/model/validations_spec.rb
+- spec/model/class_dataset_methods_spec.rb
 - spec/rcov.opts
 - spec/spec_config.rb.example
 - spec/spec_config.rb
@@ -398,6 +413,7 @@ files:
 - spec/files/transaction_unspecified_migrations/002_create_basic.rb
 - spec/core_extensions_spec.rb
 - spec/sequel_coverage.rb
+- spec/bin_spec.rb
 - lib/sequel.rb
 - lib/sequel/adapters/ado.rb
 - lib/sequel/adapters/ado/mssql.rb
@@ -452,6 +468,7 @@ files:
 - lib/sequel/adapters/utils/emulate_offset_with_row_number.rb
 - lib/sequel/adapters/utils/pg_types.rb
 - lib/sequel/adapters/utils/split_alter_table.rb
+- lib/sequel/adapters/utils/emulate_offset_with_reverse_and_count.rb
 - lib/sequel/adapters/mysql2.rb
 - lib/sequel/adapters/swift.rb
 - lib/sequel/adapters/swift/mysql.rb
@@ -531,6 +548,13 @@ files:
 - lib/sequel/extensions/date_arithmetic.rb
 - lib/sequel/extensions/core_refinements.rb
 - lib/sequel/extensions/meta_def.rb
+- lib/sequel/extensions/filter_having.rb
+- lib/sequel/extensions/hash_aliases.rb
+- lib/sequel/extensions/ruby18_symbol_extensions.rb
+- lib/sequel/extensions/set_overrides.rb
+- lib/sequel/extensions/graph_each.rb
+- lib/sequel/extensions/sequel_3_dataset_methods.rb
+- lib/sequel/extensions/empty_array_ignore_nulls.rb
 - lib/sequel/version.rb
 - lib/sequel/model.rb
 - lib/sequel/model/associations.rb
@@ -595,10 +619,15 @@ files:
 - lib/sequel/plugins/unlimited_update.rb
 - lib/sequel/plugins/auto_validations.rb
 - lib/sequel/plugins/error_splitter.rb
+- lib/sequel/plugins/scissors.rb
 - lib/sequel/plugins/input_transformer.rb
+- lib/sequel/plugins/after_initialize.rb
+- lib/sequel/plugins/blacklist_security.rb
 - lib/sequel/timezones.rb
+- lib/sequel/deprecated.rb
 - lib/sequel/ast_transformer.rb
 - lib/sequel/no_core_ext.rb
+- lib/sequel/deprecated_core_extensions.rb
 - lib/sequel_core.rb
 - lib/sequel_model.rb
 homepage: http://sequel.rubyforge.org
@@ -627,7 +656,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: sequel
-rubygems_version: 2.0.0
+rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
 summary: The Database Toolkit for Ruby