sequel 4.34.0 → 4.35.0

data/spec/core/mock_adapter_spec.rb

@@ -338,7 +338,9 @@ describe "Sequel Mock Adapter" do
     db[:b].delete
     db[:c].insert(:a=>1)
     db[:d].update(:a=>1)
-    a.must_equal ['SELECT * FROM t', 'DELETE FROM b', 'INSERT INTO c (a) VALUES (1)', 'UPDATE d SET a = 1']
+    a.zip(['SELECT * FROM t', 'DELETE FROM b', 'INSERT INTO c (a) VALUES (1)', 'UPDATE d SET a = 1']).each do |is, should|
+      is.must_match should
+    end
   end
 
   it "should correctly handle transactions" do

data/spec/core/schema_generator_spec.rb

@@ -198,6 +198,6 @@ describe "Sequel::Schema::Generator generic type methods" do
       File :k
       TrueClass :l
       FalseClass :m
-    end.columns.map{|c| c[:type]}.must_equal [String, Integer, Fixnum, Bignum, Float, BigDecimal, Date, DateTime, Time, Numeric, File, TrueClass, FalseClass]
+    end.columns.map{|c| c[:type]}.must_equal [String, Integer, Fixnum, :Bignum, Float, BigDecimal, Date, DateTime, Time, Numeric, File, TrueClass, FalseClass]
   end
 end

data/spec/core_model_spec.rb

@@ -0,0 +1,2 @@
+require './spec/core_spec'
+require './spec/model_spec'

data/spec/core_spec.rb

@@ -0,0 +1 @@
+Dir['./spec/core/*_spec.rb'].each{|f| require f}

data/spec/extensions/delay_add_association_spec.rb

@@ -49,4 +49,26 @@ describe "Sequel::Plugins::DelayAddAssociation" do
     @o.errors[:cs].must_equal ["name is b"]
     @o.cs.first.errors[:name].must_equal ['is b']
   end
+
+  it "should work when passing in hashes" do
+    @o = @c.new(:name=>'a')
+    @o.add_c(:name=>'b')
+    @db.sqls.must_equal []
+    @o.save
+    sqls = @db.sqls
+    sqls.length.must_equal 4
+    sqls[0].must_equal "INSERT INTO cs (name) VALUES ('a')"
+    ["INSERT INTO cs (name, c_id) VALUES ('b', 1)", "INSERT INTO cs (c_id, name) VALUES (1, 'b')"].must_include sqls[1]
+    sqls[2].must_equal "SELECT * FROM cs WHERE (id = 2) LIMIT 1"
+    sqls[3].must_equal "SELECT * FROM cs WHERE (id = 1) LIMIT 1"
+  end
+
+  it "should work when passing in primary keys" do
+    @db.fetch = [[{:id=>2, :name=>'b', :c_id=>nil}], [{:id=>1, :name=>'a', :c_id=>nil}]]
+    @o = @c.new(:name=>'a')
+    @o.add_c(2)
+    @db.sqls.must_equal ["SELECT * FROM cs WHERE (id = 2) LIMIT 1"]
+    @o.save
+    @db.sqls.must_equal ["INSERT INTO cs (name) VALUES ('a')", "UPDATE cs SET c_id = 1 WHERE (id = 2)", "SELECT * FROM cs WHERE (id = 1) LIMIT 1"]
+  end
 end

data/spec/extensions/json_serializer_spec.rb

@@ -127,6 +127,12 @@ describe "Sequel::Plugins::JsonSerializer" do
     Album.from_json(@album.to_json(:include=>{:artist=>{:include=>{:albums=>{:only=>:name}}}}), :associations=>{:artist=>{:associations=>:albums}}).artist.albums.must_equal [Album.load(:name=>@album.name)]
   end
 
+  it "should handle usage of association_proxies when cascading using the :include option" do
+    Artist.plugin :association_proxies
+    Artist.one_to_many :albums, :clone=>:albums
+    Artist.from_json(@artist.to_json(:include=>{:albums=>{:include=>:artist}}), :associations=>{:albums=>{:associations=>:artist}}).albums.map{|a| a.artist}.must_equal [@artist]
+  end
+
   it "should handle the :include option cascading with an empty hash" do
     Album.from_json(@album.to_json(:include=>{:artist=>{}}), :associations=>:artist).artist.must_equal @artist
     Album.from_json(@album.to_json(:include=>{:blah=>{}})).blah.must_equal @album.blah

data/spec/extensions/pg_range_spec.rb

@@ -325,9 +325,9 @@ describe "pg_range extension" do
     end
 
     it "should quack like a range" do
+      @r1.cover?(1.5).must_equal true
+      @r1.cover?(2.5).must_equal false
       if RUBY_VERSION >= '1.9'
-        @r1.cover?(1.5).must_equal true
-        @r1.cover?(2.5).must_equal false
         @r1.first(1).must_equal [1]
         @r1.last(1).must_equal [2]
       end
@@ -339,6 +339,34 @@ describe "pg_range extension" do
       a.must_equal [1, 2]
     end
 
+    it "should have cover? handle empty, unbounded, and exclusive beginning ranges" do
+      @R.empty.cover?(1).must_equal false
+
+      r = @R.new(1, nil)
+      r.cover?(0).must_equal false
+      r.cover?(1).must_equal true
+      r.cover?(2).must_equal true
+      r.cover?(3).must_equal true
+
+      r = @R.new(nil, 2)
+      r.cover?(0).must_equal true
+      r.cover?(1).must_equal true
+      r.cover?(2).must_equal true
+      r.cover?(3).must_equal false
+
+      r = @R.new(1, 2, :exclude_begin=>true)
+      r.cover?(0).must_equal false
+      r.cover?(1).must_equal false
+      r.cover?(2).must_equal true
+      r.cover?(3).must_equal false
+
+      r = @R.new(1, 2, :exclude_end=>true)
+      r.cover?(0).must_equal false
+      r.cover?(1).must_equal true
+      r.cover?(2).must_equal false
+      r.cover?(3).must_equal false
+    end
+
     it "should only consider PGRanges equal if they have the same db_type" do
       @R.new(1, 2, :db_type=>'int4range').must_equal @R.new(1, 2, :db_type=>'int4range')
       @R.new(1, 2, :db_type=>'int8range').wont_equal @R.new(1, 2, :db_type=>'int4range')

data/spec/extensions/schema_dumper_spec.rb

@@ -107,7 +107,7 @@ describe "Sequel::Database dump methods" do
 
   it "should dump non-Integer primary key columns with explicit :type" do
     @d.meta_def(:schema){|*s| [[:c1, {:db_type=>'bigint', :primary_key=>true, :allow_null=>true, :auto_increment=>true}]]}
-    @d.dump_table_schema(:t6).must_equal "create_table(:t6) do\n  primary_key :c1, :type=>Bignum\nend"
+    @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
@@ -665,7 +665,7 @@ END_MIG
       %w"nvarchar ntext smalldatetime smallmoney binary varbinary nchar" +
       ["timestamp(6) without time zone", "timestamp(6) with time zone", 'mediumint(10) unsigned', 'int(9) unsigned',
        'int(10) unsigned', "int(12) unsigned", 'bigint unsigned', 'tinyint(3) unsigned', 'identity', 'int identity'] +
-      %w"integer(10) bit"
+      %w"integer(10) bit bool"
     @d.meta_def(:schema) do |t, *o|
       i = 0
       types.map{|x| [:"c#{i+=1}", {:db_type=>x, :allow_null=>true}]}
@@ -745,6 +745,7 @@ create_table(:x) do
   Integer :c71
   Integer :c72
   TrueClass :c73
+  TrueClass :c74
   
   check Sequel::SQL::BooleanExpression.new(:>=, Sequel::SQL::Identifier.new(:c64), 0)
   check Sequel::SQL::BooleanExpression.new(:>=, Sequel::SQL::Identifier.new(:c65), 0)

data/spec/extensions/server_logging_spec.rb

@@ -0,0 +1,45 @@
+require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+
+describe "server_logging extension" do
+  before do
+    @o = Object.new
+    def @o.logs; @logs || []; end
+    def @o.log; logs.length.must_equal 1; logs.first.length.must_equal 1; logs.shift.first; end
+    def @o.to_ary; [self]; end
+    def @o.method_missing(m, *args); (@logs ||= []) << args; end
+    @db = Sequel::mock(:servers=>{:read_only=>{}, :b=>{}}, :logger=>@o).extension(:server_logging)
+  end
+
+  it "should include shard when logging" do
+    @db[:a].all
+    @o.log.must_include "server: read_only) SELECT * FROM a"
+    @db[:a].insert
+    @o.log.must_include "server: default) INSERT INTO a DEFAULT VALUES"
+    @db[:a].server(:b).all
+    @o.log.must_include "server: b) SELECT * FROM a"
+  end
+
+  it "should not include shard when not logging connection info" do
+    @db.log_connection_info = false
+    @db[:a].all
+    log = @o.log
+    log.wont_include "server: read_only) SELECT * FROM a"
+    log.must_include "SELECT * FROM a"
+  end
+
+  it "should not turn on logging connction info if it was turned off" do
+    @db.log_connection_info = false
+    @db.extension :server_logging
+    @db[:a].all
+    log = @o.log
+    log.wont_include "server: read_only) SELECT * FROM a"
+    log.must_include "SELECT * FROM a"
+  end
+
+  it "should remove mapping when disconnecting" do
+    c = @db.synchronize{|c1| c1}
+    @db.disconnect
+    @db.send(:log_connection_execute, c, "SELECT * FROM a")
+    @o.log.must_include "server: ) SELECT * FROM a"
+  end
+end

data/spec/extensions/sql_comments_spec.rb

@@ -0,0 +1,27 @@
+require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+
+describe "sql_comments extension" do
+  before do
+    @ds = Sequel.mock[:t].extension(:sql_comments)
+  end
+
+  it "should not add a comment if one is not set for the dataset" do
+    @ds.select_sql.must_equal 'SELECT * FROM t'
+    @ds.insert_sql(:a=>1).must_equal 'INSERT INTO t (a) VALUES (1)'
+    @ds.delete_sql.must_equal 'DELETE FROM t'
+    @ds.update_sql(:a=>1).must_equal 'UPDATE t SET a = 1'
+  end
+
+  it "should add a comment if one is set for the dataset" do
+    ds = @ds.comment("Some\nComment\r\n Here")
+    ds.select_sql.must_equal "SELECT * FROM t -- Some Comment Here\n"
+    ds.insert_sql(:a=>1).must_equal "INSERT INTO t (a) VALUES (1) -- Some Comment Here\n"
+    ds.delete_sql.must_equal "DELETE FROM t -- Some Comment Here\n"
+    ds.update_sql(:a=>1).must_equal "UPDATE t SET a = 1 -- Some Comment Here\n"
+  end
+
+  it "should handle comments used in nested datasets" do
+    ds = @ds.comment("Some\nComment\r\n Here")
+    ds.where(:id=>ds).select_sql.must_equal "SELECT * FROM t WHERE (id IN (SELECT * FROM t -- Some Comment Here\n)) -- Some Comment Here\n"
+  end
+end

data/spec/files/reversible_migrations/006_reversible.rb

@@ -0,0 +1,10 @@
+Sequel.migration do
+  change do
+    create_table(:c) do
+      primary_key :id
+    end
+    alter_table(:b) do
+      add_foreign_key :f, :c
+    end
+  end
+end

data/spec/files/reversible_migrations/007_reversible.rb

@@ -0,0 +1,10 @@
+Sequel.migration do
+  change do
+    create_table(:d) do
+      primary_key :id
+    end
+    alter_table(:b) do
+      add_foreign_key :g, :d, :foreign_key_constraint_name=>:b_f_foo
+    end
+  end
+end

data/spec/integration/dataset_test.rb

@@ -25,7 +25,7 @@ describe "Simple Dataset operations" do
 
   it "should support sequential primary keys with a Bignum" do
     @db.create_table!(:items) do
-      primary_key :id, :type=>Bignum
+      primary_key :id, :type=>:Bignum
       Integer :number
     end
     @ds << {:number=>20}
@@ -171,6 +171,24 @@ describe "Simple Dataset operations" do
     @ds.all.must_equal [{:id=>1, :number=>10}]
   end
 
+  cspecify "should skip locked rows correctly", [:do] do
+    @ds.insert(:number=>10)
+    q1 = Queue.new
+    q2 = Queue.new
+    ds = @ds.order(:id).for_update.skip_locked
+    begin
+      t = Thread.new{@db.transaction(:isolation=>:committed){q2.push(ds.get(:id)); q1.pop}}
+      q2.pop.must_equal 1
+      # Some databases do row level locking, others do page level locking
+      [2, nil].must_include @db.transaction(:isolation=>:committed){ds.get(:id)}
+    ensure
+      q1.push(nil)
+      t.join
+      # Keep only one active connection, as some other specs expect that
+      @db.disconnect
+    end
+  end if DB.dataset.supports_skip_locked?
+  
   it "should raise exception if raising on duplication columns" do
     proc{@ds.select_map([:id, :id])}.must_raise Sequel::DuplicateColumnError
   end if DB.opts[:on_duplicate_columns] == :raise
@@ -325,6 +343,14 @@ describe "Simple Dataset operations" do
     @ds.filter(true).select_map(:number).must_equal [10]
     @ds.filter(false).select_map(:number).must_equal []
   end
+
+  it "should support the sql_comments extension" do
+    ds = @ds.extension(:sql_comments).comment("Some\rComment\r\nHere")
+    ds.all.must_equal [{:id=>1, :number=>10}]
+    ds.insert(:number=>20).must_equal 2
+    ds.update(:number=>30).must_equal 2
+    ds.delete.must_equal 2
+  end
 end
 
 describe "Simple dataset operations with nasty table names" do
@@ -873,7 +899,7 @@ describe Sequel::SQL::Constants do
     d.to_s.must_equal Date.today.to_s
   end
 
-  cspecify "should have working CURRENT_TIME", [:jdbc, :sqlite], [:mysql2] do
+  cspecify "should have working CURRENT_TIME", [:jdbc, :sqlite], [:mysql2], [:tinytds] do
     @db.create_table!(:constants){Time :t, :only_time=>true}
     @ds.insert(:t=>Sequel::CURRENT_TIME)
     (Time.now - @c[@ds.get(:t)]).must_be_close_to 0, 60

data/spec/integration/migrator_test.rb

@@ -7,7 +7,7 @@ describe Sequel::Migrator do
     @m = Sequel::Migrator
   end
   after do
-    @db.drop_table?(:schema_info, :schema_migrations, :sm1111, :sm1122, :sm2222, :sm2233, :sm3333, :sm11111, :sm22222)
+    @db.drop_table?(:schema_info, :schema_migrations, :sm1111, :sm1122, :sm2222, :sm2233, :sm3333, :sm11111, :sm22222, :a, :b, :c, :d)
   end
   
   it "should be able to migrate up and down all the way successfully" do
@@ -213,6 +213,28 @@ describe Sequel::Migrator do
     [:schema_migrations, :a].each{|n| @db.table_exists?(n).must_equal false}
     @db[:b].columns.must_equal [:a, :c, :e]
 
+    if @db.supports_foreign_key_parsing?
+      @m.apply(@db, @dir, 6)
+      [:schema_info, :b, :c].each{|n| @db.table_exists?(n).must_equal true}
+      [:schema_migrations, :a].each{|n| @db.table_exists?(n).must_equal false}
+      @db[:b].columns.must_equal [:a, :c, :e, :f]
+
+      @m.apply(@db, @dir, 7)
+      [:schema_info, :b, :c, :d].each{|n| @db.table_exists?(n).must_equal true}
+      [:schema_migrations, :a].each{|n| @db.table_exists?(n).must_equal false}
+      @db[:b].columns.must_equal [:a, :c, :e, :f, :g]
+
+      @m.apply(@db, @dir, 6)
+      [:schema_info, :b, :c].each{|n| @db.table_exists?(n).must_equal true}
+      [:schema_migrations, :a, :d].each{|n| @db.table_exists?(n).must_equal false}
+      @db[:b].columns.must_equal [:a, :c, :e, :f]
+    end
+
+    @m.apply(@db, @dir, 5)
+    [:schema_info, :b].each{|n| @db.table_exists?(n).must_equal true}
+    [:schema_migrations, :a, :c].each{|n| @db.table_exists?(n).must_equal false}
+    @db[:b].columns.must_equal [:a, :c, :e]
+
     @m.apply(@db, @dir, 4)
     [:schema_info, :b].each{|n| @db.table_exists?(n).must_equal true}
     [:schema_migrations, :a].each{|n| @db.table_exists?(n).must_equal false}

data/spec/integration/schema_test.rb

@@ -762,7 +762,7 @@ describe "Database schema modifiers" do
   end if DB.supports_deferrable_constraints?
 end
 
-describe "Database#tables" do
+describe "Database#tables and #views" do
   before do
     class ::String
       @@xxxxx = 0
@@ -771,6 +771,8 @@ describe "Database#tables" do
       end
     end
     @db = DB
+    @db.drop_view(:sequel_test_view) rescue nil
+    @db.drop_table?(:sequel_test_table)
     @db.create_table(:sequel_test_table){Integer :a}
     @db.create_view :sequel_test_view, @db[:sequel_test_table]
     @iom = @db.identifier_output_method
@@ -783,53 +785,31 @@ describe "Database#tables" do
     @db.drop_table :sequel_test_table
   end
 
-  it "should return an array of symbols" do
+  it "#tables should return an array of symbols" do
     ts = @db.tables
     ts.must_be_kind_of(Array)
     ts.each{|t| t.must_be_kind_of(Symbol)}
     ts.must_include(:sequel_test_table)
     ts.wont_include(:sequel_test_view)
-  end
+  end if DB.supports_table_listing?
 
-  it "should respect the database's identifier_output_method" do
+  it "#tables should respect the database's identifier_output_method" do
     @db.identifier_output_method = :xxxxx
     @db.identifier_input_method = :xxxxx
     @db.tables.each{|t| t.to_s.must_match(/\Ax{5}\d+\z/)}
-  end
-end if DB.supports_table_listing?
+  end if DB.supports_table_listing?
 
-describe "Database#views" do
-  before do
-    class ::String
-      @@xxxxx = 0
-      def xxxxx
-        "xxxxx#{@@xxxxx += 1}"
-      end
-    end
-    @db = DB
-    @db.create_table(:sequel_test_table){Integer :a}
-    @db.create_view :sequel_test_view, @db[:sequel_test_table]
-    @iom = @db.identifier_output_method
-    @iim = @db.identifier_input_method
-  end
-  after do
-    @db.identifier_output_method = @iom
-    @db.identifier_input_method = @iim
-    @db.drop_view :sequel_test_view
-    @db.drop_table :sequel_test_table
-  end
-
-  it "should return an array of symbols" do
+  it "#views should return an array of symbols" do
     ts = @db.views
     ts.must_be_kind_of(Array)
     ts.each{|t| t.must_be_kind_of(Symbol)}
     ts.wont_include(:sequel_test_table)
     ts.must_include(:sequel_test_view)
-  end
+  end if DB.supports_view_listing?
 
-  it "should respect the database's identifier_output_method" do
+  it "#views should respect the database's identifier_output_method" do
     @db.identifier_output_method = :xxxxx
     @db.identifier_input_method = :xxxxx
     @db.views.each{|t| t.to_s.must_match(/\Ax{5}\d+\z/)}
-  end
-end if DB.supports_view_listing?
+  end if DB.supports_view_listing?
+end

data/spec/integration/transaction_test.rb

@@ -93,6 +93,16 @@ describe "Database transactions" do
       @d.select_order_map(:name).must_equal %w'1 2'
     end
 
+    it "should handle :rollback=>:always inside transactions" do
+      @db.transaction do
+        @db.transaction(:rollback=>:always) do
+          @d << {:name => 'abc', :value => 1}
+          2
+        end.must_equal 2
+      end
+      @d.select_order_map(:value).must_equal []
+    end
+
     it "should handle table_exists? failures inside savepoints" do
       @db.transaction do
         @d << {:name => '1'}

data/spec/integration/type_test.rb

@@ -38,7 +38,7 @@ describe "Supported types" do
   end
   
   it "should support generic bignum type" do
-    ds = create_items_table_with_column(:number, Bignum)
+    ds = create_items_table_with_column(:number, :Bignum)
     ds.insert(:number => 2**34)
     ds.all.must_equal [{:number=>2**34}]
   end