sequel 5.2.0 → 5.3.0

data/spec/extensions/optimistic_locking_spec.rb

@@ -105,7 +105,7 @@ describe "optimistic_locking plugin" do
       @c.db.sqls
       p2.update(:name=>'Bob')
     end
-    @c.db.sqls.first.must_match(/UPDATE people SET (name = 'Bob', lock_version = 4|lock_version = 4, name = 'Bob') WHERE \(\(id = 1\) AND \(lock_version = 3\)\)/)
+    @c.db.sqls.must_equal ["UPDATE people SET name = 'Bob', lock_version = 4 WHERE ((id = 1) AND (lock_version = 3))"]
   end
 
   it "should increment the lock column when #modified! even if no columns are changed" do

data/spec/extensions/pg_array_associations_spec.rb

@@ -248,9 +248,8 @@ describe Sequel::Model, "pg_array_associations" do
   it "should eagerly load correctly" do
     a = @c1.eager(:tags).all
     a.must_equal [@o1]
-    sqls = @db.sqls
-    sqls.pop.must_match(/SELECT \* FROM tags WHERE \(tags\.id IN \([123], [123], [123]\)\)/)
-    sqls.must_equal ["SELECT * FROM artists"]
+    @db.sqls.must_equal ["SELECT * FROM artists",
+      'SELECT * FROM tags WHERE (tags.id IN (1, 2, 3))']
     a.first.tags.must_equal [@o2]
     @db.sqls.must_equal []
 
@@ -268,9 +267,8 @@ describe Sequel::Model, "pg_array_associations" do
 
     a = @c1.eager(:tags).all
     a.must_equal [@o1]
-    sqls = @db.sqls
-    sqls.pop.must_match(/SELECT \* FROM tags WHERE \(\(tags\.id \* 3\) IN \([369], [369], [369]\)\)/)
-    sqls.must_equal ["SELECT * FROM artists"]
+    @db.sqls.must_equal ["SELECT * FROM artists",
+      'SELECT * FROM tags WHERE ((tags.id * 3) IN (3, 6, 9))']
     a.first.tags.must_equal [@o2]
     @db.sqls.must_equal []
 
@@ -284,9 +282,9 @@ describe Sequel::Model, "pg_array_associations" do
   it "should allow cascading of eager loading for associations of associated models" do
     a = @c1.eager(:tags=>:artists).all
     a.must_equal [@o1]
-    sqls = @db.sqls
-    sqls.slice!(1).must_match(/SELECT \* FROM tags WHERE \(tags\.id IN \([123], [123], [123]\)\)/)
-    sqls.must_equal ['SELECT * FROM artists', "SELECT * FROM artists WHERE (artists.tag_ids && ARRAY[2]::integer[])"]
+    @db.sqls.must_equal ["SELECT * FROM artists",
+      'SELECT * FROM tags WHERE (tags.id IN (1, 2, 3))',
+      "SELECT * FROM artists WHERE (artists.tag_ids && ARRAY[2]::integer[])"]
     a.first.tags.must_equal [@o2]
     a.first.tags.first.artists.must_equal [@o1]
     @db.sqls.must_equal []
@@ -302,9 +300,8 @@ describe Sequel::Model, "pg_array_associations" do
     @db.sqls.must_equal []
 
     @o2.artists2.must_equal [@o1]
-    sqls = @db.sqls
-    sqls.pop.must_match(/SELECT \* FROM tags WHERE \(tags\.id IN \([123], [123], [123]\)\)/)
-    sqls.must_equal ["SELECT * FROM artists WHERE (artists.tag_ids @> ARRAY[2]::integer[])"]
+    @db.sqls.must_equal ["SELECT * FROM artists WHERE (artists.tag_ids @> ARRAY[2]::integer[])",
+      'SELECT * FROM tags WHERE (tags.id IN (1, 2, 3))']
     @o2.artists2.first.tags.must_equal [@o2]
     @db.sqls.must_equal []
   end
@@ -318,7 +315,7 @@ describe Sequel::Model, "pg_array_associations" do
     @db.sqls
 
     @o1.tags2.must_equal [@o2]
-    @db.sqls.first.must_match(/SELECT tags\.id, artists\.id AS artists_id, artists\.tag_ids FROM tags LEFT OUTER JOIN artists ON \(artists.tag_ids @> ARRAY\[tags.id\]\) WHERE \(tags\.id IN \([123], [123], [123]\)\)/)
+    @db.sqls.must_equal ['SELECT tags.id, artists.id AS artists_id, artists.tag_ids FROM tags LEFT OUTER JOIN artists ON (artists.tag_ids @> ARRAY[tags.id]) WHERE (tags.id IN (1, 2, 3))']
     @o1.tags2.first.artists.must_equal [@o1]
     @db.sqls.must_equal []
 
@@ -332,9 +329,8 @@ describe Sequel::Model, "pg_array_associations" do
     @db.sqls
 
     a = @c1.eager(:tags2).all
-    sqls = @db.sqls
-    sqls.pop.must_match(/SELECT tags\.id, artists\.id AS artists_id, artists\.tag_ids FROM tags LEFT OUTER JOIN artists ON \(artists.tag_ids @> ARRAY\[tags.id\]\) WHERE \(tags\.id IN \([123], [123], [123]\)\)/)
-    sqls.must_equal ["SELECT * FROM artists"]
+    @db.sqls.must_equal ["SELECT * FROM artists",
+      'SELECT tags.id, artists.id AS artists_id, artists.tag_ids FROM tags LEFT OUTER JOIN artists ON (artists.tag_ids @> ARRAY[tags.id]) WHERE (tags.id IN (1, 2, 3))']
     a.must_equal [@o1]
     a.first.tags2.must_equal [@o2]
     a.first.tags2.first.artists.must_equal [@o1]
@@ -359,27 +355,24 @@ describe Sequel::Model, "pg_array_associations" do
     @c1.pg_array_to_many :tags, :clone=>:tags, :limit=>2
     a = @c1.eager(:tags).all
     a.must_equal [@o1]
-    sqls = @db.sqls
-    sqls.pop.must_match(/SELECT \* FROM tags WHERE \(tags\.id IN \([123], [123], [123]\)\)/)
-    sqls.must_equal ["SELECT * FROM artists"]
+    @db.sqls.must_equal ["SELECT * FROM artists",
+      'SELECT * FROM tags WHERE (tags.id IN (1, 2, 3))']
     a.first.tags.must_equal [@c2.load(:id=>1), @c2.load(:id=>2)]
     @db.sqls.must_equal []
 
     @c1.pg_array_to_many :tags, :clone=>:tags, :limit=>[1, 1]
     a = @c1.eager(:tags).all
     a.must_equal [@o1]
-    sqls = @db.sqls
-    sqls.pop.must_match(/SELECT \* FROM tags WHERE \(tags\.id IN \([123], [123], [123]\)\)/)
-    sqls.must_equal ["SELECT * FROM artists"]
+    @db.sqls.must_equal ["SELECT * FROM artists",
+      'SELECT * FROM tags WHERE (tags.id IN (1, 2, 3))']
     a.first.tags.must_equal [@c2.load(:id=>2)]
     @db.sqls.must_equal []
 
     @c1.pg_array_to_many :tags, :clone=>:tags, :limit=>[nil, 1]
     a = @c1.eager(:tags).all
     a.must_equal [@o1]
-    sqls = @db.sqls
-    sqls.pop.must_match(/SELECT \* FROM tags WHERE \(tags\.id IN \([123], [123], [123]\)\)/)
-    sqls.must_equal ["SELECT * FROM artists"]
+    @db.sqls.must_equal ["SELECT * FROM artists",
+      'SELECT * FROM tags WHERE (tags.id IN (1, 2, 3))']
     a.first.tags.must_equal [@c2.load(:id=>2), @c2.load(:id=>3)]
     @db.sqls.length.must_equal 0
 

data/spec/extensions/pg_extended_date_support_spec.rb

@@ -49,6 +49,14 @@ describe "pg_extended_date_support extension" do
       t.(ni).must_equal ni
     end
 
+    [:date, 'date'].each do |v|
+      @db.convert_infinite_timestamps = v
+      d.(pi).must_equal Date::Infinity.new
+      t.(pi).must_equal Date::Infinity.new
+      d.(ni).must_equal -Date::Infinity.new
+      t.(ni).must_equal -Date::Infinity.new
+    end
+
     [:float, 'float', 't', true].each do |v|
       @db.convert_infinite_timestamps = v
       d.(pi).must_equal 1.0/0.0
@@ -92,6 +100,11 @@ describe "pg_extended_date_support extension" do
     @db.conversion_procs[1114].call("1200-02-15 14:13:20-00:00:00").must_equal DateTime.new(1200, 2, 15, 14, 13, 20)
   end
 
+  it "should format Date::Infinity values" do
+    @db.literal(Date::Infinity.new).must_equal "'infinity'"
+    @db.literal(-Date::Infinity.new).must_equal "'-infinity'"
+  end
+
   it "should format BC dates" do
     @db.literal(Date.new(-1091, 10, 20)).must_equal "'1092-10-20 BC'"
     @db.literal(Date.new(1092, 10, 20)).must_equal "'1092-10-20'"

data/spec/extensions/pg_hstore_spec.rb

@@ -32,7 +32,7 @@ describe "pg_hstore extension" do
     @db.literal(Sequel.hstore("c"=>nil)).must_equal '\'"c"=>NULL\'::hstore'
     @db.literal(Sequel.hstore("c"=>'NULL')).must_equal '\'"c"=>"NULL"\'::hstore'
     @db.literal(Sequel.hstore('c'=>'\ "\'=>')).must_equal '\'"c"=>"\\\\ \\"\'\'=>"\'::hstore'
-    ['\'"a"=>"b","c"=>"d"\'::hstore', '\'"c"=>"d","a"=>"b"\'::hstore'].must_include(@db.literal(Sequel.hstore("a"=>"b","c"=>"d")))
+    @db.literal(Sequel.hstore("a"=>"b","c"=>"d")).must_equal '\'"a"=>"b","c"=>"d"\'::hstore'
   end
 
   it "should register conversion proc correctly" do
@@ -178,7 +178,7 @@ describe "pg_hstore extension" do
     @db.bound_variable_arg(Sequel.hstore('1'=>nil), nil).must_equal '"1"=>NULL'
     @db.bound_variable_arg(Sequel.hstore('1'=>"NULL"), nil).must_equal '"1"=>"NULL"'
     @db.bound_variable_arg(Sequel.hstore('1'=>"'\\ \"=>"), nil).must_equal '"1"=>"\'\\\\ \\"=>"'
-    ['"a"=>"b","c"=>"d"', '"c"=>"d","a"=>"b"'].must_include(@db.bound_variable_arg(Sequel.hstore("a"=>"b","c"=>"d"), nil))
+    @db.bound_variable_arg(Sequel.hstore("a"=>"b","c"=>"d"), nil).must_equal '"a"=>"b","c"=>"d"'
   end
 
   it "should parse hstore type from the schema correctly" do

data/spec/extensions/prepared_statements_safe_spec.rb

@@ -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/pretty_table_spec.rb

@@ -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/rcte_tree_spec.rb

@@ -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/schema_dumper_spec.rb

@@ -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