sequel 4.11.0 → 4.12.0

data/spec/extensions/prepared_statements_spec.rb

@@ -5,6 +5,7 @@ describe "prepared_statements plugin" 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
+    @columns = "id, name, i"
     @c.plugin :prepared_statements
     @p = @c.load(:id=>1, :name=>'foo', :i=>2)
     @ds = @c.dataset
@@ -13,7 +14,7 @@ describe "prepared_statements plugin" do
 
   specify "should correctly lookup by primary key" do
     @c[1].should == @p
-    @db.sqls.should == ["SELECT * FROM people WHERE (id = 1) LIMIT 1 -- read_only"]
+    @db.sqls.should == ["SELECT id, name, i FROM people WHERE (id = 1) LIMIT 1 -- read_only"]
   end 
 
   shared_examples_for "prepared_statements plugin" do
@@ -29,7 +30,7 @@ describe "prepared_statements plugin" do
 
     specify "should correctly create instance" do
       @c.create(:name=>'foo').should == @c.load(:id=>1, :name=>'foo', :i => 2)
-      @db.sqls.should == ["INSERT INTO people (name) VALUES ('foo')", "SELECT * FROM people WHERE (id = 1) LIMIT 1"]
+      @db.sqls.should == ["INSERT INTO people (name) VALUES ('foo')", "SELECT #{@columns} FROM people WHERE (id = 1) LIMIT 1"]
     end
 
     specify "should correctly create instance if dataset supports insert_select" do
@@ -39,14 +40,15 @@ describe "prepared_statements plugin" do
         end
         def insert_select(h)
           self._fetch = {:id=>1, :name=>'foo', :i => 2}
-          returning.server(:default).with_sql(:insert_sql, h).first
+          ds = opts[:returning] ? self : returning
+          ds.server(:default).with_sql(:insert_sql, h).first
         end
         def insert_sql(*)
-          "#{super}#{' RETURNING *' if opts.has_key?(:returning)}"
+          "#{super}#{" RETURNING #{opts[:returning] && !opts[:returning].empty? ? opts[:returning].map{|c| literal(c)}.join(', ') : '*'}" if opts.has_key?(:returning)}"
         end
       end
       @c.create(:name=>'foo').should == @c.load(:id=>1, :name=>'foo', :i => 2)
-      @db.sqls.should == ["INSERT INTO people (name) VALUES ('foo') RETURNING *"]
+      @db.sqls.should == ["INSERT INTO people (name) VALUES ('foo') RETURNING #{@columns}"]
     end
   end
 
@@ -54,6 +56,7 @@ describe "prepared_statements plugin" do
 
   describe "when #use_prepared_statements_for? returns false" do
     before do
+      @columns = "*"
       @c.class_eval{def use_prepared_statements_for?(type) false end}
     end
 
@@ -63,7 +66,7 @@ describe "prepared_statements plugin" do
   specify "should work correctly when subclassing" do
     c = Class.new(@c)
     c[1].should == c.load(:id=>1, :name=>'foo', :i=>2)
-    @db.sqls.should == ["SELECT * FROM people WHERE (id = 1) LIMIT 1 -- read_only"]
+    @db.sqls.should == ["SELECT id, name, i FROM people WHERE (id = 1) LIMIT 1 -- read_only"]
   end 
 
   describe " with placeholder type specifiers" do 
@@ -73,7 +76,7 @@ describe "prepared_statements plugin" do
 
     specify "should correctly handle without schema type" do
       @c[1].should == @p
-      @db.sqls.should == ["SELECT * FROM people WHERE (id = 1) LIMIT 1 -- read_only"]
+      @db.sqls.should == ["SELECT id, name, i FROM people WHERE (id = 1) LIMIT 1 -- read_only"]
     end
 
     specify "should correctly handle with schema type" do
@@ -92,7 +95,7 @@ describe "prepared_statements plugin" do
         end
       end
       @c[1].should == @p
-      @db.sqls.should == ["SELECT * FROM people WHERE (id = 1) LIMIT 1 -- read_only"]
+      @db.sqls.should == ["SELECT id, name, i FROM people WHERE (id = 1) LIMIT 1 -- read_only"]
     end 
   end
 end

data/spec/integration/plugin_test.rb

@@ -1761,6 +1761,49 @@ describe "Sequel::Plugins::PreparedStatements" do
   end
 end
 
+describe "Sequel::Plugins::PreparedStatements with schema changes" do
+  before do
+    @db = DB
+    @db.create_table!(:ps_test) do
+      primary_key :id
+      String :name
+    end
+    @c = Class.new(Sequel::Model(@db[:ps_test]))
+    @c.many_to_one :ps_test, :key=>:id, :class=>@c
+    @c.one_to_many :ps_tests, :key=>:id, :class=>@c
+    @c.many_to_many :mps_tests, :left_key=>:id, :right_key=>:id, :class=>@c, :join_table=>:ps_test___x
+    @c.plugin :prepared_statements
+    @c.plugin :prepared_statements_associations
+  end
+  after do
+    @db.drop_table?(:ps_test)
+  end
+
+  it "should handle added columns" do 
+    foo = @c.create(:name=>'foo')
+    @c[foo.id].name.should == 'foo'
+    foo.ps_test.name.should == 'foo'
+    foo.ps_tests.map{|x| x.name}.should == %w'foo'
+    foo.mps_tests.map{|x| x.name}.should == %w'foo'
+    foo.update(:name=>'foo2')
+    @c[foo.id].name.should == 'foo2'
+    foo.delete
+    foo.exists?.should == false
+
+    @db.alter_table(:ps_test){add_column :i, Integer}
+
+    foo = @c.create(:name=>'foo')
+    @c[foo.id].name.should == 'foo'
+    foo.ps_test.name.should == 'foo'
+    foo.ps_tests.map{|x| x.name}.should == %w'foo'
+    foo.mps_tests.map{|x| x.name}.should == %w'foo'
+    foo.update(:name=>'foo2')
+    @c[foo.id].name.should == 'foo2'
+    foo.delete
+    foo.exists?.should == false
+  end
+end
+
 describe "Caching plugins" do
   before(:all) do
     @db = DB

data/spec/integration/schema_test.rb

@@ -142,6 +142,13 @@ describe "Database schema parser" do
     DB.create_table!(:items){FalseClass :number}
     DB.schema(:items).first.last[:type].should == :boolean
   end
+
+  specify "should parse maximum length for string columns" do
+    DB.create_table!(:items){String :a, :size=>4}
+    DB.schema(:items).first.last[:max_length].should == 4
+    DB.create_table!(:items){String :a, :fixed=>true, :size=>3}
+    DB.schema(:items).first.last[:max_length].should == 3
+  end
 end if DB.supports_schema_parsing?
 
 describe "Database index parsing" do

data/spec/model/eager_loading_spec.rb

@@ -762,6 +762,15 @@ describe Sequel::Model, "#eager" do
     a.first.tracks.should == [EagerTrack.load(:id => 3, :album_id=>1)]
     DB.sqls.should == []
   end
+
+  it "should respect the :limit option on a one_to_many association with an association block" do
+    EagerAlbum.one_to_many :tracks, :class=>'EagerTrack', :key=>:album_id, :order=>:name, :limit=>2 do |ds| ds.where(:a=>1) end
+    a = EagerAlbum.eager(:tracks).all
+    a.should == [EagerAlbum.load(:id => 1, :band_id => 2)]
+    DB.sqls.should == ['SELECT * FROM albums', 'SELECT * FROM (SELECT * FROM tracks WHERE ((a = 1) AND (1 = tracks.album_id)) ORDER BY name LIMIT 2) AS t1']
+    a.first.tracks.should == [EagerTrack.load(:id => 3, :album_id=>1)]
+    DB.sqls.should == []
+  end
   
   it "should respect the :limit option on a one_to_many association using the :window_function strategy" do
     def (EagerTrack.dataset).supports_window_functions?() true end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequel
 version: !ruby/object:Gem::Version
-  version: 4.11.0
+  version: 4.12.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-03 00:00:00.000000000 Z
+date: 2014-07-01 00:00:00.000000000 Z
 dependencies: []
 description: The Database Toolkit for Ruby
 email: code@jeremyevans.net
@@ -128,6 +128,7 @@ extra_rdoc_files:
 - doc/release_notes/4.9.0.txt
 - doc/release_notes/4.10.0.txt
 - doc/release_notes/4.11.0.txt
+- doc/release_notes/4.12.0.txt
 files:
 - CHANGELOG
 - MIT-LICENSE
@@ -226,6 +227,7 @@ files:
 - doc/release_notes/4.1.0.txt
 - doc/release_notes/4.10.0.txt
 - doc/release_notes/4.11.0.txt
+- doc/release_notes/4.12.0.txt
 - doc/release_notes/4.2.0.txt
 - doc/release_notes/4.3.0.txt
 - doc/release_notes/4.4.0.txt