sequel 4.49.0 → 5.0.0

data/spec/extensions/meta_def_spec.rb

@@ -1,35 +0,0 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
-
-describe "Sequel::Metaprogramming" do
-  before do
-    deprecated do
-      Sequel.extension :meta_def
-    end
-  end
-  after do
-    Sequel::Metaprogramming.send(:remove_method, :meta_def)
-  end
-
-  it "should add meta_def method to Database, Dataset, and Model classes and instances" do
-    Sequel::Database.meta_def(:foo){1}
-    Sequel::Database.foo.must_equal 1
-    Sequel::Dataset.meta_def(:foo){2}
-    Sequel::Dataset.foo.must_equal 2
-    Sequel::Model.meta_def(:foo){3}
-    Sequel::Model.foo.must_equal 3
-    o = Sequel::Database.new
-    o.meta_def(:foo){4}
-    o.foo.must_equal 4
-    
-    o = o[:a]
-    # SEQUEL5: Remove
-    unless o.frozen?
-      o.meta_def(:foo){5}
-      o.foo.must_equal 5
-    end
-
-    o = Sequel::Model.new
-    o.meta_def(:foo){6}
-    o.foo.must_equal 6
-  end
-end

data/spec/extensions/no_auto_literal_strings_spec.rb

@@ -1,69 +0,0 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
-
-describe "no_auto_literal_strings extension" do
-  before do
-    @ds = Sequel.mock[:t].extension(:no_auto_literal_strings)
-  end
-
-  it "should raise exception for plain strings in filter methods" do
-    proc{@ds.where("a")}.must_raise Sequel::Error
-    proc{@ds.having("a")}.must_raise Sequel::Error
-    proc{@ds.filter("a")}.must_raise Sequel::Error
-    proc{@ds.exclude_having("a")}.must_raise Sequel::Error
-    deprecated do
-      proc{@ds.exclude_where("a")}.must_raise Sequel::Error
-      proc{@ds.and("a")}.must_raise Sequel::Error
-    end
-    proc{@ds.where(:a).or("a")}.must_raise Sequel::Error
-    proc{@ds.first("a")}.must_raise Sequel::Error
-    proc{@ds.order(:a).last("a")}.must_raise Sequel::Error
-    proc{@ds["a"]}.must_raise Sequel::Error
-  end
-  
-  it "should raise exception for plain strings arrays in filter methods" do
-    proc{@ds.where(["a"])}.must_raise Sequel::Error
-  end
-
-  it "should handle explicit literal strings in filter methods" do
-    @ds.where(Sequel.lit("a")).sql.must_equal 'SELECT * FROM t WHERE (a)'
-    @ds.having(Sequel.lit("a")).sql.must_equal 'SELECT * FROM t HAVING (a)'
-    @ds.filter(Sequel.lit("a")).sql.must_equal 'SELECT * FROM t WHERE (a)'
-    @ds.exclude_having(Sequel.lit("a")).sql.must_equal 'SELECT * FROM t HAVING NOT (a)'
-    deprecated do
-      @ds.exclude_where(Sequel.lit("a")).sql.must_equal 'SELECT * FROM t WHERE NOT (a)'
-      @ds.and(Sequel.lit("a")).sql.must_equal 'SELECT * FROM t WHERE (a)'
-    end
-    @ds.where(:a).or(Sequel.lit("a")).sql.must_equal 'SELECT * FROM t WHERE (a OR (a))'
-    @ds.first(Sequel.lit("a"))
-    @ds.order(:a).last(Sequel.lit("a"))
-    @ds[Sequel.lit("a")]
-    @ds.db.sqls.must_equal ["SELECT * FROM t WHERE (a) LIMIT 1",
-                            "SELECT * FROM t WHERE (a) ORDER BY a DESC LIMIT 1",
-                            "SELECT * FROM t WHERE (a) LIMIT 1"]
-  end
-  
-  deprecated "should handle literal strings in arrays in filter methods" do
-    @ds.where([Sequel.lit("a")]).sql.must_equal 'SELECT * FROM t WHERE (a)'
-  end
-
-  it "should handle other objects in filter methods" do
-    @ds.where(:a).sql.must_equal 'SELECT * FROM t WHERE a'
-  end
-  
-  it "should raise exception for plain strings in update methods" do
-    proc{@ds.update("a = a + 1")}.must_raise Sequel::Error
-    proc{@ds.update_sql("a = a + 1")}.must_raise Sequel::Error
-  end
-  
-  it "should handle explicit literal strings in update methods" do
-    @ds.update_sql(Sequel.lit("a = a + 1")).must_equal "UPDATE t SET a = a + 1"
-    @ds.update(Sequel.lit("a = a + 1"))
-    @ds.db.sqls.must_equal ["UPDATE t SET a = a + 1"]
-  end
-  
-  it "should handle other objects in update methods" do
-    @ds.update_sql(:a=>:a).must_equal "UPDATE t SET a = a"
-    @ds.update(:a=>:a)
-    @ds.db.sqls.must_equal ["UPDATE t SET a = a"]
-  end
-end

data/spec/extensions/pg_typecast_on_load_spec.rb

@@ -1,70 +0,0 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
-
-describe Sequel::Model, "PgTypecastOnLoad plugin" do
-  before do
-    @db = Sequel.mock(:host=>'postgres', :fetch=>{:id=>1, :b=>"t", :y=>"0"}, :columns=>[:id, :b, :y], :numrows=>1)
-    def @db.schema(*args)
-      [[:id, {}], [:b, {:type=>:boolean, :oid=>16}], [:y, {:type=>:integer, :oid=>20}]]
-    end
-    @c = Class.new(Sequel::Model(@db[:items]))
-    deprecated do
-      @c.plugin :pg_typecast_on_load, :b, :y
-    end
-  end 
-
-  deprecated "should call the database conversion proc for all given columns" do
-    @c.first.values.must_equal(:id=>1, :b=>true, :y=>0)
-  end
-
-  deprecated "should call the database conversion proc with value when reloading the object, for all given columns" do
-    @c.first.refresh.values.must_equal(:id=>1, :b=>true, :y=>0)
-  end
-
-  deprecated "should not fail if schema oid does not have a related conversion proc" do
-    @c.db_schema[:b][:oid] = 0
-    @c.first.refresh.values.must_equal(:id=>1, :b=>"t", :y=>0)
-  end
-
-  deprecated "should call the database conversion proc with value when automatically reloading the object on creation via insert_select" do
-    @c.dataset = @c.dataset.with_extend{def insert_select(h) insert(h); first end}
-    @c.create.values.must_equal(:id=>1, :b=>true, :y=>0)
-  end
-
-  deprecated "should allowing setting columns separately via add_pg_typecast_on_load_columns" do
-    @c = Class.new(Sequel::Model(@db[:items]))
-    @c.plugin :pg_typecast_on_load
-    @c.first.values.must_equal(:id=>1, :b=>"t", :y=>"0")
-    @c.add_pg_typecast_on_load_columns :b
-    @c.first.values.must_equal(:id=>1, :b=>true, :y=>"0")
-    @c.add_pg_typecast_on_load_columns :y
-    @c.first.values.must_equal(:id=>1, :b=>true, :y=>0)
-  end
-
-  deprecated "should work with subclasses" do
-    @c = Class.new(Sequel::Model(@db[:items]))
-    @c.plugin :pg_typecast_on_load
-    @c.first.values.must_equal(:id=>1, :b=>"t", :y=>"0")
-
-    c1 = Class.new(@c)
-    @c.add_pg_typecast_on_load_columns :b
-    @c.first.values.must_equal(:id=>1, :b=>true, :y=>"0")
-    c1.first.values.must_equal(:id=>1, :b=>"t", :y=>"0")
-
-    c2 = Class.new(@c)
-    @c.add_pg_typecast_on_load_columns :y
-    @c.first.values.must_equal(:id=>1, :b=>true, :y=>0)
-    c2.first.values.must_equal(:id=>1, :b=>true, :y=>"0")
-    
-    c1.add_pg_typecast_on_load_columns :y
-    c1.first.values.must_equal(:id=>1, :b=>"t", :y=>0)
-  end
-
-  deprecated "should not mark the object as modified" do
-    @c.first.modified?.must_equal false
-  end
-
-  deprecated "should freeze pg_typecast_on_load_columns" do
-    @c.freeze
-    @c.pg_typecast_on_load_columns.frozen?.must_equal true
-  end
-end

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