sequel 4.49.0 → 5.3.0

data/spec/extensions/server_block_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 with_server_specs = shared_description do
   it "should set the default server to use in the block" do

data/spec/extensions/server_logging_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "server_logging extension" do
   before do
@@ -7,7 +7,7 @@ describe "server_logging extension" do
     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)
+    @db = Sequel::mock(:test=>false, :servers=>{:read_only=>{}, :b=>{}}, :logger=>@o).extension(:server_logging)
   end
 
   it "should include shard when logging" do

data/spec/extensions/sharding_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "sharding plugin" do
   before do

data/spec/extensions/shared_caching_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "Shared caching behavior" do
   before do
@@ -91,33 +91,6 @@ describe "Shared caching behavior" do
       @c.load(:id=>3, :caching_model_id=>1).caching_model
       @db.sqls.must_equal []
     end
-
-    it "should not use a simple primary key lookup if the prepared_statements_associations method is being used" do
-      deprecated do
-        c2 = Class.new(Sequel::Model(@db[:not_caching_model].with_fetch(:id=>1)))
-        c = Class.new(Sequel::Model(@db[:lookup_model]))
-        c.class_eval do
-          plugin :prepared_statements_associations
-          columns :id, :caching_model_id
-          many_to_one :caching_model, :class=>c2
-        end
-        c.load(:id=>3, :caching_model_id=>1).caching_model.must_equal c2.load(:id=>1)
-        @db.sqls.wont_equal []
-      end
-    end
-
-    it "should use a simple primary key lookup if the prepared_statements_associations method is being used but associated model also uses caching" do
-      deprecated do
-        c = Class.new(Sequel::Model(:lookup_model))
-        c.class_eval do
-          plugin :prepared_statements_associations
-          columns :id, :caching_model_id
-          many_to_one :caching_model
-        end
-        c.load(:id=>3, :caching_model_id=>1).caching_model.must_be_same_as(@cm1)
-        @db.sqls.must_equal []
-      end
-    end
   end
 
   describe "With caching plugin" do

data/spec/extensions/single_table_inheritance_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe Sequel::Model, "single table inheritance plugin" do
   before do
@@ -106,10 +106,7 @@ describe Sequel::Model, "single table inheritance plugin" do
 
   it "should fallback to the main class if the sti_key field is empty or nil without calling constantize" do
     called = false
-    def StiTest.constantize(s)
-      called = true
-      Object
-    end
+    StiTest.define_singleton_method(:constantize){|_| called = true}
     StiTest.plugin :single_table_inheritance, :kind
     StiTest.dataset = StiTest.dataset.with_fetch([{:kind=>''}, {:kind=>nil}])
     StiTest.all.collect{|x| x.class}.must_equal [StiTest, StiTest]

data/spec/extensions/singular_table_names_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "Sequel::Plugins::SingularTableNames" do
   before do

data/spec/extensions/skip_create_refresh_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "Sequel::Plugins::SkipCreateRefresh" do
   it "should skip the refresh after saving a new object" do

data/spec/extensions/spec_helper.rb

@@ -1,8 +1,7 @@
-require 'rubygems'
-require "#{File.dirname(File.dirname(__FILE__))}/sequel_warning.rb"
+require_relative "../sequel_warning"
 
 if ENV['COVERAGE']
-  require File.join(File.dirname(File.expand_path(__FILE__)), "../sequel_coverage")
+  require_relative "../sequel_coverage"
   SimpleCov.sequel_coverage(:filter=>%r{lib/sequel/(extensions|plugins)/\w+\.rb\z})
 end
 
@@ -11,12 +10,10 @@ require 'minitest/autorun'
 require 'minitest/hooks/default'
 require 'minitest/shared_description'
 
-unless Object.const_defined?('Sequel') && Sequel.const_defined?('Model')
-  $:.unshift(File.join(File.dirname(File.expand_path(__FILE__)), "../../lib/"))
-  require 'sequel'
-end
+$:.unshift(File.join(File.dirname(File.expand_path(__FILE__)), "../../lib/"))
+require_relative "../../lib/sequel"
 
-require "#{File.dirname(File.dirname(__FILE__))}/deprecation_helper.rb"
+require_relative '../deprecation_helper'
 
 begin
   # Attempt to load ActiveSupport blank extension and inflector first, so Sequel
@@ -30,25 +27,6 @@ end
 
 Sequel.extension :core_refinements if RUBY_VERSION >= '2.0.0' && RUBY_ENGINE == 'ruby'
 
-def skip_warn(s)
-  warn "Skipping test of #{s}" if ENV["SKIPPED_TEST_WARN"]
-end
-
-class Minitest::HooksSpec
-  # SEQUEL5: Replace with define_singleton_method
-  def meta_def(obj, name, &block)
-    (class << obj; self end).send(:define_method, name, &block)
-  end
-end
-
-# 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
   alias orig_columns columns

data/spec/extensions/split_array_nil_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
+require_relative "spec_helper"
 
 describe "split_array_nil extension" do
   before do

data/spec/extensions/split_values_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "Sequel::Plugins::SplitValues" do
   before do

data/spec/extensions/sql_comments_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "sql_comments extension" do
   before do

data/spec/extensions/sql_expr_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
+require_relative "spec_helper"
 
 Sequel.extension :sql_expr
 

data/spec/extensions/static_cache_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "Sequel::Plugins::StaticCache" do
   before do

data/spec/extensions/string_agg_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 
 describe "string_agg extension" do
@@ -48,7 +48,7 @@ describe "string_agg extension" do
   it "should correctly literalize on MySQL, H2, HSQLDB" do
     [:mysql, :h2, :hsqldb].each do |type|
       db = dbf.call(type)
-      meta_def(db, :database_type){type}
+      db.define_singleton_method(:database_type){type}
       ds = db.dataset.with_quote_identifiers(false).with_extend{def input_identifier(v) v.to_s end}
       ds.literal(@sa1).upcase.must_equal "GROUP_CONCAT(C SEPARATOR ',')"
       ds.literal(@sa2).upcase.must_equal "GROUP_CONCAT(C SEPARATOR '-')"

data/spec/extensions/string_date_time_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
+require_relative "spec_helper"
 
 Sequel.extension :string_date_time
 

data/spec/extensions/string_stripper_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "Sequel::Plugins::StringStripper" do
   before do

data/spec/extensions/subclasses_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe Sequel::Model, "Subclasses plugin" do
   before do

data/spec/extensions/subset_conditions_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
+require_relative "spec_helper"
 
 describe "subset_conditions plugin" do
   before do

data/spec/extensions/symbol_aref_refinement_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 if (RUBY_VERSION >= '2.0.0' && RUBY_ENGINE == 'ruby') || (RUBY_VERSION >= '2.3.0' && RUBY_ENGINE == 'jruby')
 Sequel.extension :symbol_aref_refinement

data/spec/extensions/symbol_as_refinement_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 if (RUBY_VERSION >= '2.0.0' && RUBY_ENGINE == 'ruby') || (RUBY_VERSION >= '2.3.0' && RUBY_ENGINE == 'jruby')
 Sequel.extension :symbol_as_refinement

data/spec/extensions/synchronize_sql_spec.rb

@@ -0,0 +1,124 @@
+require_relative 'spec_helper'
+
+describe "synchronize_sql extension" do
+  module Sync
+    def literal_string_append(sql, v)
+      db.synchronize{super}
+    end
+  end
+
+  before do
+    @db = Sequel.mock
+    @db.pool.extend(Module.new do
+      def assign_connection(*args)
+        r = super
+        @times_connection_acquired ||= 0
+        @times_connection_acquired += 1 if r
+        return r
+      end
+
+      def times_connection_acquired
+        v = @times_connection_acquired
+        @times_connection_acquired = 0
+        v || 0
+      end
+    end)
+    @db.extend_datasets(Sync)
+    @ds = @db[:tab1]
+  end
+
+  it 'does not checkout a connection if SQL is given as a string' do
+    extds = @ds.extension(:synchronize_sql).with_sql('SELECT 1').sql
+    @db.pool.times_connection_acquired.must_equal 0
+  end
+
+  it 'checks out an extra connection on insert_sql if there are no strings' do
+    @ds.insert_sql(:numeric_foo => 8)
+    @db.pool.times_connection_acquired.must_equal 0
+
+    extds = @ds.extension(:synchronize_sql)
+    extds.insert_sql(:numeric_foo => 8)
+    @db.pool.times_connection_acquired.must_equal 1
+  end
+
+  it 'checks out just one connection on insert_sql if there are multiple strings' do
+    @ds.insert_sql(:string_foo1 => 'eight', :string_foo2 => 'nine', :string_foo3 => 'ten')
+    @db.pool.times_connection_acquired.must_equal 3
+
+    extds = @ds.extension(:synchronize_sql)
+    extds.insert_sql(:string_foo1 => 'eight', :string_foo2 => 'nine', :string_foo3 => 'ten')
+    @db.pool.times_connection_acquired.must_equal 1
+  end
+
+  it 'cheks out an extra connectrion on update_sql if there are no strings' do
+    @ds.where(:numeric_foo => [1, 2, 3, 4, 5]).update_sql(:numeric_foo => 99)
+    @db.pool.times_connection_acquired.must_equal 0
+
+    extds = @ds.extension(:synchronize_sql)
+    extds.where(:numeric_foo => [1, 2, 3, 4, 5]).update_sql(:numeric_foo => 99)
+    @db.pool.times_connection_acquired.must_equal 1
+  end
+
+  it 'checks out just one connection on update_sql if there are multiple strings' do
+    @ds.where(:numeric_foo => [1, 2, 3, 4, 5]).update_sql(:string_foo1 => 'eight', :string_foo2 => 'nine', :string_foo3 => 'ten')
+    @db.pool.times_connection_acquired.must_equal 3
+
+    extds = @ds.extension(:synchronize_sql)
+    extds.where(:numeric_foo => [1, 2, 3, 4, 5]).update_sql(:string_foo1 => 'eight', :string_foo2 => 'nine', :string_foo3 => 'ten')
+    @db.pool.times_connection_acquired.must_equal 1
+  end
+
+  it 'checks out an extra connection on delete_sql if there are no strings' do
+    @ds.where(:numeric_foo => [1, 2, 3]).delete_sql
+    @db.pool.times_connection_acquired.must_equal 0
+
+    extds = @ds.extension(:synchronize_sql)
+    extds.where(:numeric_foo => [1, 2, 3]).delete_sql
+    @db.pool.times_connection_acquired.must_equal 1
+  end
+
+  it 'checks out just one connection on delete_sql if there are multiple strings' do
+    @ds.where(:string_foo => ['one', 'two', 'three', 'four']).delete_sql
+    @db.pool.times_connection_acquired.must_equal 4
+
+    extds = @ds.extension(:synchronize_sql)
+    extds.where(:string_foo => ['one', 'two', 'three', 'four']).delete_sql
+    @db.pool.times_connection_acquired.must_equal 1
+  end
+
+  it 'checks out an extra connection on select_sql if there are no strings' do
+    @ds.where(:numeric_foo => [1, 2, 3]).select_sql
+    @db.pool.times_connection_acquired.must_equal 0
+
+    extds = @ds.extension(:synchronize_sql)
+    extds.where(:numeric_foo => [1, 2, 3]).select_sql
+    @db.pool.times_connection_acquired.must_equal 1
+  end
+
+  it 'checks out just one connection on select_sql if there are multiple strings' do
+    @ds.where(:string_foo => ['one', 'two', 'three', 'four']).select_sql
+    @db.pool.times_connection_acquired.must_equal 4
+
+    extds = @ds.extension(:synchronize_sql)
+    extds.where(:string_foo => ['one', 'two', 'three', 'four']).select_sql
+    @db.pool.times_connection_acquired.must_equal 1
+  end
+
+  it 'checks out an extra connection on fetch if there are no strings' do
+    @db.fetch('SELECT * FROM tab1 WHERE numeric_foo IN (?, ?, ?, ?)', 1, 2, 3, 4).select_sql
+    @db.pool.times_connection_acquired.must_equal 0
+
+    @db.extension(:synchronize_sql)
+    @db.fetch('SELECT * FROM tab1 WHERE numeric_foo IN (?, ?, ?, ?)', 1, 2, 3, 4).select_sql
+    @db.pool.times_connection_acquired.must_equal 1
+  end
+
+  it 'checks out just one connection on fetch if there are multiple strings' do
+    @db.fetch('SELECT * FROM tab1 WHERE string_foo IN (?, ?, ?, ?)', 'one', 'two', 'three', 'four').select_sql
+    @db.pool.times_connection_acquired.must_equal 4
+
+    @db.extension(:synchronize_sql)
+    @db.fetch('SELECT * FROM tab1 WHERE string_foo IN (?, ?, ?, ?)', 'one', 'two', 'three', 'four').select_sql
+    @db.pool.times_connection_acquired.must_equal 1
+  end
+end

data/spec/extensions/table_select_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "Sequel::Plugins::TableSelect" do
   before do
@@ -64,13 +64,13 @@ describe "Sequel::Plugins::TableSelect" do
     @Album.dataset.sql.must_equal 'SELECT foo.* FROM (SELECT * FROM a1 CROSS JOIN a2) AS foo'
   end
 
-  deprecated "should not add a table.* selection on existing dataset with multiple tables" do
+  it "should work with implicit subqueries used for joined datasets" do
     @Album.dataset = @Album.db.from(:a1, :a2)
     @Album.plugin :table_select
-    @Album.dataset.sql.must_equal 'SELECT * FROM a1, a2'
+    @Album.dataset.sql.must_equal 'SELECT a1.* FROM (SELECT * FROM a1, a2) AS a1'
 
     @Album.dataset = @Album.db.from(:a1).cross_join(:a2)
-    @Album.dataset.sql.must_equal 'SELECT * FROM a1 CROSS JOIN a2'
+    @Album.dataset.sql.must_equal 'SELECT a1.* FROM (SELECT * FROM a1 CROSS JOIN a2) AS a1'
   end
 
   it "works correctly when loaded on model without a dataset" do

data/spec/extensions/tactical_eager_loading_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "Sequel::Plugins::TacticalEagerLoading" do
   def sql_match(*args)
@@ -77,11 +77,6 @@ describe "Sequel::Plugins::TacticalEagerLoading" do
     sql_match('SELECT * FROM t WHERE (t.id = 101) LIMIT 1', 'SELECT * FROM t WHERE (t.id = 102) LIMIT 1')
   end
 
-  deprecated "association getter methods should not eagerly load the association if true is passed" do
-    ts.map{|x| x.parent(true)}.must_equal [ts[2], ts[3], nil, nil]
-    sql_match('SELECT * FROM t WHERE id = 101', 'SELECT * FROM t WHERE id = 102')
-  end
-
   it "association getter methods should not eagerly load the association if :reload=>true is passed" do
     ts.map{|x| x.parent(:reload=>true)}.must_equal [ts[2], ts[3], nil, nil]
     sql_match('SELECT * FROM t WHERE id = 101', 'SELECT * FROM t WHERE id = 102')

data/spec/extensions/thread_local_timezones_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 Sequel.extension :thread_local_timezones
 

data/spec/extensions/timestamps_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "Sequel::Plugins::Timestamps" do
   before do
@@ -76,9 +76,7 @@ describe "Sequel::Plugins::Timestamps" do
   it "should use the same value for the creation and update timestamps when creating if the :update_on_create option is given" do
     @c.plugin :timestamps, :update_on_create=>true
     o = @c.create
-    sqls = @c.db.sqls
-    sqls.shift.must_match(/INSERT INTO t \((creat|updat)ed_at, (creat|updat)ed_at\) VALUES \('2009-08-01', '2009-08-01'\)/)
-    sqls.must_equal []
+    @c.db.sqls.must_equal ["INSERT INTO t (created_at, updated_at) VALUES ('2009-08-01', '2009-08-01')"]
     o.created_at.must_be :===, o.updated_at
   end
 
@@ -134,7 +132,7 @@ describe "Sequel::Plugins::Timestamps" do
 
   it "should set update timestamp to same timestamp as create timestamp when setting creating timestamp" do
     i = 1
-    (class << (Sequel.datetime_class); self end).send(:define_method, :now){"2009-08-0#{i+=1}"}
+    Sequel.datetime_class.define_singleton_method(:now){"2009-08-0#{i+=1}"}
     @c.plugin :timestamps, :update_on_create=>true
     o = @c.create
     sqls = @c.db.sqls
@@ -147,7 +145,7 @@ describe "Sequel::Plugins::Timestamps" do
 
   it "should set update timestamp when using not overriding create timestamp" do
     i = 1
-    (class << (Sequel.datetime_class); self end).send(:define_method, :now){"2009-08-0#{i+=1}"}
+    Sequel.datetime_class.define_singleton_method(:now){"2009-08-0#{i+=1}"}
     @c.plugin :timestamps, :update_on_create=>true
     o = @c.create(:created_at=>'2009-08-10')
     sqls = @c.db.sqls
@@ -201,7 +199,7 @@ describe "Sequel::Plugins::Timestamps" do
     o = c2.create
     o.c.must_equal '2009-08-01'
     o.u.must_be :===, o.c 
-    c2.db.sqls.first.must_match(/INSERT INTO t \([cu], [cu]\) VALUES \('2009-08-01', '2009-08-01'\)/)
+    c2.db.sqls.must_equal ["INSERT INTO t (c, u) VALUES ('2009-08-01', '2009-08-01')"]
     c2.db.reset
     o = c2.load(:id=>1).save
     o.u.must_equal '2009-08-01'

data/spec/extensions/to_dot_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe Sequel::Model, "to_dot extension" do
   def dot(ds)

data/spec/extensions/touch_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "Touch plugin" do
   before do

data/spec/extensions/tree_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe Sequel::Model, "tree plugin" do
   def klass(opts={})

data/spec/extensions/typecast_on_load_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe Sequel::Model, "TypecastOnLoad plugin" do
   before do

data/spec/extensions/unlimited_update_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "Sequel::Plugins::UnlimitedUpdate" do
   before do

data/spec/extensions/update_or_create_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "Sequel::Plugins::UpdateOrCreate" do
   before do
@@ -20,32 +20,28 @@ describe "Sequel::Plugins::UpdateOrCreate" do
 
     @db.fetch = [[{:id=>1, :a=>2, :b=>3}]]
     @c.update_or_create({:a=>2}, :a=>3){|t| t.b = 4}.must_equal @c.load(:id=>1, :a=>3, :b=>4)
-    sqls = @db.sqls
-    sqls.shift.must_equal "SELECT * FROM test WHERE (a = 2) LIMIT 1"
-    sqls.shift.must_match(/UPDATE test SET [ab] = [34], [ab] = [34] WHERE \(id = 1\)/)
+    @db.sqls.must_equal ["SELECT * FROM test WHERE (a = 2) LIMIT 1",
+      'UPDATE test SET a = 3, b = 4 WHERE (id = 1)']
   end
 
   it ".update_or_create should create a record if an existing record does not exist" do
     @db.fetch = [[], [{:id=>1, :a=>1, :b=>4}]]
     @c.update_or_create(:a=>1){|t| t.b = 4}.must_equal @c.load(:id=>1, :a=>1, :b=>4)
-    sqls = @db.sqls
-    sqls.shift.must_equal "SELECT * FROM test WHERE (a = 1) LIMIT 1"
-    sqls.shift.must_match(/INSERT INTO test \([ab], [ab]\) VALUES \([14], [14]\)/)
-    sqls.shift.must_equal "SELECT * FROM test WHERE (id = 1) LIMIT 1"
+    @db.sqls.must_equal ["SELECT * FROM test WHERE (a = 1) LIMIT 1",
+      "INSERT INTO test (a, b) VALUES (1, 4)",
+      "SELECT * FROM test WHERE (id = 1) LIMIT 1"]
 
     @db.fetch = [[], [{:id=>1, :a=>1, :b=>4}]]
     @c.update_or_create({:a=>1}, :b=>4).must_equal @c.load(:id=>1, :a=>1, :b=>4)
-    sqls = @db.sqls
-    sqls.shift.must_equal "SELECT * FROM test WHERE (a = 1) LIMIT 1"
-    sqls.shift.must_match(/INSERT INTO test \([ab], [ab]\) VALUES \([14], [14]\)/)
-    sqls.shift.must_equal "SELECT * FROM test WHERE (id = 1) LIMIT 1"
+    @db.sqls.must_equal ["SELECT * FROM test WHERE (a = 1) LIMIT 1",
+      "INSERT INTO test (a, b) VALUES (1, 4)",
+      "SELECT * FROM test WHERE (id = 1) LIMIT 1"]
 
     @db.fetch = [[], [{:id=>1, :a=>3, :b=>4}]]
     @c.update_or_create({:a=>1}, :a=>3){|t| t.b = 4}.must_equal @c.load(:id=>1, :a=>3, :b=>4)
-    sqls = @db.sqls
-    sqls.shift.must_equal "SELECT * FROM test WHERE (a = 1) LIMIT 1"
-    sqls.shift.must_match(/INSERT INTO test \([ab], [ab]\) VALUES \([34], [34]\)/)
-    sqls.shift.must_equal "SELECT * FROM test WHERE (id = 1) LIMIT 1"
+    @db.sqls.must_equal ["SELECT * FROM test WHERE (a = 1) LIMIT 1",
+      "INSERT INTO test (a, b) VALUES (3, 4)",
+      "SELECT * FROM test WHERE (id = 1) LIMIT 1"]
   end
 
   it ".update_or_create should return an existing record even if no changes necessary" do

data/spec/extensions/update_primary_key_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "Sequel::Plugins::UpdatePrimaryKey" do
   before do
@@ -74,7 +74,7 @@ describe "Sequel::Plugins::UpdatePrimaryKey" do
 
   it "should work correctly when using the prepared_statements plugin" do
     @c.plugin :prepared_statements
-    @c.dataset = @c.dataset.with_fetch([[{:a=>1, :b=>3}], [{:a=>2, :b=>4}]])
+    @c.dataset = @c.dataset.with_fetch([[{:a=>1, :b=>3}], [{:a=>2, :b=>4}], [{:a=>3}]])
     o = @c.first
     o.update(:a=>2, :b=>4)
     @c.all.must_equal [@c.load(:a=>2, :b=>4)]
@@ -82,7 +82,8 @@ describe "Sequel::Plugins::UpdatePrimaryKey" do
     ["UPDATE a SET a = 2, b = 4 WHERE (a = 1)", "UPDATE a SET b = 4, a = 2 WHERE (a = 1)"].must_include(sqls.slice!(1))
     sqls.must_equal ["SELECT * FROM a LIMIT 1", "SELECT * FROM a"]
 
-    o.delete
+    @c.create(:a=>3)
+    DB.sqls.must_equal ["INSERT INTO a (a) VALUES (3)", "SELECT * FROM a WHERE a = 3"]
   end
 
   it "should clear the associations cache of non-many_to_one associations when changing the primary key" do

data/spec/extensions/update_refresh_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "Sequel::Plugins::UpdateRefresh" do
   before do

data/spec/extensions/uuid_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "Sequel::Plugins::Uuid" do
   before do
@@ -37,18 +37,15 @@ describe "Sequel::Plugins::Uuid" do
     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]+/)
+  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.must_equal ["INSERT INTO t (u) VALUES ('#{o.u}')"]
   end
 
   it "should not raise an error if the model doesn't have the uuid column" do
@@ -99,6 +96,6 @@ describe "Sequel::Plugins::Uuid" do
     c2.db.reset
     o = c2.create
     o.u.must_equal @uuid
-    c2.db.sqls.first.must_match(/INSERT INTO t \([u]\) VALUES \('#{@uuid}'\)/)
+    c2.db.sqls.must_equal ["INSERT INTO t (u) VALUES ('#{@uuid}')"]
   end
 end

data/spec/extensions/validate_associated_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "ValidatesAssociated plugin" do
   before do