sequel 4.49.0 → 5.3.0

data/spec/extensions/prepared_statements_safe_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "prepared_statements_safe plugin" do
   before do
@@ -23,30 +23,30 @@ describe "prepared_statements_safe plugin" do
 
   it "should set default values when creating" do
     @c.create
-    @db.sqls.first.must_match(/INSERT INTO people \((i|name), (i|name)\) VALUES \(NULL, NULL\)/)
+    @db.sqls.must_equal ['INSERT INTO people (i, name) VALUES (NULL, NULL)', "SELECT * FROM people WHERE (id = 1) LIMIT 1"]
     @c.create(:name=>'foo')
-    @db.sqls.first.must_match(/INSERT INTO people \((i|name), (i|name)\) VALUES \((NULL|'foo'), (NULL|'foo')\)/)
+    @db.sqls.must_equal ["INSERT INTO people (i, name) VALUES (NULL, 'foo')", "SELECT * FROM people WHERE (id = 1) LIMIT 1"]
     @c.create(:name=>'foo', :i=>2)
-    @db.sqls.first.must_match(/INSERT INTO people \((i|name), (i|name)\) VALUES \((2|'foo'), (2|'foo')\)/)
+    @db.sqls.must_equal ["INSERT INTO people (i, name) VALUES (2, 'foo')", "SELECT * FROM people WHERE (id = 1) LIMIT 1"]
   end 
 
   it "should use database default values" do
     @c.instance_variable_set(:@db_schema, {:i=>{:ruby_default=>2}, :name=>{:ruby_default=>'foo'}, :id=>{:primary_key=>true}})
     c = Class.new(@c)
     c.create
-    @db.sqls.first.must_match(/INSERT INTO people \((i|name), (i|name)\) VALUES \((2|'foo'), (2|'foo')\)/)
+    @db.sqls.must_equal ["INSERT INTO people (i, name) VALUES (2, 'foo')", "SELECT * FROM people WHERE (id = 1) LIMIT 1"]
   end
 
   it "should not set defaults for unparseable dataset default values" do
     @c.instance_variable_set(:@db_schema, {:i=>{:default=>'f(x)'}, :name=>{:ruby_default=>'foo'}, :id=>{:primary_key=>true}})
     c = Class.new(@c)
     c.create
-    @db.sqls.first.must_equal "INSERT INTO people (name) VALUES ('foo')"
+    @db.sqls.must_equal ["INSERT INTO people (name) VALUES ('foo')", "SELECT * FROM people WHERE (id = 1) LIMIT 1"]
   end
 
   it "should save all fields when updating" do
     @p.update(:i=>3)
-    @db.sqls.first.must_match(/UPDATE people SET (name = 'foo'|i = 3), (name = 'foo'|i = 3) WHERE \(id = 1\)/)
+    @db.sqls.must_equal ["UPDATE people SET name = 'foo', i = 3 WHERE (id = 1)"]
   end
 
   it "should work with abstract classes" do

data/spec/extensions/prepared_statements_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "prepared_statements plugin" do
   before do
@@ -13,11 +13,11 @@ describe "prepared_statements plugin" do
     @db.sqls
   end
 
-  deprecated "should correctly lookup by primary key for joined dataset" do
+  it "should work with implicit subqueries used for joined datasets" do
     @c.dataset = @c.dataset.from(:people, :people2)
     @db.sqls
     @c[1].must_equal @p
-    @db.sqls.must_equal ["SELECT * FROM people, people2 WHERE (people.id = 1) LIMIT 1 -- read_only"]
+    @db.sqls.must_equal ["SELECT * FROM (SELECT * FROM people, people2) AS people WHERE (id = 1) LIMIT 1 -- read_only"]
   end 
 
   it "should correctly lookup by primary key for dataset using subquery" do
@@ -32,33 +32,12 @@ describe "prepared_statements plugin" do
     @c.set_primary_key [:id, :name]
     @c.send(:use_prepared_statements_for_pk_lookup?).must_equal true
     @c.set_primary_key :id
-    deprecated do
     @c.dataset = @c.dataset.from(:people, :people2)
-    @c.send(:use_prepared_statements_for_pk_lookup?).must_equal false
-    end
+    @c.send(:use_prepared_statements_for_pk_lookup?).must_equal true
     @c.dataset = @db[:people].select(:id, :name, :i)
     @c.send(:use_prepared_statements_for_pk_lookup?).must_equal true
   end
 
-  it "should use prepared statements for refreshes if default is not optimized" do
-    @p.send(:use_prepared_statements_for?, :refresh).must_equal false 
-    @c.set_primary_key [:id, :name]
-    @p.send(:use_prepared_statements_for?, :refresh).must_equal true
-  end
-
-  it "should use prepared statements for deletes if default is not optimized" do
-    @p.send(:use_prepared_statements_for?, :delete).must_equal false 
-    @c.set_primary_key [:id, :name]
-    @p.send(:use_prepared_statements_for?, :delete).must_equal true
-  end
-
-  it "should use prepared statements for deletes if default on Oracle and DB2" do
-    def @db.database_type; :oracle end
-    @p.send(:use_prepared_statements_for?, :delete).must_equal true
-    def @db.database_type; :db2 end
-    @p.send(:use_prepared_statements_for?, :delete).must_equal true
-  end
-
   it "should raise Error for unsupported prepared statement types" do
     proc{@p.send(:use_prepared_statements_for?, :foo)}.must_raise Sequel::Error
   end
@@ -102,22 +81,7 @@ describe "prepared_statements plugin" do
 
     it "should correctly create instance" do
       @c.create(:name=>'foo').must_equal @c.load(:id=>1, :name=>'foo', :i => 2)
-      @db.sqls.must_equal ["INSERT INTO people (name) VALUES ('foo')", "SELECT #{@columns} FROM people WHERE (id = 1) LIMIT 1"]
-    end
-
-    it "should correctly lookup by primary key" do
-      @c[1].must_equal @p
-      @db.sqls.must_equal ["SELECT id, name, i FROM people WHERE (id = 1) LIMIT 1 -- read_only"]
-    end 
-
-    it "should correctly delete instance" do
-      @p.destroy.must_equal @p
-      @db.sqls.must_equal ["DELETE FROM people WHERE (id = 1)"]
-    end
-
-    it "should correctly delete instance when specifying server" do
-      @p.set_server(:read_only).destroy.must_equal @p
-      @db.sqls.must_equal ["DELETE FROM people WHERE (id = 1) -- read_only"]
+      @db.sqls.must_equal ["INSERT INTO people (name) VALUES ('foo')", "SELECT * FROM people WHERE id = 1"]
     end
 
     it "should correctly update instance when specifying server" do
@@ -127,7 +91,7 @@ describe "prepared_statements plugin" do
 
     it "should correctly create instance when specifying server" do
       @c.new(:name=>'foo').set_server(:read_only).save.must_equal @c.load(:id=>1, :name=>'foo', :i => 2)
-      @db.sqls.must_equal ["INSERT INTO people (name) VALUES ('foo') -- read_only", "SELECT #{@columns} FROM people WHERE (id = 1) LIMIT 1 -- read_only"]
+      @db.sqls.must_equal ["INSERT INTO people (name) VALUES ('foo') -- read_only", "SELECT * FROM people WHERE id = 1 -- read_only"]
     end
 
     it "should correctly create instance if dataset supports insert_select when specifying server" do
@@ -152,14 +116,15 @@ describe "prepared_statements plugin" do
 
     it "should work correctly when subclassing" do
       c = Class.new(@c)
-      c[1].must_equal c.load(:id=>1, :name=>'foo', :i=>2)
-      @db.sqls.must_equal ["SELECT id, name, i FROM people WHERE (id = 1) LIMIT 1 -- read_only"]
+      @db.sqls
+      c.load(:id=>1, :name=>'foo', :i=>2).save
+      @db.sqls.must_equal ["UPDATE people SET name = 'foo', i = 2 WHERE (id = 1)"]
     end 
 
     it "should correctly handle without schema type when placeholder type specifiers are required" do
       @c.dataset = @ds.with_extend{def requires_placeholder_type_specifiers?; true end}
-      @c[1].must_equal @p
-      @db.sqls.must_equal ["SELECT id, name, i FROM people WHERE (id = 1) LIMIT 1 -- read_only"]
+      @p.save
+      @db.sqls.must_equal ["UPDATE people SET name = 'foo', i = 2 WHERE (id = 1)"]
     end
 
     it "should correctly handle with schema type when placeholder type specifiers are required" do
@@ -183,8 +148,8 @@ describe "prepared_statements plugin" do
         end
       end
       @c.db_schema[:id][:type] = :integer
-      @c[1].must_equal @p
-      @db.sqls.must_equal ["SELECT id, name, i FROM people WHERE (id = 1) LIMIT 1 -- read_only"]
+      @p.save
+      @db.sqls.must_equal ["UPDATE people SET name = 'foo', i = 2 WHERE (id = 1)"]
     end 
   end
 

data/spec/extensions/pretty_table_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
+require_relative "spec_helper"
 
 require 'stringio'
 Sequel.extension :pretty_table
@@ -60,11 +60,23 @@ describe "PrettyTable" do
   it "should infer the columns if not given" do
     Sequel::PrettyTable.print(@data1)
     @output.rewind
-    @output.read.must_match(/\n(\|x\|y\|)|(\|y\|x\|)\n/)
+    @output.read.must_equal(<<OUTPUT)
++-+-+
+|x|y|
++-+-+
+|3|4|
++-+-+
+OUTPUT
   end
   
   it "should have #string return the string without printing" do
-    Sequel::PrettyTable.string(@data1).must_match(/\n(\|x\|y\|)|(\|y\|x\|)\n/)
+    Sequel::PrettyTable.string(@data1).must_equal((<<OUTPUT).chomp)
++-+-+
+|x|y|
++-+-+
+|3|4|
++-+-+
+OUTPUT
     @output.rewind
     @output.read.must_equal ''
   end
@@ -72,21 +84,40 @@ describe "PrettyTable" do
   it "should calculate the maximum width of each column correctly" do
     Sequel::PrettyTable.print(@data2, [:a, :b])
     @output.rewind
-    @output.read.must_equal \
-      "+--+----+\n|a |b   |\n+--+----+\n|23|  45|\n|45|2377|\n+--+----+\n"
+    @output.read.must_equal(<<OUTPUT)
++--+----+
+|a |b   |
++--+----+
+|23|  45|
+|45|2377|
++--+----+
+OUTPUT
   end
 
   it "should also take header width into account" do
     Sequel::PrettyTable.print(@data3, [:aaa, :bb, :c])
     @output.rewind
-    @output.read.must_equal \
-      "+---+--+---+\n|aaa|bb|c  |\n+---+--+---+\n|  1|  |   |\n|   | 2|   |\n|   |  |3.1|\n+---+--+---+\n"
+    @output.read.must_equal(<<OUTPUT)
++---+--+---+
+|aaa|bb|c  |
++---+--+---+
+|  1|  |   |
+|   | 2|   |
+|   |  |3.1|
++---+--+---+
+OUTPUT
   end
   
   it "should print only the specified columns" do
     Sequel::PrettyTable.print(@data2, [:a])
     @output.rewind
-    @output.read.must_equal \
-      "+--+\n|a |\n+--+\n|23|\n|45|\n+--+\n"
+    @output.read.must_equal(<<OUTPUT)
++--+
+|a |
++--+
+|23|
+|45|
++--+
+OUTPUT
   end
 end

data/spec/extensions/query_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "Database#query" do
   before do
@@ -87,17 +87,6 @@ describe "Dataset#query" do
     q.sql.must_equal "SELECT * FROM xyz"
   end
   
-  # SEQUEL5: Remove
-  unless Sequel.mock.dataset.frozen?
-    deprecated "should have an appropriate mutation method" do
-      @d.query! do
-        select :a, Sequel[:b].as(:mongo)
-        from :yyy
-      end
-      @d.sql.must_equal "SELECT a, b AS mongo FROM yyy"
-    end
-  end
-
   it "should raise on non-chainable method calls" do
     proc {@d.query {row_proc}}.must_raise(Sequel::Error)
     proc {@d.query {all}}.must_raise(Sequel::Error)

data/spec/extensions/rcte_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, "rcte_tree" do
   before do
@@ -121,9 +121,8 @@ describe Sequel::Model, "rcte_tree" do
        {:id=>1, :name=>'00', :parent_id=>8, :x_root_x=>1}, {:id=>1, :name=>'00', :parent_id=>8, :x_root_x=>2},
        {:id=>8, :name=>'?', :parent_id=>nil, :x_root_x=>2}, {:id=>8, :name=>'?', :parent_id=>nil, :x_root_x=>1}]])
     os = @ds.eager(:ancestors).all
-    sqls = @db.sqls
-    sqls.first.must_equal "SELECT * FROM nodes"
-    sqls.last.must_match(/WITH t AS \(SELECT id AS x_root_x, nodes\.\* FROM nodes WHERE \(id IN \([12], [12]\)\) UNION ALL SELECT t\.x_root_x, nodes\.\* FROM nodes INNER JOIN t ON \(t\.parent_id = nodes\.id\)\) SELECT \* FROM t AS nodes/)
+    @db.sqls.must_equal ["SELECT * FROM nodes",
+      'WITH t AS (SELECT id AS x_root_x, nodes.* FROM nodes WHERE (id IN (1, 2)) UNION ALL SELECT t.x_root_x, nodes.* FROM nodes INNER JOIN t ON (t.parent_id = nodes.id)) SELECT * FROM t AS nodes']
     os.must_equal [@c.load(:id=>2, :parent_id=>1, :name=>'AA'), @c.load(:id=>6, :parent_id=>2, :name=>'C'), @c.load(:id=>7, :parent_id=>1, :name=>'D'), @c.load(:id=>9, :parent_id=>nil, :name=>'E')]
     os.map{|o| o.ancestors}.must_equal [[@c.load(:id=>1, :name=>'00', :parent_id=>8), @c.load(:id=>8, :name=>'?', :parent_id=>nil)],
       [@c.load(:id=>2, :name=>'AA', :parent_id=>1), @c.load(:id=>1, :name=>'00', :parent_id=>8), @c.load(:id=>8, :name=>'?', :parent_id=>nil)],
@@ -143,9 +142,8 @@ describe Sequel::Model, "rcte_tree" do
        {:i=>1, :name=>'00', :pi=>8, :kal=>1}, {:i=>1, :name=>'00', :pi=>8, :kal=>2},
        {:i=>8, :name=>'?', :pi=>nil, :kal=>2}, {:i=>8, :name=>'?', :pi=>nil, :kal=>1}]])
     os = @ds.eager(:as).all
-    sqls = @db.sqls
-    sqls.first.must_equal "SELECT * FROM nodes"
-    sqls.last.must_match(/WITH cte AS \(SELECT i AS kal, nodes\.\* FROM nodes WHERE \(i IN \([12], [12]\)\) UNION ALL SELECT cte\.kal, nodes\.\* FROM nodes INNER JOIN cte ON \(cte\.pi = nodes\.i\)\) SELECT \* FROM cte/)
+    @db.sqls.must_equal ["SELECT * FROM nodes",
+      'WITH cte AS (SELECT i AS kal, nodes.* FROM nodes WHERE (i IN (1, 2)) UNION ALL SELECT cte.kal, nodes.* FROM nodes INNER JOIN cte ON (cte.pi = nodes.i)) SELECT * FROM cte AS nodes']
     os.must_equal [@c.load(:i=>2, :pi=>1, :name=>'AA'), @c.load(:i=>6, :pi=>2, :name=>'C'), @c.load(:i=>7, :pi=>1, :name=>'D'), @c.load(:i=>9, :pi=>nil, :name=>'E')]
     os.map{|o| o.as}.must_equal [[@c.load(:i=>1, :name=>'00', :pi=>8), @c.load(:i=>8, :name=>'?', :pi=>nil)],
       [@c.load(:i=>2, :name=>'AA', :pi=>1), @c.load(:i=>1, :name=>'00', :pi=>8), @c.load(:i=>8, :name=>'?', :pi=>nil)],
@@ -164,9 +162,8 @@ describe Sequel::Model, "rcte_tree" do
        {:id=>1, :name=>'00', :parent_id=>8, :x_root_x=>1}, {:id=>1, :name=>'00', :parent_id=>8, :x_root_x=>2},
        {:id=>8, :name=>'?', :parent_id=>nil, :x_root_x=>2}, {:id=>8, :name=>'?', :parent_id=>nil, :x_root_x=>1}]])
     @ds.eager(:ancestors).all
-    sqls = @db.sqls
-    sqls.first.must_equal "SELECT * FROM nodes"
-    sqls.last.must_match(/WITH t AS \(SELECT id AS x_root_x, nodes\.\* FROM nodes WHERE \(\(id IN \([12], [12]\)\) AND \(i = 1\)\) UNION ALL SELECT t\.x_root_x, nodes\.\* FROM nodes INNER JOIN t ON \(t\.parent_id = nodes\.id\) WHERE \(i = 1\)\) SELECT \* FROM t AS nodes WHERE \(i = 1\)/)
+    @db.sqls.must_equal ["SELECT * FROM nodes",
+      'WITH t AS (SELECT id AS x_root_x, nodes.* FROM nodes WHERE ((id IN (1, 2)) AND (i = 1)) UNION ALL SELECT t.x_root_x, nodes.* FROM nodes INNER JOIN t ON (t.parent_id = nodes.id) WHERE (i = 1)) SELECT * FROM t AS nodes WHERE (i = 1)']
   end
 
   it "should eagerly load descendants" do
@@ -176,9 +173,8 @@ describe Sequel::Model, "rcte_tree" do
        {:id=>3, :name=>'00', :parent_id=>6, :x_root_x=>6}, {:id=>3, :name=>'00', :parent_id=>6, :x_root_x=>2},
        {:id=>4, :name=>'?', :parent_id=>7, :x_root_x=>7}, {:id=>5, :name=>'?', :parent_id=>4, :x_root_x=>7}]])
     os = @ds.eager(:descendants).all
-    sqls = @db.sqls
-    sqls.first.must_equal "SELECT * FROM nodes"
-    sqls.last.must_match(/WITH t AS \(SELECT parent_id AS x_root_x, nodes\.\* FROM nodes WHERE \(parent_id IN \([267], [267], [267]\)\) UNION ALL SELECT t\.x_root_x, nodes\.\* FROM nodes INNER JOIN t ON \(t\.id = nodes\.parent_id\)\) SELECT \* FROM t AS nodes/)
+    @db.sqls.must_equal ["SELECT * FROM nodes",
+      'WITH t AS (SELECT parent_id AS x_root_x, nodes.* FROM nodes WHERE (parent_id IN (2, 6, 7)) UNION ALL SELECT t.x_root_x, nodes.* FROM nodes INNER JOIN t ON (t.id = nodes.parent_id)) SELECT * FROM t AS nodes']
     os.must_equal [@c.load(:id=>2, :parent_id=>1, :name=>'AA'), @c.load(:id=>6, :parent_id=>2, :name=>'C'), @c.load(:id=>7, :parent_id=>1, :name=>'D')]
     os.map{|o| o.descendants}.must_equal [[@c.load(:id=>6, :parent_id=>2, :name=>'C'), @c.load(:id=>9, :parent_id=>2, :name=>'E'), @c.load(:id=>3, :name=>'00', :parent_id=>6)],
       [@c.load(:id=>3, :name=>'00', :parent_id=>6)],
@@ -198,9 +194,8 @@ describe Sequel::Model, "rcte_tree" do
        {:i=>3, :name=>'00', :pi=>6, :kal=>6}, {:i=>3, :name=>'00', :pi=>6, :kal=>2},
        {:i=>4, :name=>'?', :pi=>7, :kal=>7}, {:i=>5, :name=>'?', :pi=>4, :kal=>7}]])
     os = @ds.eager(:ds).all
-    sqls = @db.sqls
-    sqls.first.must_equal "SELECT * FROM nodes"
-    sqls.last.must_match(/WITH cte AS \(SELECT pi AS kal, nodes\.\* FROM nodes WHERE \(pi IN \([267], [267], [267]\)\) UNION ALL SELECT cte\.kal, nodes\.\* FROM nodes INNER JOIN cte ON \(cte\.i = nodes\.pi\)\) SELECT \* FROM cte/)
+    @db.sqls.must_equal ["SELECT * FROM nodes",
+      'WITH cte AS (SELECT pi AS kal, nodes.* FROM nodes WHERE (pi IN (2, 6, 7)) UNION ALL SELECT cte.kal, nodes.* FROM nodes INNER JOIN cte ON (cte.i = nodes.pi)) SELECT * FROM cte AS nodes']
     os.must_equal [@c.load(:i=>2, :pi=>1, :name=>'AA'), @c.load(:i=>6, :pi=>2, :name=>'C'), @c.load(:i=>7, :pi=>1, :name=>'D')]
     os.map{|o| o.ds}.must_equal [[@c.load(:i=>6, :pi=>2, :name=>'C'), @c.load(:i=>9, :pi=>2, :name=>'E'), @c.load(:i=>3, :name=>'00', :pi=>6)],
       [@c.load(:i=>3, :name=>'00', :pi=>6)],
@@ -218,9 +213,8 @@ describe Sequel::Model, "rcte_tree" do
        {:id=>3, :name=>'00', :parent_id=>6, :x_root_x=>6, :x_level_x=>0}, {:id=>3, :name=>'00', :parent_id=>6, :x_root_x=>2, :x_level_x=>1},
        {:id=>4, :name=>'?', :parent_id=>7, :x_root_x=>7, :x_level_x=>0}, {:id=>5, :name=>'?', :parent_id=>4, :x_root_x=>7, :x_level_x=>1}]])
     os = @ds.eager(:descendants=>2).all
-    sqls = @db.sqls
-    sqls.first.must_equal "SELECT * FROM nodes"
-    sqls.last.must_match(/WITH t AS \(SELECT parent_id AS x_root_x, nodes\.\*, CAST\(0 AS integer\) AS x_level_x FROM nodes WHERE \(parent_id IN \([267], [267], [267]\)\) UNION ALL SELECT t\.x_root_x, nodes\.\*, \(t\.x_level_x \+ 1\) AS x_level_x FROM nodes INNER JOIN t ON \(t\.id = nodes\.parent_id\) WHERE \(t\.x_level_x < 1\)\) SELECT \* FROM t AS nodes/)
+    @db.sqls.must_equal ["SELECT * FROM nodes",
+      'WITH t AS (SELECT parent_id AS x_root_x, nodes.*, CAST(0 AS integer) AS x_level_x FROM nodes WHERE (parent_id IN (2, 6, 7)) UNION ALL SELECT t.x_root_x, nodes.*, (t.x_level_x + 1) AS x_level_x FROM nodes INNER JOIN t ON (t.id = nodes.parent_id) WHERE (t.x_level_x < 1)) SELECT * FROM t AS nodes']
     os.must_equal [@c.load(:id=>2, :parent_id=>1, :name=>'AA'), @c.load(:id=>6, :parent_id=>2, :name=>'C'), @c.load(:id=>7, :parent_id=>1, :name=>'D')]
     os.map{|o| o.descendants}.must_equal [[@c.load(:id=>6, :parent_id=>2, :name=>'C'), @c.load(:id=>9, :parent_id=>2, :name=>'E'), @c.load(:id=>3, :name=>'00', :parent_id=>6)],
       [@c.load(:id=>3, :name=>'00', :parent_id=>6)],
@@ -238,9 +232,8 @@ describe Sequel::Model, "rcte_tree" do
        {:i=>3, :name=>'00', :pi=>6, :kal=>6, :lal=>0}, {:i=>3, :name=>'00', :pi=>6, :kal=>2, :lal=>1},
        {:i=>4, :name=>'?', :pi=>7, :kal=>7, :lal=>0}, {:i=>5, :name=>'?', :pi=>4, :kal=>7, :lal=>1}]])
     os = @ds.eager(:ds=>2).all
-    sqls = @db.sqls
-    sqls.first.must_equal "SELECT * FROM nodes"
-    sqls.last.must_match(/WITH cte AS \(SELECT pi AS kal, nodes\.\*, CAST\(0 AS integer\) AS lal FROM nodes WHERE \(pi IN \([267], [267], [267]\)\) UNION ALL SELECT cte\.kal, nodes\.\*, \(cte\.lal \+ 1\) AS lal FROM nodes INNER JOIN cte ON \(cte\.i = nodes\.pi\) WHERE \(cte\.lal < 1\)\) SELECT \* FROM cte/)
+    @db.sqls.must_equal ["SELECT * FROM nodes",
+      'WITH cte AS (SELECT pi AS kal, nodes.*, CAST(0 AS integer) AS lal FROM nodes WHERE (pi IN (2, 6, 7)) UNION ALL SELECT cte.kal, nodes.*, (cte.lal + 1) AS lal FROM nodes INNER JOIN cte ON (cte.i = nodes.pi) WHERE (cte.lal < 1)) SELECT * FROM cte AS nodes']
     os.must_equal [@c.load(:i=>2, :pi=>1, :name=>'AA'), @c.load(:i=>6, :pi=>2, :name=>'C'), @c.load(:i=>7, :pi=>1, :name=>'D')]
     os.map{|o| o.ds}.must_equal [[@c.load(:i=>6, :pi=>2, :name=>'C'), @c.load(:i=>9, :pi=>2, :name=>'E'), @c.load(:i=>3, :name=>'00', :pi=>6)],
       [@c.load(:i=>3, :name=>'00', :pi=>6)],
@@ -258,9 +251,8 @@ describe Sequel::Model, "rcte_tree" do
        {:id=>3, :name=>'00', :parent_id=>6, :x_root_x=>6}, {:id=>3, :name=>'00', :parent_id=>6, :x_root_x=>2},
        {:id=>4, :name=>'?', :parent_id=>7, :x_root_x=>7}, {:id=>5, :name=>'?', :parent_id=>4, :x_root_x=>7}]])
     @ds.eager(:descendants).all
-    sqls = @db.sqls
-    sqls.first.must_equal "SELECT * FROM nodes"
-    sqls.last.must_match(/WITH t AS \(SELECT parent_id AS x_root_x, nodes\.\* FROM nodes WHERE \(\(parent_id IN \([267], [267], [267]\)\) AND \(i = 1\)\) UNION ALL SELECT t\.x_root_x, nodes\.\* FROM nodes INNER JOIN t ON \(t\.id = nodes\.parent_id\) WHERE \(i = 1\)\) SELECT \* FROM t AS nodes WHERE \(i = 1\)/)
+    @db.sqls.must_equal ["SELECT * FROM nodes",
+      'WITH t AS (SELECT parent_id AS x_root_x, nodes.* FROM nodes WHERE ((parent_id IN (2, 6, 7)) AND (i = 1)) UNION ALL SELECT t.x_root_x, nodes.* FROM nodes INNER JOIN t ON (t.id = nodes.parent_id) WHERE (i = 1)) SELECT * FROM t AS nodes WHERE (i = 1)']
   end
 end
 
@@ -335,9 +327,8 @@ describe Sequel::Model, "rcte_tree with composite keys" do
        {:id=>1, :id2=>2, :name=>'00', :parent_id=>8, :parent_id2=>9, :x_root_x_0=>1, :x_root_x_1=>2}, {:id=>1, :id2=>2, :name=>'00', :parent_id=>8, :parent_id2=>9, :x_root_x_0=>2, :x_root_x_1=>3},
        {:id=>8, :id2=>9, :name=>'?', :parent_id=>nil, :parent_id2=>nil, :x_root_x_0=>2, :x_root_x_1=>3}, {:id=>8, :id2=>9, :name=>'?', :parent_id=>nil, :parent_id2=>nil, :x_root_x_0=>1, :x_root_x_1=>2}]])
     os = @ds.eager(:ancestors).all
-    sqls = @db.sqls
-    sqls.first.must_equal "SELECT * FROM nodes"
-    sqls.last.must_match(/WITH t AS \(SELECT id AS x_root_x_0, id2 AS x_root_x_1, nodes\.\* FROM nodes WHERE \(\(id, id2\) IN \(\([12], [23]\), \([12], [23]\)\)\) UNION ALL SELECT t\.x_root_x_0, t\.x_root_x_1, nodes\.\* FROM nodes INNER JOIN t ON \(\(t\.parent_id = nodes\.id\) AND \(t\.parent_id2 = nodes\.id2\)\)\) SELECT \* FROM t AS nodes/)
+    @db.sqls.must_equal ["SELECT * FROM nodes",
+      'WITH t AS (SELECT id AS x_root_x_0, id2 AS x_root_x_1, nodes.* FROM nodes WHERE ((id, id2) IN ((1, 2), (2, 3))) UNION ALL SELECT t.x_root_x_0, t.x_root_x_1, nodes.* FROM nodes INNER JOIN t ON ((t.parent_id = nodes.id) AND (t.parent_id2 = nodes.id2))) SELECT * FROM t AS nodes']
     os.must_equal [@c.load(:id=>2, :id2=>3, :parent_id=>1, :parent_id2=>2, :name=>'AA'), @c.load(:id=>6, :id2=>7, :parent_id=>2, :parent_id2=>3, :name=>'C'), @c.load(:id=>7, :id2=>8, :parent_id=>1, :parent_id2=>2, :name=>'D'), @c.load(:id=>9, :id2=>10, :parent_id=>nil, :parent_id2=>nil, :name=>'E')]
     os.map{|o| o.ancestors}.must_equal [[@c.load(:id=>1, :id2=>2, :name=>'00', :parent_id=>8, :parent_id2=>9), @c.load(:id=>8, :id2=>9, :name=>'?', :parent_id=>nil, :parent_id2=>nil)],
       [@c.load(:id=>2, :id2=>3, :name=>'AA', :parent_id=>1, :parent_id2=>2), @c.load(:id=>1, :id2=>2, :name=>'00', :parent_id=>8, :parent_id2=>9), @c.load(:id=>8, :id2=>9, :name=>'?', :parent_id=>nil, :parent_id2=>nil)],
@@ -357,9 +348,8 @@ describe Sequel::Model, "rcte_tree with composite keys" do
        {:id=>3, :id2=>4, :name=>'00', :parent_id=>6, :parent_id2=>7, :x_root_x_0=>6, :x_root_x_1=>7}, {:id=>3, :id2=>4, :name=>'00', :parent_id=>6, :parent_id2=>7, :x_root_x_0=>2, :x_root_x_1=>3},
        {:id=>4, :id2=>5, :name=>'?', :parent_id=>7, :parent_id2=>8, :x_root_x_0=>7, :x_root_x_1=>8}, {:id=>5, :id2=>6, :name=>'?', :parent_id=>4, :parent_id2=>5, :x_root_x_0=>7, :x_root_x_1=>8}]])
     os = @ds.eager(:descendants).all
-    sqls = @db.sqls
-    sqls.first.must_equal "SELECT * FROM nodes"
-    sqls.last.must_match(/WITH t AS \(SELECT parent_id AS x_root_x_0, parent_id2 AS x_root_x_1, nodes\.\* FROM nodes WHERE \(\(parent_id, parent_id2\) IN \(\([267], [378]\), \([267], [378]\), \([267], [378]\)\)\) UNION ALL SELECT t\.x_root_x_0, t\.x_root_x_1, nodes\.\* FROM nodes INNER JOIN t ON \(\(t\.id = nodes\.parent_id\) AND \(t\.id2 = nodes\.parent_id2\)\)\) SELECT \* FROM t AS nodes/)
+    @db.sqls.must_equal ["SELECT * FROM nodes",
+      'WITH t AS (SELECT parent_id AS x_root_x_0, parent_id2 AS x_root_x_1, nodes.* FROM nodes WHERE ((parent_id, parent_id2) IN ((2, 3), (6, 7), (7, 8))) UNION ALL SELECT t.x_root_x_0, t.x_root_x_1, nodes.* FROM nodes INNER JOIN t ON ((t.id = nodes.parent_id) AND (t.id2 = nodes.parent_id2))) SELECT * FROM t AS nodes']
     os.must_equal [@c.load(:id=>2, :id2=>3, :parent_id=>1, :parent_id2=>2, :name=>'AA'), @c.load(:id=>6, :id2=>7, :parent_id=>2, :parent_id2=>3, :name=>'C'), @c.load(:id=>7, :id2=>8, :parent_id=>1, :parent_id2=>2, :name=>'D')]
     os.map{|o| o.descendants}.must_equal [[@c.load(:id=>6, :id2=>7, :parent_id=>2, :parent_id2=>3, :name=>'C'), @c.load(:id=>9, :id2=>10, :parent_id=>2, :parent_id2=>3, :name=>'E'), @c.load(:id=>3, :id2=>4, :name=>'00', :parent_id=>6, :parent_id2=>7)],
       [@c.load(:id=>3, :id2=>4, :name=>'00', :parent_id=>6, :parent_id2=>7)],
@@ -377,9 +367,8 @@ describe Sequel::Model, "rcte_tree with composite keys" do
        {:id=>3, :id2=>4, :name=>'00', :parent_id=>6, :parent_id2=>7, :x_root_x_0=>6, :x_root_x_1=>7, :x_level_x=>0}, {:id=>3, :id2=>4, :name=>'00', :parent_id=>6, :parent_id2=>7, :x_root_x_0=>2, :x_root_x_1=>3, :x_level_x=>1},
        {:id=>4, :id2=>5, :name=>'?', :parent_id=>7, :parent_id2=>8, :x_root_x_0=>7, :x_root_x_1=>8, :x_level_x=>0}, {:id=>5, :id2=>6, :name=>'?', :parent_id=>4, :parent_id2=>5, :x_root_x_0=>7, :x_root_x_1=>8, :x_level_x=>1}]])
     os = @ds.eager(:descendants=>2).all
-    sqls = @db.sqls
-    sqls.first.must_equal "SELECT * FROM nodes"
-    sqls.last.must_match(/WITH t AS \(SELECT parent_id AS x_root_x_0, parent_id2 AS x_root_x_1, nodes\.\*, CAST\(0 AS integer\) AS x_level_x FROM nodes WHERE \(\(parent_id, parent_id2\) IN \(\([267], [378]\), \([267], [378]\), \([267], [378]\)\)\) UNION ALL SELECT t\.x_root_x_0, t\.x_root_x_1, nodes\.\*, \(t\.x_level_x \+ 1\) AS x_level_x FROM nodes INNER JOIN t ON \(\(t\.id = nodes\.parent_id\) AND \(t\.id2 = nodes\.parent_id2\)\) WHERE \(t\.x_level_x < 1\)\) SELECT \* FROM t AS nodes/)
+    @db.sqls.must_equal ["SELECT * FROM nodes",
+      'WITH t AS (SELECT parent_id AS x_root_x_0, parent_id2 AS x_root_x_1, nodes.*, CAST(0 AS integer) AS x_level_x FROM nodes WHERE ((parent_id, parent_id2) IN ((2, 3), (6, 7), (7, 8))) UNION ALL SELECT t.x_root_x_0, t.x_root_x_1, nodes.*, (t.x_level_x + 1) AS x_level_x FROM nodes INNER JOIN t ON ((t.id = nodes.parent_id) AND (t.id2 = nodes.parent_id2)) WHERE (t.x_level_x < 1)) SELECT * FROM t AS nodes']
     os.must_equal [@c.load(:id=>2, :id2=>3, :parent_id=>1, :parent_id2=>2, :name=>'AA'), @c.load(:id=>6, :id2=>7, :parent_id=>2, :parent_id2=>3, :name=>'C'), @c.load(:id=>7, :id2=>8, :parent_id=>1, :parent_id2=>2, :name=>'D')]
     os.map{|o| o.descendants}.must_equal [[@c.load(:id=>6, :id2=>7, :parent_id=>2, :parent_id2=>3, :name=>'C'), @c.load(:id=>9, :id2=>10, :parent_id=>2, :parent_id2=>3, :name=>'E'), @c.load(:id=>3, :id2=>4, :name=>'00', :parent_id=>6, :parent_id2=>7)],
       [@c.load(:id=>3, :id2=>4, :name=>'00', :parent_id=>6, :parent_id2=>7)],

data/spec/extensions/round_timestamps_spec.rb

@@ -1,6 +1,5 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
-if RUBY_VERSION >= '1.9.0'
 describe "Sequel::Dataset::RoundTimestamps" do
   before do
     @dataset = Sequel.mock.dataset.extension(:round_timestamps)
@@ -38,6 +37,3 @@ describe "Sequel::Dataset::RoundTimestamps" do
     @dataset.literal(DateTime.new(2010, 1, 2, 3, 4, Rational(54999999, 10000000))).must_equal "'2010-01-02 03:04:05'"
   end
 end
-else
-  skip_warn "round_timestamps extension: only works on ruby 1.9+"
-end

data/spec/extensions/s_spec.rb

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

data/spec/extensions/schema_caching_spec.rb

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

data/spec/extensions/schema_dumper_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
+require_relative "spec_helper"
 
 describe "Sequel::Schema::CreateTableGenerator dump methods" do
   before do
@@ -140,60 +140,55 @@ describe "Sequel::Database dump methods" do
     def @d.schema(*s) [[:c1, {:db_type=>'integer', :primary_key=>true, :allow_null=>true, :auto_increment=>true}]] end
     def @d.supports_foreign_key_parsing?; true end
     def @d.foreign_key_list(*s) [{:columns=>[:c1], :table=>:t2, :key=>[:c2]}] end
-    s = @d.dump_table_schema(:t6)
-    s.must_match(/create_table\(:t6\) do\n  primary_key :c1, /)
-    s.must_match(/:table=>:t2/)
-    s.must_match(/:key=>\[:c2\]/)
+    @d.dump_table_schema(:t6).must_equal((<<OUTPUT).chomp)
+create_table(:t6) do
+  primary_key :c1, :table=>:t2, :key=>[:c2]
+end
+OUTPUT
   end
 
   it "should handle foreign key options" do
     def @d.schema(*s) [[:c1, {:db_type=>'integer', :allow_null=>true}]] end
     def @d.supports_foreign_key_parsing?; true end
     def @d.foreign_key_list(*s) [{:columns=>[:c1], :table=>:t2, :key=>[:c2], :on_delete=>:restrict, :on_update=>:set_null, :deferrable=>true}] end
-    s = @d.dump_table_schema(:t6)
-    s.must_match(/create_table\(:t6\) do\n  foreign_key :c1, :t2, /)
-    s.must_match(/:key=>\[:c2\]/)
-    s.must_match(/:on_delete=>:restrict/)
-    s.must_match(/:on_update=>:set_null/)
-    s.must_match(/:deferrable=>true/)
+    @d.dump_table_schema(:t6).must_equal((<<OUTPUT).chomp)
+create_table(:t6) do
+  foreign_key :c1, :t2, :key=>[:c2], :on_delete=>:restrict, :on_update=>:set_null, :deferrable=>true
+end
+OUTPUT
   end
 
   it "should handle foreign key options in the primary key" do
     def @d.schema(*s) [[:c1, {:db_type=>'integer', :primary_key=>true, :allow_null=>true, :auto_increment=>true}]] end
     def @d.supports_foreign_key_parsing?; true end
     def @d.foreign_key_list(*s) [{:columns=>[:c1], :table=>:t2, :key=>[:c2], :on_delete=>:restrict, :on_update=>:set_null, :deferrable=>true}] end
-    s = @d.dump_table_schema(:t6)
-    s.must_match(/create_table\(:t6\) do\n  primary_key :c1, /)
-    s.must_match(/:table=>:t2/)
-    s.must_match(/:key=>\[:c2\]/)
-    s.must_match(/:on_delete=>:restrict/)
-    s.must_match(/:on_update=>:set_null/)
-    s.must_match(/:deferrable=>true/)
+    @d.dump_table_schema(:t6).must_equal((<<OUTPUT).chomp)
+create_table(:t6) do
+  primary_key :c1, :table=>:t2, :key=>[:c2], :on_delete=>:restrict, :on_update=>:set_null, :deferrable=>true
+end
+OUTPUT
   end
 
   it "should omit foreign key options that are the same as defaults" do
     def @d.schema(*s) [[:c1, {:db_type=>'integer', :allow_null=>true}]] end
     def @d.supports_foreign_key_parsing?; true end
     def @d.foreign_key_list(*s) [{:columns=>[:c1], :table=>:t2, :key=>[:c2], :on_delete=>:no_action, :on_update=>:no_action, :deferrable=>false}] end
-    s = @d.dump_table_schema(:t6)
-    s.must_match(/create_table\(:t6\) do\n  foreign_key :c1, :t2, /)
-    s.must_match(/:key=>\[:c2\]/)
-    s.wont_match(/:on_delete/)
-    s.wont_match(/:on_update/)
-    s.wont_match(/:deferrable/)
+    @d.dump_table_schema(:t6).must_equal((<<OUTPUT).chomp)
+create_table(:t6) do
+  foreign_key :c1, :t2, :key=>[:c2]
+end
+OUTPUT
   end
 
   it "should omit foreign key options that are the same as defaults in the primary key" do
     def @d.schema(*s) [[:c1, {:db_type=>'integer', :primary_key=>true, :allow_null=>true, :auto_increment=>true}]] end
     def @d.supports_foreign_key_parsing?; true end
     def @d.foreign_key_list(*s) [{:columns=>[:c1], :table=>:t2, :key=>[:c2], :on_delete=>:no_action, :on_update=>:no_action, :deferrable=>false}] end
-    s = @d.dump_table_schema(:t6)
-    s.must_match(/create_table\(:t6\) do\n  primary_key :c1, /)
-    s.must_match(/:table=>:t2/)
-    s.must_match(/:key=>\[:c2\]/)
-    s.wont_match(/:on_delete/)
-    s.wont_match(/:on_update/)
-    s.wont_match(/:deferrable/)
+    @d.dump_table_schema(:t6).must_equal((<<OUTPUT).chomp)
+create_table(:t6) do
+  primary_key :c1, :table=>:t2, :key=>[:c2]
+end
+OUTPUT
   end
 
   it "should dump primary key columns with explicit type equal to the database type when :same_db option is passed" do
@@ -508,7 +503,23 @@ END_MIG
     def @d.foreign_key_list(t)
       t == :t1 ? [{:columns=>[:c2], :table=>:t2, :key=>[:c1]}] : []
     end
-    @d.dump_schema_migration(:indexes=>false, :foreign_keys=>true).must_match(/foreign_key/)
+    @d.dump_schema_migration(:indexes=>false, :foreign_keys=>true).must_equal(<<OUTPUT)
+Sequel.migration do
+  change do
+    create_table(:t2) do
+      Integer :c1, :null=>false
+      BigDecimal :c2, :null=>false
+      
+      primary_key [:c1, :c2]
+    end
+    
+    create_table(:t1) do
+      primary_key :c1
+      foreign_key :c2, :t2, :type=>String, :size=>20, :key=>[:c1]
+    end
+  end
+end
+OUTPUT
   end
 
   it "should support dumping just indexes as a migration" do

data/spec/extensions/select_remove_spec.rb

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

data/spec/extensions/sequel_4_dataset_methods_spec.rb

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

data/spec/extensions/serialization_modification_detection_spec.rb

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

data/spec/extensions/serialization_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 require 'yaml'
 require 'json'
@@ -12,25 +12,18 @@ describe "Serialization plugin" do
     DB.reset
   end
   
-  deprecated "should allow access to serialization_module" do
-    @c.plugin :serialization, :yaml, :abc
-    @c.serialization_module.must_be_kind_of Module
-    @c.serialization_module = v = Module.new
-    @c.serialization_module.must_equal v
-  end
-
   it "should allow setting additional serializable attributes via plugin :serialization call" do
     @c.plugin :serialization, :yaml, :abc
     @c.create(:abc => 1, :def=> 2)
-    DB.sqls.last.must_match(/INSERT INTO items \((abc, def|def, abc)\) VALUES \(('--- 1\n(\.\.\.\n)?', 2|2, '--- 1\n(\.\.\.\n)?')\)/)
+    DB.sqls.map{|s| s.sub("1\n...", '1')}.must_equal ["INSERT INTO items (def, abc) VALUES (2, '--- 1\n')"]
 
     @c.plugin :serialization, :marshal, :def
     @c.create(:abc => 1, :def=> 1)
-    DB.sqls.last.must_match(/INSERT INTO items \((abc, def|def, abc)\) VALUES \(('--- 1\n(\.\.\.\n)?', 'BAhpBg==\n'|'BAhpBg==\n', '--- 1\n(\.\.\.\n)?')\)/)
+    DB.sqls.map{|s| s.sub("1\n...", '1')}.must_equal ["INSERT INTO items (abc, def) VALUES ('--- 1\n', 'BAhpBg==\n')"]
     
     @c.plugin :serialization, :json, :ghi
     @c.create(:ghi => [123])
-    DB.sqls.last.must_match(/INSERT INTO items \((ghi)\) VALUES \('\[123\]'\)/)
+    DB.sqls.must_equal ["INSERT INTO items (ghi) VALUES ('[123]')"]
   end
 
   it "should handle validations of underlying column" do
@@ -59,11 +52,6 @@ describe "Serialization plugin" do
     DB.sqls.map{|s| s.sub("...\n", '')}.must_equal ["INSERT INTO items (abc) VALUES ('--- 1\n')", "INSERT INTO items (abc) VALUES ('--- hello\n')"]
   end
 
-  deprecated "serialized_columns should be the columns serialized" do
-    @c.plugin :serialization, :yaml, :abc
-    @c.serialized_columns.must_equal [:abc]
-  end
-
   it "should allow serializing attributes to marshal" do
     @c.plugin :serialization, :marshal, :abc
     @c.create(:abc => 1)
@@ -202,7 +190,7 @@ describe "Serialization plugin" do
 
   it "should handle registration of custom serializer/deserializer pairs" do
     @c.set_primary_key :id
-    require 'sequel/plugins/serialization'
+    require_relative '../../lib/sequel/plugins/serialization'
     Sequel::Plugins::Serialization.register_format(:reverse, proc{|s| s.reverse}, proc{|s| s.reverse})
     @c.plugin :serialization, :reverse, :abc, :def
     @c.dataset = @c.dataset.with_fetch(:id => 1, :abc => 'cba', :def => 'olleh')