sequel 4.26.0 → 4.29.0

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/extensions/subset_conditions_spec.rb

@@ -0,0 +1,38 @@
+require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
+
+describe "subset_conditions plugin" do
+  before do
+    @c = Class.new(Sequel::Model(:a))
+    @c.plugin :subset_conditions
+  end
+
+  it "should provide *_conditions method return the arguments passed" do
+    @c.subset(:published, :published => true)
+    @c.where(@c.published_conditions).sql.must_equal @c.published.sql
+
+    @c.subset(:active, :active)
+    @c.where(@c.active_conditions).sql.must_equal @c.active.sql
+
+    @c.subset(:active_published, :active, :published => true)
+    @c.where(@c.active_published_conditions).sql.must_equal @c.active_published.sql
+    @c.where(Sequel.&(@c.active_conditions, @c.published_conditions)).sql.must_equal @c.active_published.sql
+    @c.where(Sequel.|(@c.active_conditions, @c.published_conditions)).sql.must_equal "SELECT * FROM a WHERE (active OR (published IS TRUE))"
+    @c.where(Sequel.|(@c.active_published_conditions, :foo)).sql.must_equal "SELECT * FROM a WHERE ((active AND (published IS TRUE)) OR foo)"
+  end
+
+  it "should work with blocks" do
+    p1 = proc{{:published=>true}}
+    @c.subset(:published, &p1)
+    @c.where(@c.published_conditions).sql.must_equal @c.published.sql
+
+    p2 = proc{:active}
+    @c.subset(:active, &p2)
+    @c.where(@c.active_conditions).sql.must_equal @c.active.sql
+
+    @c.subset(:active_published, p2, &p1)
+    @c.where(@c.active_published_conditions).sql.must_equal @c.active_published.sql
+    @c.where(Sequel.&(@c.active_conditions, @c.published_conditions)).sql.must_equal @c.active_published.sql
+    @c.where(Sequel.|(@c.active_conditions, @c.published_conditions)).sql.must_equal "SELECT * FROM a WHERE (active OR (published IS TRUE))"
+    @c.where(Sequel.|(@c.active_published_conditions, :foo)).sql.must_equal "SELECT * FROM a WHERE ((active AND (published IS TRUE)) OR foo)"
+  end
+end

data/spec/extensions/uuid_spec.rb

@@ -0,0 +1,106 @@
+require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+
+describe "Sequel::Plugins::Uuid" do
+  before do
+    uuid = @uuid = '57308544-4e83-47b8-b87f-6f68b987f4f9'
+    @alt_uuid = 'd5d1ec46-5e8e-4a7b-adc9-50e76b819e19'
+    dc = Object.new
+    @c = Class.new(Sequel::Model(:t))
+    @c.class_eval do
+      columns :id, :uuid
+      plugin :uuid
+      def _save_refresh(*) end
+      define_method(:create_uuid) do
+        uuid
+      end
+      db.reset
+    end
+    @c.dataset.autoid = nil
+  end
+  
+  it "should handle validations on the uuid field for new objects" do
+    @c.plugin :uuid, :force=>true
+    o = @c.new
+    def o.validate
+      errors.add(model.uuid_field, 'not present') unless send(model.uuid_field)
+    end
+    o.valid?.must_equal true
+  end
+
+  it "should set uuid field when skipping validations" do
+    @c.plugin :uuid
+    @c.new.save(:validate=>false)
+    @c.db.sqls.must_equal ["INSERT INTO t (uuid) VALUES ('#{@uuid}')"]
+  end
+
+  it "should set the uuid field on creation" do
+    o = @c.create
+    @c.db.sqls.must_equal ["INSERT INTO t (uuid) VALUES ('#{@uuid}')"]
+    o.uuid.must_equal @uuid
+  end
+
+  if RUBY_VERSION >= '1.9'
+    it "should allow specifying the uuid field via the :field option" do
+      c = Class.new(Sequel::Model(:t))
+      c.class_eval do
+        columns :id, :u
+        plugin :uuid, :field=>:u
+        def _save_refresh(*) end
+      end
+      o = c.create
+      c.db.sqls.first.must_match(/INSERT INTO t \(u\) VALUES \('[-0-9a-f]+'\)/)
+      o.u.must_match /[-0-9a-f]+/
+    end
+  end
+
+  it "should not raise an error if the model doesn't have the uuid column" do
+    @c.columns :id, :x
+    @c.send(:undef_method, :uuid)
+    @c.create(:x=>2)
+    @c.load(:id=>1, :x=>2).save
+    @c.db.sqls.must_equal ["INSERT INTO t (x) VALUES (2)", "UPDATE t SET x = 2 WHERE (id = 1)"]
+  end
+
+  it "should not overwrite an existing uuid value" do
+    o = @c.create(:uuid=>@alt_uuid)
+    @c.db.sqls.must_equal ["INSERT INTO t (uuid) VALUES ('#{@alt_uuid}')"]
+    o.uuid.must_equal @alt_uuid
+  end
+
+  it "should overwrite an existing uuid if the :force option is used" do
+    @c.plugin :uuid, :force=>true
+    o = @c.create(:uuid=>@alt_uuid)
+    @c.db.sqls.must_equal ["INSERT INTO t (uuid) VALUES ('#{@uuid}')"]
+    o.uuid.must_equal @uuid
+  end
+
+  it "should have uuid_field give the uuid field" do
+    @c.uuid_field.must_equal :uuid
+    @c.plugin :uuid, :field=>:u
+    @c.uuid_field.must_equal :u
+  end
+
+  it "should have uuid_overwrite? give the whether to overwrite an existing uuid" do
+    @c.uuid_overwrite?.must_equal false
+    @c.plugin :uuid, :force=>true
+    @c.uuid_overwrite?.must_equal true
+  end
+
+  it "should work with subclasses" do
+    c = Class.new(@c)
+    o = c.create
+    o.uuid.must_equal @uuid
+    c.db.sqls.must_equal ["INSERT INTO t (uuid) VALUES ('#{@uuid}')"]
+    c.create(:uuid=>@alt_uuid).uuid.must_equal @alt_uuid
+
+    c.class_eval do
+      columns :id, :u
+      plugin :uuid, :field=>:u, :force=>true
+    end
+    c2 = Class.new(c)
+    c2.db.reset
+    o = c2.create
+    o.u.must_equal @uuid
+    c2.db.sqls.first.must_match(/INSERT INTO t \([u]\) VALUES \('#{@uuid}'\)/)
+  end
+end

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/prepared_statement_test.rb

@@ -355,13 +355,13 @@ describe "Bound Argument Types" do
     @ds.literal(@ds.filter(:t=>:$x).prepare(:first, :ps_time).call(:x=>fract_time)[:t]).must_equal @ds.literal(fract_time)
   end
 
-  cspecify "should handle blob type", [:odbc], [:oracle] do
+  cspecify "should handle blob type", [:odbc] do
     @ds.delete
     @ds.prepare(:insert, :ps_blob, {:file=>:$x}).call(:x=>@vs[:file])
     @ds.get(:file).must_equal @vs[:file]
   end
 
-  cspecify "should handle blob type with special characters", [:odbc], [:oracle] do
+  cspecify "should handle blob type with special characters", [:odbc] do
     @ds.delete
     blob = Sequel.blob("\"'[]`a0 ")
     @ds.prepare(:insert, :ps_blob, {:file=>:$x}).call(:x=>blob)
@@ -374,7 +374,7 @@ describe "Bound Argument Types" do
     @ds.get(:file).must_equal nil
   end
 
-  cspecify "should handle blob type with embedded zeros", [:odbc], [:oracle] do
+  cspecify "should handle blob type with embedded zeros", [:odbc] do
     zero_blob = Sequel::SQL::Blob.new("a\0"*100)
     @ds.delete
     @ds.prepare(:insert, :ps_blob, {:file=>:$x}).call(:x=>zero_blob)

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
@@ -576,7 +582,7 @@ describe "Database schema modifiers" do
     @db.schema(:items, :reload=>true).map{|x| x.first}.must_equal [:id]
     @ds.columns!.must_equal [:id]
     @ds.insert(:id=>'20')
-    @ds.all.must_equal [{:id=>"10"}, {:id=>"20"}]
+    @ds.order(:id).all.must_equal [{:id=>"10"}, {:id=>"20"}]
   end
 
   cspecify "should set column types without modifying NULL/NOT NULL", [:jdbc, :db2], [:db2], :oracle, :derby do

data/spec/integration/transaction_test.rb

@@ -84,6 +84,28 @@ describe "Database transactions" do
   end 
   
   if DB.supports_savepoints?
+    it "should handle table_exists? failures inside transactions" do
+      @db.transaction do
+        @d << {:name => '1'}
+        @db.table_exists?(:asadf098asd9asd98sa).must_equal false
+        @d << {:name => '2'}
+      end
+      @d.select_order_map(:name).must_equal %w'1 2'
+    end
+
+    it "should handle table_exists? failures inside savepoints" do
+      @db.transaction do
+        @d << {:name => '1'}
+        @db.transaction(:savepoint=>true) do
+          @d << {:name => '2'}
+          @db.table_exists?(:asadf098asd9asd98sa).must_equal false
+          @d << {:name => '3'}
+        end
+        @d << {:name => '4'}
+      end
+      @d.select_order_map(:name).must_equal %w'1 2 3 4'
+    end
+
     it "should support nested transactions through savepoints using the savepoint option" do
       @db.transaction do
         @d << {:name => '1'}

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

data/spec/model/record_spec.rb

@@ -67,6 +67,12 @@ describe "Model#save" do
     DB.sqls.must_equal ["INSERT INTO items (x) VALUES (1)", "SELECT * FROM items WHERE (id = 13) LIMIT 1"]
   end
 
+  it "should raise if the object can't be refreshed after save" do
+    o = @c.new(:x => 1)
+    @c.instance_dataset._fetch =@c.dataset._fetch = []
+    proc{o.save}.must_raise(Sequel::NoExistingObject)
+  end
+
   it "should use dataset's insert_select method if present" do
     ds = @c.instance_dataset
     ds._fetch = {:y=>2}
@@ -1738,7 +1744,7 @@ describe Sequel::Model, "#refresh" do
   it "should raise if the instance is not found" do
     @m = @c.new(:id => 555)
     @c.instance_dataset._fetch =@c.dataset._fetch = []
-    proc {@m.refresh}.must_raise(Sequel::Error)
+    proc {@m.refresh}.must_raise(Sequel::NoExistingObject)
     DB.sqls.must_equal ["SELECT * FROM items WHERE (id = 555) 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.29.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-01 00:00:00.000000000 Z
+date: 2015-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -227,6 +227,9 @@ 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
+- doc/release_notes/4.28.0.txt
+- doc/release_notes/4.29.0.txt
 files:
 - CHANGELOG
 - MIT-LICENSE
@@ -341,6 +344,9 @@ 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.28.0.txt
+- doc/release_notes/4.29.0.txt
 - doc/release_notes/4.3.0.txt
 - doc/release_notes/4.4.0.txt
 - doc/release_notes/4.5.0.txt
@@ -530,8 +536,10 @@ 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/boolean_subsets.rb
 - lib/sequel/plugins/caching.rb
 - lib/sequel/plugins/class_table_inheritance.rb
 - lib/sequel/plugins/column_conflicts.rb
@@ -581,6 +589,7 @@ files:
 - lib/sequel/plugins/static_cache.rb
 - lib/sequel/plugins/string_stripper.rb
 - lib/sequel/plugins/subclasses.rb
+- lib/sequel/plugins/subset_conditions.rb
 - lib/sequel/plugins/table_select.rb
 - lib/sequel/plugins/tactical_eager_loading.rb
 - lib/sequel/plugins/timestamps.rb
@@ -591,6 +600,7 @@ files:
 - lib/sequel/plugins/update_or_create.rb
 - lib/sequel/plugins/update_primary_key.rb
 - lib/sequel/plugins/update_refresh.rb
+- lib/sequel/plugins/uuid.rb
 - lib/sequel/plugins/validate_associated.rb
 - lib/sequel/plugins/validation_class_methods.rb
 - lib/sequel/plugins/validation_helpers.rb
@@ -630,9 +640,11 @@ 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
+- spec/extensions/boolean_subsets_spec.rb
 - spec/extensions/caching_spec.rb
 - spec/extensions/class_table_inheritance_spec.rb
 - spec/extensions/column_conflicts_spec.rb
@@ -733,6 +745,7 @@ files:
 - spec/extensions/string_date_time_spec.rb
 - spec/extensions/string_stripper_spec.rb
 - spec/extensions/subclasses_spec.rb
+- spec/extensions/subset_conditions_spec.rb
 - spec/extensions/table_select_spec.rb
 - spec/extensions/tactical_eager_loading_spec.rb
 - spec/extensions/thread_local_timezones_spec.rb
@@ -745,6 +758,7 @@ files:
 - spec/extensions/update_or_create_spec.rb
 - spec/extensions/update_primary_key_spec.rb
 - spec/extensions/update_refresh_spec.rb
+- spec/extensions/uuid_spec.rb
 - spec/extensions/validate_associated_spec.rb
 - spec/extensions/validation_class_methods_spec.rb
 - spec/extensions/validation_helpers_spec.rb