sequel 3.21.0 → 3.28.0

data/spec/core/spec_helper.rb

@@ -5,6 +5,11 @@ unless Object.const_defined?('Sequel')
   require 'sequel/core'
 end
 
+if ENV['SEQUEL_COLUMNS_INTROSPECTION']
+  Sequel.extension :columns_introspection
+  Sequel::Dataset.introspect_all_columns
+end
+
 class MockDataset < Sequel::Dataset
   def insert(*args)
     @db.execute insert_sql(*args)
@@ -55,3 +60,43 @@ class SchemaDummyDatabase < Sequel::Database
     @sqls << sql
   end
 end
+
+class DummyDataset < Sequel::Dataset
+  def first
+    raise if @opts[:from] == [:a]
+    true
+  end
+end
+
+class DummyDatabase < Sequel::Database
+  attr_reader :sqls
+  
+  def execute(sql, opts={})
+    @sqls ||= []
+    @sqls << sql
+  end
+  
+  def transaction; yield; end
+
+  def dataset
+    DummyDataset.new(self)
+  end
+end
+
+class Dummy2Database < Sequel::Database
+  attr_reader :sql
+  def execute(sql); @sql = sql; end
+  def transaction; yield; end
+end
+
+class DummyDataset < Sequel::Dataset
+  VALUES = [
+    {:a => 1, :b => 2},
+    {:a => 3, :b => 4},
+    {:a => 5, :b => 6}
+  ]
+  def fetch_rows(sql, &block)
+    VALUES.each(&block)
+  end
+end
+

data/spec/extensions/association_pks_spec.rb

@@ -57,6 +57,13 @@ describe "Sequel::Plugins::AssociationPks" do
       "UPDATE albums SET artist_id = NULL WHERE ((albums.artist_id = 1) AND (id NOT IN (1, 2)))"]
   end
 
+  specify "should use associated class's primary key for a one_to_many association" do
+    @Album.set_primary_key :foo
+    @Artist.load(:id=>1).album_pks = [1, 2]
+    @db.sqls.should == ["UPDATE albums SET artist_id = 1 WHERE (foo IN (1, 2))",
+      "UPDATE albums SET artist_id = NULL WHERE ((albums.artist_id = 1) AND (foo NOT IN (1, 2)))"]
+  end
+
   specify "should set associated pks correctly for a many_to_many association" do
     @Album.load(:id=>2).tag_pks = [1, 3]
     @db.sqls[0].should == "DELETE FROM albums_tags WHERE ((album_id = 2) AND (tag_id NOT IN (1, 3)))"
@@ -82,4 +89,35 @@ describe "Sequel::Plugins::AssociationPks" do
     @db.sqls[3].should == "COMMIT"
   end
 
+  specify "should automatically convert keys to numbers if the primary key is an integer for one_to_many associations" do
+    @Album.db_schema[:id][:type] = :integer
+    @Artist.load(:id=>1).album_pks = %w'1 2'
+    @db.sqls.should == ["UPDATE albums SET artist_id = 1 WHERE (id IN (1, 2))",
+      "UPDATE albums SET artist_id = NULL WHERE ((albums.artist_id = 1) AND (id NOT IN (1, 2)))"]
+  end
+
+  specify "should not automatically convert keys if the primary key is not an integer for many_to_many associations" do
+    @Album.db_schema[:id][:type] = :string
+    @Artist.load(:id=>1).album_pks = %w'1 2'
+    @db.sqls.should == ["UPDATE albums SET artist_id = 1 WHERE (id IN ('1', '2'))",
+      "UPDATE albums SET artist_id = NULL WHERE ((albums.artist_id = 1) AND (id NOT IN ('1', '2')))"]
+  end
+
+  specify "should automatically convert keys to numbers if the primary key is an integer for one_to_many associations" do
+    @Tag.db_schema[:id][:type] = :integer
+    @Album.load(:id=>2).tag_pks = %w'1 3'
+    @db.sqls[0].should == "DELETE FROM albums_tags WHERE ((album_id = 2) AND (tag_id NOT IN (1, 3)))"
+    @db.sqls[1].should =~ /INSERT INTO albums_tags \((album_id, tag_id|tag_id, album_id)\) VALUES \((2, 1|1, 2)\)/
+    @db.sqls.length.should == 2
+  end
+
+  specify "should not automatically convert keys to numbers if the primary key is an integer for many_to_many associations" do
+    @Tag.db_schema[:id][:type] = :string
+    @Album.load(:id=>2).tag_pks = %w'1 3'
+    @db.sqls[0].should == "DELETE FROM albums_tags WHERE ((album_id = 2) AND (tag_id NOT IN ('1', '3')))"
+    @db.sqls[1].should =~ /INSERT INTO albums_tags \((album_id, tag_id|tag_id, album_id)\) VALUES \((2, '1'|'1', 2)\)/
+    @db.sqls[2].should =~ /INSERT INTO albums_tags \((album_id, tag_id|tag_id, album_id)\) VALUES \((2, '3'|'3', 2)\)/
+    @db.sqls.length.should == 3
+  end
+
 end

data/spec/extensions/columns_introspection_spec.rb

@@ -0,0 +1,91 @@
+require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
+
+describe "Sequel::Dataset.introspect_all_columns" do
+  before do
+    @db = MODEL_DB
+    @ds = @db[:a]
+    class Sequel::Dataset
+      # Handle case where introspect_all_columns has already been called
+      alias columns columns_without_introspection unless instance_methods(false).map{|x| x.to_s}.include?('columns')
+    end
+    Sequel::Dataset.introspect_all_columns
+    @db.reset
+  end
+  after do
+    class Sequel::Dataset
+      alias columns columns_without_introspection
+    end
+  end
+
+  specify "should turn on column introspection by default" do
+    @ds.select(:x).columns.should == [:x]
+    @db.sqls.length.should == 0
+  end
+end
+
+describe "columns_introspection extension" do
+  before do
+    @db = MODEL_DB
+    @ds = @db[:a]
+    @ds.extend(Sequel::ColumnsIntrospection.dup) # dup to allow multiple places in class hierarchy
+    @db.reset
+  end
+
+  specify "should not issue a database query if the columns are already loaded" do
+    @ds.instance_variable_set(:@columns, [:x])
+    @ds.columns.should == [:x]
+    @db.sqls.length.should == 0
+  end
+  
+  specify "should handle plain symbols without a database query" do
+    @ds.select(:x).columns.should == [:x]
+    @db.sqls.length.should == 0
+  end
+
+  specify "should handle qualified symbols without a database query" do
+    @ds.select(:t__x).columns.should == [:x]
+    @db.sqls.length.should == 0
+  end
+
+  specify "should handle aliased symbols without a database query" do
+    @ds.select(:x___a).columns.should == [:a]
+    @db.sqls.length.should == 0
+  end
+
+  specify "should handle qualified and aliased symbols without a database query" do
+    @ds.select(:t__x___a).columns.should == [:a]
+    @db.sqls.length.should == 0
+  end
+
+  specify "should handle SQL::Identifiers " do
+    @ds.select(:x.identifier).columns.should == [:x]
+    @db.sqls.length.should == 0
+  end
+
+  specify "should handle SQL::QualifiedIdentifiers" do
+    @ds.select(:x.qualify(:t)).columns.should == [:x]
+    @ds.select(:x.identifier.qualify(:t)).columns.should == [:x]
+    @db.sqls.length.should == 0
+  end
+
+  specify "should handle SQL::AliasedExpressions" do
+    @ds.select(:x.as(:a)).columns.should == [:a]
+    @ds.select(:x.as(:a.identifier)).columns.should == [:a]
+    @db.sqls.length.should == 0
+  end
+
+  specify "should issue a database query if the wildcard is selected" do
+    @ds.columns
+    @db.sqls.length.should == 1
+  end
+
+  specify "should issue a database query if an unsupported type is used" do
+    @ds.select(1).columns
+    @db.sqls.length.should == 1
+  end
+
+  specify "should not have column introspection on by default" do
+    @db[:a].select(:x).columns
+    @db.sqls.length.should == 1
+  end
+end

data/spec/extensions/defaults_setter_spec.rb

@@ -0,0 +1,64 @@
+require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+
+describe "Sequel::Plugins::DefaultsSetter" do
+  before do
+    @db = db = Sequel::Database.new
+    @c = c = Class.new(Sequel::Model(db[:foo]))
+    @c.instance_variable_set(:@db_schema, {:a=>{}})
+    @c.plugin :defaults_setter
+    @c.columns :a
+    @pr = proc{|x| db.meta_def(:schema){|*| [[:a, {:ruby_default => x}]]}; c.dataset = c.dataset; c}
+  end
+
+  it "should set default value upon initialization" do
+    @pr.call(2).new.values.should == {:a=>2}
+  end
+
+  it "should not mark the column as modified" do
+    @pr.call(2).new.changed_columns.should == []
+  end
+
+  it "should not set a default of nil" do
+    @pr.call(nil).new.values.should == {}
+  end
+
+  it "should not override a given value" do
+    @pr.call(2)
+    @c.new('a'=>3).values.should == {:a=>3}
+    @c.new('a'=>nil).values.should == {:a=>nil}
+  end
+
+  it "should work correctly when subclassing" do
+    Class.new(@pr.call(2)).new.values.should == {:a=>2}
+  end
+
+  it "should contain the default values in default_values" do
+    @pr.call(2).default_values.should == {:a=>2}
+    @pr.call(nil).default_values.should == {}
+  end
+
+  it "should allow modifications of default values" do
+    @pr.call(2)
+    @c.default_values[:a] = 3
+    @c.new.values.should == {:a => 3}
+  end
+
+  it "should allow proc default values" do
+    @pr.call(2)
+    @c.default_values[:a] = proc{3}
+    @c.new.values.should == {:a => 3}
+  end
+
+  it "should have procs that set default values set them to nil" do
+    @pr.call(2)
+    @c.default_values[:a] = proc{nil}
+    @c.new.values.should == {:a => nil}
+  end
+
+  it "should work correctly on a model without a dataset" do
+    @pr.call(2)
+    c = Class.new(Sequel::Model(@db[:bar]))
+    c.plugin :defaults_setter
+    c.default_values.should == {:a=>2}
+  end
+end

data/spec/extensions/identity_map_spec.rb

@@ -13,6 +13,11 @@ describe "Sequel::Plugins::IdentityMap" do
         execute(sql)
         yield h
       end
+      def self.waw_identity_map(&block) # with and without
+        with_identity_map(&block)
+        db.reset
+        yield
+      end
     end
     class ::IdentityMapAlbum < ::IdentityMapModel
       columns :artist_id
@@ -216,4 +221,161 @@ describe "Sequel::Plugins::IdentityMap" do
       MODEL_DB.sqls.length.should == 2
     end
   end
+
+  it "should not override custom :eager_loaders for many_to_many associations" do
+    @c1.columns :id
+    @c2.columns :id
+    c = @c2
+    @c1.many_to_many :artists, :class=>@c2, :left_key=>:album_id, :right_key=>:artist_id, :join_table=>:aa, :eager_loader=>(proc do |eo|
+       eo[:rows].each{|object| object.associations[:artists] = [c.load(:id=>object.id)]}
+    end)
+    ds = @c1.dataset
+    def ds.fetch_rows(sql)
+      execute(sql)
+      yield({:id=>1})
+      yield({:id=>2})
+      yield({:id=>3})
+    end
+
+    @c.waw_identity_map do
+      MODEL_DB.sqls.length.should == 0
+      a = @c1.eager(:artists).all
+      MODEL_DB.sqls.length.should == 1
+      a.should == [@c1.load(:id=>1), @c1.load(:id=>2), @c1.load(:id=>3)]
+      a.map{|x| x.artists}.should == [[@c2.load(:id=>1)], [@c2.load(:id=>2)], [@c2.load(:id=>3)]]
+      MODEL_DB.sqls.length.should == 1
+    end
+  end
+
+  it "should work correctly when eagerly loading many_to_many associations" do
+    @c1.columns :id
+    @c2.columns :id
+    @c1.many_to_many :artists, :class=>@c2, :left_key=>:album_id, :right_key=>:artist_id, :join_table=>:aa
+    ds = @c1.dataset
+    def ds.fetch_rows(sql)
+      execute(sql)
+      yield({:id=>1})
+      yield({:id=>2})
+      yield({:id=>3})
+    end
+    ds = @c2.dataset
+    def ds.fetch_rows(sql)
+      execute(sql)
+      yield({:id=>1, :x_foreign_key_x=>1})
+      yield({:id=>1, :x_foreign_key_x=>2})
+      yield({:id=>2, :x_foreign_key_x=>1})
+      yield({:id=>2, :x_foreign_key_x=>2})
+      yield({:id=>3, :x_foreign_key_x=>1})
+      yield({:id=>3, :x_foreign_key_x=>1})
+    end
+
+    @c.waw_identity_map do
+      MODEL_DB.sqls.length.should == 0
+      a = @c1.eager(:artists).all
+      MODEL_DB.sqls.length.should == 2
+      a.should == [@c1.load(:id=>1), @c1.load(:id=>2), @c1.load(:id=>3)]
+      a.map{|x| x.artists}.should == [[@c2.load(:id=>1), @c2.load(:id=>2), @c2.load(:id=>3), @c2.load(:id=>3)], [@c2.load(:id=>1), @c2.load(:id=>2)], []]
+      MODEL_DB.sqls.length.should == 2
+    end
+  end
+
+  it "should work correctly when eagerly loading many_to_many associations with composite keys" do
+    @c1.columns :id, :id2
+    @c2.columns :id
+    @c1.set_primary_key :id, :id2
+    @c1.many_to_many :artists, :class=>@c2, :left_key=>[:album_id1, :album_id2], :right_key=>:artist_id, :join_table=>:aa
+    ds = @c1.dataset
+    def ds.fetch_rows(sql)
+      execute(sql)
+      yield({:id=>1, :id2=>4})
+      yield({:id=>2, :id2=>5})
+      yield({:id=>3, :id2=>6})
+    end
+    ds = @c2.dataset
+    def ds.fetch_rows(sql)
+      execute(sql)
+      yield({:id=>1, :x_foreign_key_0_x=>1, :x_foreign_key_1_x=>4})
+      yield({:id=>1, :x_foreign_key_0_x=>2, :x_foreign_key_1_x=>5})
+      yield({:id=>2, :x_foreign_key_0_x=>1, :x_foreign_key_1_x=>4})
+      yield({:id=>2, :x_foreign_key_0_x=>2, :x_foreign_key_1_x=>5})
+      yield({:id=>3, :x_foreign_key_0_x=>1, :x_foreign_key_1_x=>4})
+      yield({:id=>3, :x_foreign_key_0_x=>1, :x_foreign_key_1_x=>4})
+    end
+
+    @c.waw_identity_map do
+      MODEL_DB.sqls.length.should == 0
+      a = @c1.eager(:artists).all
+      MODEL_DB.sqls.length.should == 2
+      a.should == [@c1.load(:id=>1, :id2=>4), @c1.load(:id=>2, :id2=>5), @c1.load(:id=>3, :id2=>6)]
+      a.map{|x| x.artists}.should == [[@c2.load(:id=>1), @c2.load(:id=>2), @c2.load(:id=>3), @c2.load(:id=>3)], [@c2.load(:id=>1), @c2.load(:id=>2)], []]
+      MODEL_DB.sqls.length.should == 2
+    end
+  end
+
+  it "should work correctly when eagerly loading many_through_many associations" do
+    @c1.columns :id
+    @c2.columns :id
+    @c1.plugin :many_through_many
+    @c1.many_through_many :artists, [[:aa, :album_id, :artist_id]], :class=>@c2
+    ds = @c1.dataset
+    def ds.fetch_rows(sql)
+      execute(sql)
+      yield({:id=>1})
+      yield({:id=>2})
+      yield({:id=>3})
+    end
+    ds = @c2.dataset
+    def ds.fetch_rows(sql)
+      execute(sql)
+      yield({:id=>1, :x_foreign_key_x=>1})
+      yield({:id=>1, :x_foreign_key_x=>2})
+      yield({:id=>2, :x_foreign_key_x=>1})
+      yield({:id=>2, :x_foreign_key_x=>2})
+      yield({:id=>3, :x_foreign_key_x=>1})
+      yield({:id=>3, :x_foreign_key_x=>1})
+    end
+
+    @c.waw_identity_map do
+      MODEL_DB.sqls.length.should == 0
+      a = @c1.eager(:artists).all
+      MODEL_DB.sqls.length.should == 2
+      a.should == [@c1.load(:id=>1), @c1.load(:id=>2), @c1.load(:id=>3)]
+      a.map{|x| x.artists}.should == [[@c2.load(:id=>1), @c2.load(:id=>2), @c2.load(:id=>3), @c2.load(:id=>3)], [@c2.load(:id=>1), @c2.load(:id=>2)], []]
+      MODEL_DB.sqls.length.should == 2
+    end
+  end
+
+  it "should work correctly when eagerly loading many_to_many associations with composite keys" do
+    @c1.columns :id, :id2
+    @c2.columns :id
+    @c1.set_primary_key :id, :id2
+    @c1.plugin :many_through_many
+    @c1.many_through_many :artists, [[:aa, [:album_id1, :album_id2], :artist_id]], :class=>@c2
+    ds = @c1.dataset
+    def ds.fetch_rows(sql)
+      execute(sql)
+      yield({:id=>1, :id2=>4})
+      yield({:id=>2, :id2=>5})
+      yield({:id=>3, :id2=>6})
+    end
+    ds = @c2.dataset
+    def ds.fetch_rows(sql)
+      execute(sql)
+      yield({:id=>1, :x_foreign_key_0_x=>1, :x_foreign_key_1_x=>4})
+      yield({:id=>1, :x_foreign_key_0_x=>2, :x_foreign_key_1_x=>5})
+      yield({:id=>2, :x_foreign_key_0_x=>1, :x_foreign_key_1_x=>4})
+      yield({:id=>2, :x_foreign_key_0_x=>2, :x_foreign_key_1_x=>5})
+      yield({:id=>3, :x_foreign_key_0_x=>1, :x_foreign_key_1_x=>4})
+      yield({:id=>3, :x_foreign_key_0_x=>1, :x_foreign_key_1_x=>4})
+    end
+
+    @c.waw_identity_map do
+      MODEL_DB.sqls.length.should == 0
+      a = @c1.eager(:artists).all
+      MODEL_DB.sqls.length.should == 2
+      a.should == [@c1.load(:id=>1, :id2=>4), @c1.load(:id=>2, :id2=>5), @c1.load(:id=>3, :id2=>6)]
+      a.map{|x| x.artists}.should == [[@c2.load(:id=>1), @c2.load(:id=>2), @c2.load(:id=>3), @c2.load(:id=>3)], [@c2.load(:id=>1), @c2.load(:id=>2)], []]
+      MODEL_DB.sqls.length.should == 2
+    end
+  end
 end