sequel 4.49.0 → 5.3.0

data/spec/extensions/prepared_statements_associations_spec.rb

@@ -1,212 +0,0 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
-
-describe "Sequel::Plugins::PreparedStatementsAssociations" do
-  before do
-    deprecated do
-      @db = Sequel.mock(:servers=>{:foo=>{}})
-      @db.extend_datasets do
-        def select_sql
-          sql = super
-          sql << ' -- prepared' if is_a?(Sequel::Dataset::PreparedStatementMethods)
-          sql
-        end
-      end
-      @Artist = Class.new(Sequel::Model(@db[:artists]))
-      @Artist.columns :id, :id2
-      @Album= Class.new(Sequel::Model(@db[:albums]))
-      @Album.columns :id, :artist_id, :id2, :artist_id2
-      @Tag = Class.new(Sequel::Model(@db[:tags]))
-      @Tag.columns :id, :id2
-      @Artist.plugin :prepared_statements_associations
-      @Album.plugin :prepared_statements_associations
-      @Artist.one_to_many :albums, :class=>@Album, :key=>:artist_id
-      @Artist.one_to_one :album, :class=>@Album, :key=>:artist_id
-      @Album.many_to_one :artist, :class=>@Artist
-      @Album.many_to_many :tags, :class=>@Tag, :join_table=>:albums_tags, :left_key=>:album_id
-      @Album.one_through_one :tag, :clone=>:tags
-      @Artist.plugin :many_through_many
-      @Artist.many_through_many :tags, [[:albums, :artist_id, :id], [:albums_tags, :album_id, :tag_id]], :class=>@Tag
-      @Artist.one_through_many :tag, :clone=>:tags
-      @db.sqls
-    end
-  end
-
-  deprecated "should run correct SQL for associations" do
-    @Artist.load(:id=>1).albums
-    @db.sqls.must_equal ["SELECT id, artist_id, id2, artist_id2 FROM albums WHERE (albums.artist_id = 1) -- prepared"]
-
-    @Artist.load(:id=>1).album
-    @db.sqls.must_equal ["SELECT id, artist_id, id2, artist_id2 FROM albums WHERE (albums.artist_id = 1) LIMIT 1 -- prepared"]
-
-    @Album.load(:id=>1, :artist_id=>2).artist
-    @db.sqls.must_equal ["SELECT id, id2 FROM artists WHERE (artists.id = 2) LIMIT 1 -- prepared"]
-
-    @Album.load(:id=>1, :artist_id=>2).tags
-    @db.sqls.must_equal ["SELECT tags.id, tags.id2 FROM tags INNER JOIN albums_tags ON (albums_tags.tag_id = tags.id) WHERE (albums_tags.album_id = 1) -- prepared"]
-
-    @Album.load(:id=>1, :artist_id=>2).tag
-    @db.sqls.must_equal ["SELECT tags.id, tags.id2 FROM tags INNER JOIN albums_tags ON (albums_tags.tag_id = tags.id) WHERE (albums_tags.album_id = 1) LIMIT 1 -- prepared"]
-
-    @Artist.load(:id=>1).tags
-    @db.sqls.must_equal ["SELECT tags.id, tags.id2 FROM tags INNER JOIN albums_tags ON (albums_tags.tag_id = tags.id) INNER JOIN albums ON (albums.id = albums_tags.album_id) WHERE (albums.artist_id = 1) -- prepared"]
-
-    @Artist.load(:id=>1).tag
-    @db.sqls.must_equal ["SELECT tags.id, tags.id2 FROM tags INNER JOIN albums_tags ON (albums_tags.tag_id = tags.id) INNER JOIN albums ON (albums.id = albums_tags.album_id) WHERE (albums.artist_id = 1) LIMIT 1 -- prepared"]
-  end
-
-  deprecated "should run correct shard for associations when also using sharding plugin" do
-    @Artist.plugin :sharding
-    @Album.plugin :sharding
-
-    @Artist.load(:id=>1).set_server(:foo).albums
-    @db.sqls.must_equal ["SELECT id, artist_id, id2, artist_id2 FROM albums WHERE (albums.artist_id = 1) -- prepared -- foo"]
-
-    @Artist.load(:id=>1).set_server(:foo).album
-    @db.sqls.must_equal ["SELECT id, artist_id, id2, artist_id2 FROM albums WHERE (albums.artist_id = 1) LIMIT 1 -- prepared -- foo"]
-
-    @Album.load(:id=>1, :artist_id=>2).set_server(:foo).artist
-    @db.sqls.must_equal ["SELECT id, id2 FROM artists WHERE (artists.id = 2) LIMIT 1 -- prepared -- foo"]
-
-    @Album.load(:id=>1, :artist_id=>2).set_server(:foo).tags
-    @db.sqls.must_equal ["SELECT tags.id, tags.id2 FROM tags INNER JOIN albums_tags ON (albums_tags.tag_id = tags.id) WHERE (albums_tags.album_id = 1) -- prepared -- foo"]
-
-    @Album.load(:id=>1, :artist_id=>2).set_server(:foo).tag
-    @db.sqls.must_equal ["SELECT tags.id, tags.id2 FROM tags INNER JOIN albums_tags ON (albums_tags.tag_id = tags.id) WHERE (albums_tags.album_id = 1) LIMIT 1 -- prepared -- foo"]
-
-    @Artist.load(:id=>1).set_server(:foo).tags
-    @db.sqls.must_equal ["SELECT tags.id, tags.id2 FROM tags INNER JOIN albums_tags ON (albums_tags.tag_id = tags.id) INNER JOIN albums ON (albums.id = albums_tags.album_id) WHERE (albums.artist_id = 1) -- prepared -- foo"]
-
-    @Artist.load(:id=>1).set_server(:foo).tag
-    @db.sqls.must_equal ["SELECT tags.id, tags.id2 FROM tags INNER JOIN albums_tags ON (albums_tags.tag_id = tags.id) INNER JOIN albums ON (albums.id = albums_tags.album_id) WHERE (albums.artist_id = 1) LIMIT 1 -- prepared -- foo"]
-
-    @Tag.plugin :sharding
-    @Tag.plugin :prepared_statements_associations
-    @Tag.many_to_many :albums, :class=>@Album, :join_table=>:albums_tags, :left_key=>:tag_id
-    @Tag.load(:id=>1).set_server(:foo).albums
-    @db.sqls.must_equal ["SELECT albums.id, albums.artist_id, albums.id2, albums.artist_id2 FROM albums INNER JOIN albums_tags ON (albums_tags.album_id = albums.id) WHERE (albums_tags.tag_id = 1) -- prepared -- foo"]
-  end
-
-  deprecated "should not override the shard for associations if not using the sharding plugin" do
-    @Artist.load(:id=>1).set_server(:foo).albums
-    @db.sqls.must_equal ["SELECT id, artist_id, id2, artist_id2 FROM albums WHERE (albums.artist_id = 1) -- prepared"]
-  end
-
-  deprecated "should run correct SQL for composite key associations" do
-    @Artist.one_to_many :albums, :class=>@Album, :key=>[:artist_id, :artist_id2], :primary_key=>[:id, :id2]
-    @Artist.one_to_one :album, :class=>@Album, :key=>[:artist_id, :artist_id2], :primary_key=>[:id, :id2]
-    @Album.many_to_one :artist, :class=>@Artist, :key=>[:artist_id, :artist_id2], :primary_key=>[:id, :id2]
-    @Album.many_to_many :tags, :class=>@Tag, :join_table=>:albums_tags, :left_key=>[:album_id, :album_id2], :right_key=>[:tag_id, :tag_id2], :right_primary_key=>[:id, :id2], :left_primary_key=>[:id, :id2]
-    @Album.one_through_one :tag, :clone=>:tags
-
-    @Artist.many_through_many :tags, [[:albums, [:artist_id, :artist_id2], [:id, :id2]], [:albums_tags, [:album_id, :album_id2], [:tag_id, :tag_id2]]], :class=>@Tag, :right_primary_key=>[:id, :id2], :left_primary_key=>[:id, :id2]
-    @Artist.one_through_many :tag, :clone=>:tags
-
-    @Artist.load(:id=>1, :id2=>2).albums
-    @db.sqls.must_equal ["SELECT id, artist_id, id2, artist_id2 FROM albums WHERE ((albums.artist_id = 1) AND (albums.artist_id2 = 2)) -- prepared"]
-
-    @Artist.load(:id=>1, :id2=>2).album
-    @db.sqls.must_equal ["SELECT id, artist_id, id2, artist_id2 FROM albums WHERE ((albums.artist_id = 1) AND (albums.artist_id2 = 2)) LIMIT 1 -- prepared"]
-
-    @Album.load(:id=>1, :artist_id=>2, :artist_id2=>3).artist
-    @db.sqls.must_equal ["SELECT id, id2 FROM artists WHERE ((artists.id = 2) AND (artists.id2 = 3)) LIMIT 1 -- prepared"]
-
-    @Album.load(:id=>1, :artist_id=>2, :id2=>3).tags
-    @db.sqls.must_equal ["SELECT tags.id, tags.id2 FROM tags INNER JOIN albums_tags ON ((albums_tags.tag_id = tags.id) AND (albums_tags.tag_id2 = tags.id2)) WHERE ((albums_tags.album_id = 1) AND (albums_tags.album_id2 = 3)) -- prepared"]
-
-    @Album.load(:id=>1, :artist_id=>2, :id2=>3).tag
-    @db.sqls.must_equal ["SELECT tags.id, tags.id2 FROM tags INNER JOIN albums_tags ON ((albums_tags.tag_id = tags.id) AND (albums_tags.tag_id2 = tags.id2)) WHERE ((albums_tags.album_id = 1) AND (albums_tags.album_id2 = 3)) LIMIT 1 -- prepared"]
-
-    @Artist.load(:id=>1, :id2=>2).tags
-    @db.sqls.must_equal ["SELECT tags.id, tags.id2 FROM tags INNER JOIN albums_tags ON ((albums_tags.tag_id = tags.id) AND (albums_tags.tag_id2 = tags.id2)) INNER JOIN albums ON ((albums.id = albums_tags.album_id) AND (albums.id2 = albums_tags.album_id2)) WHERE ((albums.artist_id = 1) AND (albums.artist_id2 = 2)) -- prepared"]
-
-    @Artist.load(:id=>1, :id2=>2).tag
-    @db.sqls.must_equal ["SELECT tags.id, tags.id2 FROM tags INNER JOIN albums_tags ON ((albums_tags.tag_id = tags.id) AND (albums_tags.tag_id2 = tags.id2)) INNER JOIN albums ON ((albums.id = albums_tags.album_id) AND (albums.id2 = albums_tags.album_id2)) WHERE ((albums.artist_id = 1) AND (albums.artist_id2 = 2)) LIMIT 1 -- prepared"]
-  end
-
-  deprecated "should not run query if no objects can be associated" do
-    @Artist.new.albums.must_equal []
-    @Album.new.artist.must_be_nil
-    @db.sqls.must_equal []
-  end
-
-  deprecated "should run a regular query if not caching association metadata" do
-    @Artist.cache_associations = false
-    @Artist.load(:id=>1).albums
-    @db.sqls.must_equal ["SELECT * FROM albums WHERE (albums.artist_id = 1)"]
-    @Artist.load(:id=>1).album
-    @db.sqls.must_equal ["SELECT * FROM albums WHERE (albums.artist_id = 1) LIMIT 1"]
-  end
-
-  deprecated "should run a regular query if there is a callback" do
-    @Artist.load(:id=>1).albums(proc{|ds| ds})
-    @db.sqls.must_equal ["SELECT * FROM albums WHERE (albums.artist_id = 1)"]
-    @Artist.load(:id=>1).album(proc{|ds| ds})
-    @db.sqls.must_equal ["SELECT * FROM albums WHERE (albums.artist_id = 1) LIMIT 1"]
-  end
-
-  deprecated "should run a regular query if there is a block" do
-    @Artist.load(:id=>1).albums{|ds| ds}
-    @db.sqls.must_equal ["SELECT * FROM albums WHERE (albums.artist_id = 1)"]
-    @Artist.load(:id=>1).album{|ds| ds}
-    @db.sqls.must_equal ["SELECT * FROM albums WHERE (albums.artist_id = 1) LIMIT 1"]
-  end
-
-  deprecated "should run a regular query if :prepared_statement=>false option is used for the association" do
-    @Artist.one_to_many :albums, :class=>@Album, :key=>:artist_id, :prepared_statement=>false
-    @Artist.load(:id=>1).albums
-    @db.sqls.must_equal ["SELECT * FROM albums WHERE (albums.artist_id = 1)"]
-  end
-
-  deprecated "should run a regular query if unrecognized association is used" do
-    a = @Artist.one_to_many :albums, :class=>@Album, :key=>:artist_id
-    a[:type] = :foo
-    @Artist.load(:id=>1).albums
-    @db.sqls.must_equal ["SELECT * FROM albums WHERE (albums.artist_id = 1)"]
-  end
-
-  deprecated "should run a regular query if a block is used when defining the association" do
-    @Artist.one_to_many :albums, :class=>@Album, :key=>:artist_id do |ds| ds end
-    @Artist.load(:id=>1).albums
-    @db.sqls.must_equal ["SELECT * FROM albums WHERE (albums.artist_id = 1)"]
-  end
-
-  deprecated "should use a prepared statement if the associated dataset has conditions" do
-    @Album.dataset = @Album.dataset.where(:a=>2)
-    @Artist.one_to_many :albums, :class=>@Album, :key=>:artist_id
-    @Artist.load(:id=>1).albums
-    @db.sqls.must_equal ["SELECT id, artist_id, id2, artist_id2 FROM albums WHERE ((a = 2) AND (albums.artist_id = 1)) -- prepared"]
-  end
-
-  deprecated "should use a prepared statement if the :conditions association option" do
-    @Artist.one_to_many :albums, :class=>@Album, :key=>:artist_id, :conditions=>{:a=>2} 
-    @Artist.load(:id=>1).albums
-    @db.sqls.must_equal ["SELECT id, artist_id, id2, artist_id2 FROM albums WHERE ((a = 2) AND (albums.artist_id = 1)) -- prepared"]
-  end
-
-  deprecated "should not use a prepared statement if :conditions association option uses an identifier" do
-    @Artist.one_to_many :albums, :class=>@Album, :key=>:artist_id, :conditions=>{Sequel.identifier('a')=>2}
-    @Artist.load(:id=>1).albums
-    @db.sqls.must_equal ["SELECT id, artist_id, id2, artist_id2 FROM albums WHERE ((a = 2) AND (albums.artist_id = 1)) -- prepared"]
-  end
-
-  deprecated "should run a regular query if :dataset option is used when defining the association" do
-    album = @Album
-    @Artist.one_to_many :albums, :class=>@Album, :dataset=>proc{album.filter(:artist_id=>id)} 
-    @Artist.load(:id=>1).albums
-    @db.sqls.must_equal ["SELECT * FROM albums WHERE (artist_id = 1)"]
-  end
-
-  deprecated "should run a regular query if :cloning an association that doesn't used prepared statements" do
-    @Artist.one_to_many :albums, :class=>@Album, :key=>:artist_id do |ds| ds end
-    @Artist.one_to_many :oalbums, :clone=>:albums
-    @Artist.load(:id=>1).oalbums
-    @db.sqls.must_equal ["SELECT * FROM albums WHERE (albums.artist_id = 1)"]
-  end
-
-  deprecated "should work correctly when using an instance specific association" do
-    tag = @Tag 
-    @Artist.many_to_one :tag, :key=>nil, :read_only=>true, :dataset=>proc{tag.where(:id=>id).limit(1)}, :reciprocal=>nil, :reciprocal_type=>nil
-    @Artist.load(:id=>1).tag.must_be_nil
-    @db.sqls.must_equal ["SELECT * FROM tags WHERE (id = 1) LIMIT 1"]
-  end
-end

data/spec/extensions/prepared_statements_with_pk_spec.rb

@@ -1,40 +0,0 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
-
-describe "prepared_statements_with_pk plugin" do
-  before do
-    deprecated do
-      @db = Sequel.mock(:fetch=>{:id=>1, :name=>'foo', :i=>2}, :autoid=>proc{|sql| 1}, :numrows=>1, :servers=>{:read_only=>{}})
-      @c = Class.new(Sequel::Model(@db[:people]))
-      @c.columns :id, :name, :i
-      @c.plugin :prepared_statements_with_pk
-      @p = @c.load(:id=>1, :name=>'foo', :i=>2)
-      @db.sqls
-    end
-  end
-
-  deprecated "should load the prepared_statements plugin" do
-    @c.plugins.must_include(Sequel::Plugins::PreparedStatements)
-  end
-
-  deprecated "should correctly lookup by primary key from dataset" do
-    @c.dataset.filter(:name=>'foo')[1].must_equal @p
-    @c.db.sqls.must_equal ["SELECT * FROM people WHERE ((name = 'foo') AND (people.id = 1)) LIMIT 1 -- read_only"]
-  end
-
-  deprecated "should still work correctly if there are multiple conflicting variables" do
-    @c.dataset.filter(:name=>'foo').or(:name=>'bar')[1].must_equal @p
-    @c.db.sqls.must_equal ["SELECT * FROM people WHERE (((name = 'foo') OR (name = 'bar')) AND (people.id = 1)) LIMIT 1 -- read_only"]
-  end
-
-  deprecated "should still work correctly if the primary key is used elsewhere in the query" do
-    @c.dataset.filter{id > 2}[1].must_equal @p
-    @c.db.sqls.must_equal ["SELECT * FROM people WHERE ((id > 2) AND (people.id = 1)) LIMIT 1 -- read_only"]
-  end
-
-  deprecated "should respect explicitly set server" do
-    @c.dataset.filter(:name=>'foo')[1].must_equal @p
-    @c.db.sqls.must_equal ["SELECT * FROM people WHERE ((name = 'foo') AND (people.id = 1)) LIMIT 1 -- read_only"]
-    @c.dataset.server(:default).filter(:name=>'foo')[1].must_equal @p
-    @c.db.sqls.must_equal ["SELECT * FROM people WHERE ((name = 'foo') AND (people.id = 1)) LIMIT 1"]
-  end
-end

data/spec/extensions/query_literals_spec.rb

@@ -1,185 +0,0 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
-
-describe "query_literals extension" do
-  before do
-    deprecated do
-      @ds = Sequel.mock.dataset.from(:t).extension(:query_literals)
-    end
-  end
-
-  it "should not use special support if given a block" do
-    @ds.select('a, b, c'){d}.sql.must_equal 'SELECT \'a, b, c\', d FROM t'
-  end
-
-  it "should have #select use literal string if given a single string" do
-    @ds.select('a, b, c').sql.must_equal 'SELECT a, b, c FROM t'
-  end
-
-  it "should have #select use placeholder literal string if given a string and additional arguments" do
-    @ds.select('a, b, ?', 1).sql.must_equal 'SELECT a, b, 1 FROM t'
-  end
-
-  it "should have #select work the standard way if initial string is a literal string already" do
-    @ds.select(Sequel.lit('a, b, ?'), 1).sql.must_equal 'SELECT a, b, ?, 1 FROM t'
-  end
-
-  it "should have #select work regularly if not given a string as the first argument" do
-    @ds.select(:a, 1).sql.must_equal 'SELECT a, 1 FROM t'
-  end
-
-  describe 'with existing selection' do
-    before do
-      @ds = @ds.select(:d)
-    end
-
-    it "should have #select_more use literal string if given a single string" do
-      @ds.select_more('a, b, c').sql.must_equal 'SELECT d, a, b, c FROM t'
-    end
-
-    it "should have #select_more use placeholder literal string if given a string and additional arguments" do
-      @ds.select_more('a, b, ?', 1).sql.must_equal 'SELECT d, a, b, 1 FROM t'
-    end
-
-    it "should have #select_more work the standard way if initial string is a literal string already" do
-      @ds.select_more(Sequel.lit('a, b, ?'), 1).sql.must_equal 'SELECT d, a, b, ?, 1 FROM t'
-    end
-
-    it "should have #select_more work regularly if not given a string as the first argument" do
-      @ds.select_more(:a, 1).sql.must_equal 'SELECT d, a, 1 FROM t'
-    end
-  end
-
-  it "should have #select_append use literal string if given a single string" do
-    @ds.select_append('a, b, c').sql.must_equal 'SELECT *, a, b, c FROM t'
-  end
-
-  it "should have #select_append use placeholder literal string if given a string and additional arguments" do
-    @ds.select_append('a, b, ?', 1).sql.must_equal 'SELECT *, a, b, 1 FROM t'
-  end
-
-  it "should have #select_append work the standard way if initial string is a literal string already" do
-    @ds.select_append(Sequel.lit('a, b, ?'), 1).sql.must_equal 'SELECT *, a, b, ?, 1 FROM t'
-  end
-
-  it "should have #select_append work regularly if not given a string as the first argument" do
-    @ds.select_append(:a, 1).sql.must_equal 'SELECT *, a, 1 FROM t'
-  end
-
-  it "should have #select_group use literal string if given a single string" do
-    @ds.select_group('a, b, c').sql.must_equal 'SELECT a, b, c FROM t GROUP BY a, b, c'
-  end
-
-  it "should have #select_group use placeholder literal string if given a string and additional arguments" do
-    @ds.select_group('a, b, ?', 1).sql.must_equal 'SELECT a, b, 1 FROM t GROUP BY a, b, 1'
-  end
-
-  it "should have #select_group work the standard way if initial string is a literal string already" do
-    @ds.select_group(Sequel.lit('a, b, ?'), 1).sql.must_equal 'SELECT a, b, ?, 1 FROM t GROUP BY a, b, ?, 1'
-  end
-
-  it "should have #select_group work regularly if not given a string as the first argument" do
-    @ds.select_group(:a, 1).sql.must_equal 'SELECT a, 1 FROM t GROUP BY a, 1'
-  end
-
-  it "should have #group use literal string if given a single string" do
-    @ds.group('a, b, c').sql.must_equal 'SELECT * FROM t GROUP BY a, b, c'
-  end
-
-  it "should have #group use placeholder literal string if given a string and additional arguments" do
-    @ds.group('a, b, ?', 1).sql.must_equal 'SELECT * FROM t GROUP BY a, b, 1'
-  end
-
-  it "should have #group work the standard way if initial string is a literal string already" do
-    @ds.group(Sequel.lit('a, b, ?'), 1).sql.must_equal 'SELECT * FROM t GROUP BY a, b, ?, 1'
-  end
-
-  it "should have #group work regularly if not given a string as the first argument" do
-    @ds.group(:a, 1).sql.must_equal 'SELECT * FROM t GROUP BY a, 1'
-  end
-
-  it "should have #group_and_count use literal string if given a single string" do
-    @ds.group_and_count('a, b, c').sql.must_equal 'SELECT a, b, c, count(*) AS count FROM t GROUP BY a, b, c'
-  end
-
-  it "should have #group_and_count use placeholder literal string if given a string and additional arguments" do
-    @ds.group_and_count('a, b, ?', 1).sql.must_equal 'SELECT a, b, 1, count(*) AS count FROM t GROUP BY a, b, 1'
-  end
-
-  it "should have #group_and_count work the standard way if initial string is a literal string already" do
-    @ds.group_and_count(Sequel.lit('a, b, ?'), 1).sql.must_equal 'SELECT a, b, ?, 1, count(*) AS count FROM t GROUP BY a, b, ?, 1'
-  end
-
-  it "should have #group_and_count work regularly if not given a string as the first argument" do
-    @ds.group_and_count(:a, 1).sql.must_equal 'SELECT a, 1, count(*) AS count FROM t GROUP BY a, 1'
-  end
-
-  it "should have #group_append use literal string if given a single string" do
-    @ds.group(:d).group_append('a, b, c').sql.must_equal 'SELECT * FROM t GROUP BY d, a, b, c'
-  end
-
-  it "should have #group_append use placeholder literal string if given a string and additional arguments" do
-    @ds.group(:d).group_append('a, b, ?', 1).sql.must_equal 'SELECT * FROM t GROUP BY d, a, b, 1'
-  end
-
-  it "should have #group_append work the standard way if initial string is a literal string already" do
-    @ds.group(:d).group_append(Sequel.lit('a, b, ?'), 1).sql.must_equal 'SELECT * FROM t GROUP BY d, a, b, ?, 1'
-  end
-
-  it "should have #group_append work regularly if not given a string as the first argument" do
-    @ds.group(:d).group_append(:a, 1).sql.must_equal 'SELECT * FROM t GROUP BY d, a, 1'
-  end
-
-  it "should have #order use literal string if given a single string" do
-    @ds.order('a, b, c').sql.must_equal 'SELECT * FROM t ORDER BY a, b, c'
-  end
-
-  it "should have #order use placeholder literal string if given a string and additional arguments" do
-    @ds.order('a, b, ?', 1).sql.must_equal 'SELECT * FROM t ORDER BY a, b, 1'
-  end
-
-  it "should have #order work the standard way if initial string is a literal string already" do
-    @ds.order(Sequel.lit('a, b, ?'), 1).sql.must_equal 'SELECT * FROM t ORDER BY a, b, ?, 1'
-  end
-
-  it "should have #order work regularly if not given a string as the first argument" do
-    @ds.order(:a, 1).sql.must_equal 'SELECT * FROM t ORDER BY a, 1'
-  end
-
-  describe 'with existing order' do
-    before do
-      @ds = @ds.order(:d)
-    end
-
-    it "should have #order_more use literal string if given a single string" do
-      @ds.order_more('a, b, c').sql.must_equal 'SELECT * FROM t ORDER BY d, a, b, c'
-    end
-
-    it "should have #order_more use placeholder literal string if given a string and additional arguments" do
-      @ds.order_more('a, b, ?', 1).sql.must_equal 'SELECT * FROM t ORDER BY d, a, b, 1'
-    end
-
-    it "should have #order_more work the standard way if initial string is a literal string already" do
-      @ds.order_more(Sequel.lit('a, b, ?'), 1).sql.must_equal 'SELECT * FROM t ORDER BY d, a, b, ?, 1'
-    end
-
-    it "should have #order_more work regularly if not given a string as the first argument" do
-      @ds.order_more(:a, 1).sql.must_equal 'SELECT * FROM t ORDER BY d, a, 1'
-    end
-
-    it "should have #order_prepend use literal string if given a single string" do
-      @ds.order_prepend('a, b, c').sql.must_equal 'SELECT * FROM t ORDER BY a, b, c, d'
-    end
-
-    it "should have #order_append use placeholder literal string if given a string and additional arguments" do
-      @ds.order_prepend('a, b, ?', 1).sql.must_equal 'SELECT * FROM t ORDER BY a, b, 1, d'
-    end
-
-    it "should have #order_append work the standard way if initial string is a literal string already" do
-      @ds.order_prepend(Sequel.lit('a, b, ?'), 1).sql.must_equal 'SELECT * FROM t ORDER BY a, b, ?, 1, d'
-    end
-
-    it "should have #order_append work regularly if not given a string as the first argument" do
-      @ds.order_prepend(:a, 1).sql.must_equal 'SELECT * FROM t ORDER BY a, 1, d'
-    end
-  end
-end

data/spec/extensions/schema_spec.rb

@@ -1,123 +0,0 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
-
-describe Sequel::Model, "set_schema" do
-  before do
-    @model = Class.new(Sequel::Model(:items))
-    deprecated do
-      @model.plugin :schema
-    end
-  end 
-
-  it "sets schema with implicit table name" do
-    @model.set_schema do
-      primary_key :ssn, :type=>:string
-    end
-    @model.primary_key.must_equal :ssn
-    @model.table_name.must_equal :items
-  end
-
-  it "sets schema with explicit table name" do
-    @model.set_schema :foo do
-      primary_key :id
-    end
-    @model.primary_key.must_equal :id
-    @model.table_name.must_equal :foo
-  end
-end
-
-describe Sequel::Model, "create_table and schema" do
-  before do
-    @model = Class.new(Sequel::Model)
-    deprecated do
-      @model.class_eval do
-        plugin :schema
-        set_schema(:items) do
-          text :name
-          float :price, :null => false
-        end
-      end
-    end
-    DB.reset
-  end
-
-  it "should get the create table SQL list from the db and execute it line by line" do
-    @model.create_table
-    DB.sqls.must_equal ['CREATE TABLE items (name text, price float NOT NULL)']
-  end
-
-  it "should allow setting schema and creating the table in one call" do
-    @model.create_table { text :name }
-    DB.sqls.must_equal ['CREATE TABLE items (name text)']
-  end
-
-  it "should reload the schema from the database" do
-    schem = {:name=>{:type=>:string}, :price=>{:type=>:float}}
-    @model.db.stub(:schema, schem.to_a.sort_by{|x| x[0].to_s}) do
-      @model.create_table
-      @model.db_schema.must_equal schem
-    end
-    @model.instance_variable_get(:@columns).must_equal [:name, :price]
-  end
-
-  it "should return the schema generator via schema" do
-    @model.schema.must_be_kind_of(Sequel::Schema::CreateTableGenerator)
-  end
-
-  it "should use the superclasses schema if it exists" do
-    @submodel = Class.new(@model)
-    @submodel.schema.must_be_kind_of(Sequel::Schema::CreateTableGenerator)
-  end
-
-  it "should return nil if no schema is present" do
-    @model = Class.new(Sequel::Model)
-    @model.plugin :schema
-    @model.schema.must_be_nil
-    @submodel = Class.new(@model)
-    @submodel.schema.must_be_nil
-  end
-end
-
-describe Sequel::Model, "schema methods" do
-  before do
-    @model = Class.new(Sequel::Model(:items))
-    deprecated do
-      @model.plugin :schema
-    end
-    DB.reset
-  end
-
-  it "table_exists? should get the table name and question the model's db if table_exists?" do
-    DB.stub(:table_exists?, false) do
-      @model.table_exists?.must_equal false
-    end
-  end
-
-  it "drop_table should drop the related table" do
-    @model.drop_table
-    DB.sqls.must_equal ['DROP TABLE items']
-  end
-
-  it "drop_table? should drop the table if it exists" do
-    @model.drop_table?
-    DB.sqls.must_equal ["SELECT NULL AS nil FROM items LIMIT 1", 'DROP TABLE items']
-  end
-  
-  it "create_table! should drop table if it exists and then create the table" do
-    @model.create_table!
-    DB.sqls.must_equal ["SELECT NULL AS nil FROM items LIMIT 1", 'DROP TABLE items', 'CREATE TABLE items ()']
-  end
-  
-  it "create_table? should not create the table if it already exists" do
-    DB.stub(:table_exists?, true) do
-      @model.create_table?
-    end
-    DB.sqls.must_equal []
-  end
-
-  it "create_table? should create the table if it doesn't exist" do
-    DB.stub(:table_exists?, false) do
-      @model.create_table?
-    end
-    DB.sqls.must_equal ['CREATE TABLE items ()']
-  end
-end

data/spec/extensions/scissors_spec.rb

@@ -1,27 +0,0 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
-
-describe "scissors plugin" do
-  before do
-    @m = Class.new(Sequel::Model(:items))
-    @m.use_transactions = true
-    deprecated do
-      @m.plugin :scissors
-    end
-    @m.db.sqls
-  end
-
-  it "Model.delete should delete from the dataset" do
-    @m.delete
-    @m.db.sqls.must_equal ['DELETE FROM items']
-  end
-
-  it "Model.update should update the dataset" do
-    @m.update(:a=>1)
-    @m.db.sqls.must_equal ['UPDATE items SET a = 1']
-  end
-
-  it "Model.destory each instance in the dataset" do
-    @m.dataset.with_fetch(:id=>1).destroy
-    @m.db.sqls.must_equal ['BEGIN', 'SELECT * FROM items', 'DELETE FROM items WHERE id = 1', 'COMMIT']
-  end
-end