sequel 4.39.0 → 4.40.0

data/spec/integration/eager_loader_test.rb

@@ -178,7 +178,7 @@ describe "has_many :through has_many and has_one :through belongs_to" do
     class ::Firm < Sequel::Model
       one_to_many :clients
       one_to_many :invoices, :read_only=>true, \
-        :dataset=>proc{Invoice.eager_graph(:client).filter(:client__firm_id=>pk)}, \
+        :dataset=>proc{Invoice.eager_graph(:client).filter(Sequel[:client][:firm_id]=>pk)}, \
         :after_load=>(proc do |firm, invs|
           invs.each do |inv|
             inv.client.associations[:firm] = inv.associations[:firm] = firm
@@ -187,7 +187,7 @@ describe "has_many :through has_many and has_one :through belongs_to" do
         :eager_loader=>(proc do |eo|
           id_map = eo[:id_map]
           eo[:rows].each{|firm| firm.associations[:invoices] = []}
-          Invoice.eager_graph(:client).filter(:client__firm_id=>id_map.keys).all do |inv|
+          Invoice.eager_graph(:client).filter(Sequel[:client][:firm_id]=>id_map.keys).all do |inv|
             id_map[inv.client.firm_id].each do |firm|
               firm.associations[:invoices] << inv
             end
@@ -211,7 +211,7 @@ describe "has_many :through has_many and has_one :through belongs_to" do
     class ::Invoice < Sequel::Model
       many_to_one :client
       many_to_one :firm, :key=>nil, :read_only=>true, \
-        :dataset=>proc{Firm.eager_graph(:clients).filter(:clients__id=>client_id)}, \
+        :dataset=>proc{Firm.eager_graph(:clients).filter(Sequel[:clients][:id]=>client_id)}, \
         :after_load=>(proc do |inv, firm|
           # Delete the cached associations from firm, because it only has the
           # client with this invoice, instead of all clients of the firm
@@ -226,7 +226,7 @@ describe "has_many :through has_many and has_one :through belongs_to" do
             inv.associations[:firm] = nil
             (id_map[inv.client_id] ||= []) << inv
           end
-          Firm.eager_graph(:clients).filter(:clients__id=>id_map.keys).all do |firm|
+          Firm.eager_graph(:clients).filter(Sequel[:clients][:id]=>id_map.keys).all do |firm|
             # Delete the cached associations from firm, because it only has the
             # clients related the invoices being eagerly loaded, instead of all
             # clients of the firm.
@@ -666,19 +666,19 @@ describe "one to one associations" do
   end
 
   it "should be eager loadable" do
-    bk1, bk2 = Book.filter(:books__id=>[1,2]).eager(:first_page).all
+    bk1, bk2 = Book.filter(Sequel[:books][:id]=>[1,2]).eager(:first_page).all
     bk1.first_page.must_equal @page1
     bk2.first_page.must_equal @page3
   end
 
   it "should be eager graphable" do
-    bk1, bk2 = Book.filter(:books__id=>[1,2]).eager_graph(:first_page).all
+    bk1, bk2 = Book.filter(Sequel[:books][:id]=>[1,2]).eager_graph(:first_page).all
     bk1.first_page.must_equal @page1
     bk2.first_page.must_equal @page3
   end
 
   it "should be eager graphable two at once" do
-    bk1, bk2 = Book.filter(:books__id=>[1,2]).eager_graph(:first_page, :second_page).all
+    bk1, bk2 = Book.filter(Sequel[:books][:id]=>[1,2]).eager_graph(:first_page, :second_page).all
     bk1.first_page.must_equal @page1
     bk1.second_page.must_equal @page2
     bk2.first_page.must_equal @page3

data/spec/integration/plugin_test.rb

@@ -123,7 +123,7 @@ describe "Class Table Inheritance Plugin" do
   end
   
   it "should handle associations only defined in subclasses" do
-    Employee.filter(:employees__id=>@i2).all.first.manager.id.must_equal @i4
+    Employee.filter(Sequel[:employees][:id]=>@i2).all.first.manager.id.must_equal @i4
   end
 
   it "should insert rows into all tables" do
@@ -248,10 +248,10 @@ describe "Many Through Many Plugin" do
     Artist.filter(:id=>@artist3.id).eager(:albums).all.map{|x| x.albums.map{|a| a.name}}.flatten.sort.must_equal %w'B C'
     Artist.filter(:id=>@artist4.id).eager(:albums).all.map{|x| x.albums.map{|a| a.name}}.flatten.sort.must_equal %w'B D'
     
-    Artist.filter(:artists__id=>@artist1.id).eager_graph(:albums).all.map{|x| x.albums.map{|a| a.name}}.flatten.sort.must_equal %w'A D'
-    Artist.filter(:artists__id=>@artist2.id).eager_graph(:albums).all.map{|x| x.albums.map{|a| a.name}}.flatten.sort.must_equal %w'A C'
-    Artist.filter(:artists__id=>@artist3.id).eager_graph(:albums).all.map{|x| x.albums.map{|a| a.name}}.flatten.sort.must_equal %w'B C'
-    Artist.filter(:artists__id=>@artist4.id).eager_graph(:albums).all.map{|x| x.albums.map{|a| a.name}}.flatten.sort.must_equal %w'B D'
+    Artist.filter(Sequel[:artists][:id]=>@artist1.id).eager_graph(:albums).all.map{|x| x.albums.map{|a| a.name}}.flatten.sort.must_equal %w'A D'
+    Artist.filter(Sequel[:artists][:id]=>@artist2.id).eager_graph(:albums).all.map{|x| x.albums.map{|a| a.name}}.flatten.sort.must_equal %w'A C'
+    Artist.filter(Sequel[:artists][:id]=>@artist3.id).eager_graph(:albums).all.map{|x| x.albums.map{|a| a.name}}.flatten.sort.must_equal %w'B C'
+    Artist.filter(Sequel[:artists][:id]=>@artist4.id).eager_graph(:albums).all.map{|x| x.albums.map{|a| a.name}}.flatten.sort.must_equal %w'B D'
 
     Artist.filter(:albums=>@album1).all.map{|a| a.name}.sort.must_equal %w'1 2'
     Artist.filter(:albums=>@album2).all.map{|a| a.name}.sort.must_equal %w'3 4'
@@ -289,8 +289,8 @@ describe "Many Through Many Plugin" do
     c.exclude(:albums=>[@album1, @album3]).all.map{|a| a.name}.sort.must_equal %w'4'
     c.exclude(:albums=>[@album2, @album4]).all.map{|a| a.name}.sort.must_equal %w'2'
 
-    c.filter(:albums=>self_join(Album).filter(:albums__id=>[@album1.id, @album3.id])).all.map{|a| a.name}.sort.must_equal %w'1 2 3'
-    c.exclude(:albums=>self_join(Album).filter(:albums__id=>[@album1.id, @album3.id])).all.map{|a| a.name}.sort.must_equal %w'4'
+    c.filter(:albums=>self_join(Album).filter(Sequel[:albums][:id]=>[@album1.id, @album3.id])).all.map{|a| a.name}.sort.must_equal %w'1 2 3'
+    c.exclude(:albums=>self_join(Album).filter(Sequel[:albums][:id]=>[@album1.id, @album3.id])).all.map{|a| a.name}.sort.must_equal %w'4'
   end
 
   it "should handle typical case with 3 join tables" do
@@ -311,10 +311,10 @@ describe "Many Through Many Plugin" do
     Artist.filter(:id=>@artist3.id).eager(:related_artists).all.map{|x| x.related_artists.map{|a| a.name}}.flatten.sort.must_equal %w'2 3 4'
     Artist.filter(:id=>@artist4.id).eager(:related_artists).all.map{|x| x.related_artists.map{|a| a.name}}.flatten.sort.must_equal %w'1 3 4'
     
-    Artist.filter(:artists__id=>@artist1.id).eager_graph(:related_artists).all.map{|x| x.related_artists.map{|a| a.name}}.flatten.sort.must_equal %w'1 2 4'
-    Artist.filter(:artists__id=>@artist2.id).eager_graph(:related_artists).all.map{|x| x.related_artists.map{|a| a.name}}.flatten.sort.must_equal %w'1 2 3'
-    Artist.filter(:artists__id=>@artist3.id).eager_graph(:related_artists).all.map{|x| x.related_artists.map{|a| a.name}}.flatten.sort.must_equal %w'2 3 4'
-    Artist.filter(:artists__id=>@artist4.id).eager_graph(:related_artists).all.map{|x| x.related_artists.map{|a| a.name}}.flatten.sort.must_equal %w'1 3 4'
+    Artist.filter(Sequel[:artists][:id]=>@artist1.id).eager_graph(:related_artists).all.map{|x| x.related_artists.map{|a| a.name}}.flatten.sort.must_equal %w'1 2 4'
+    Artist.filter(Sequel[:artists][:id]=>@artist2.id).eager_graph(:related_artists).all.map{|x| x.related_artists.map{|a| a.name}}.flatten.sort.must_equal %w'1 2 3'
+    Artist.filter(Sequel[:artists][:id]=>@artist3.id).eager_graph(:related_artists).all.map{|x| x.related_artists.map{|a| a.name}}.flatten.sort.must_equal %w'2 3 4'
+    Artist.filter(Sequel[:artists][:id]=>@artist4.id).eager_graph(:related_artists).all.map{|x| x.related_artists.map{|a| a.name}}.flatten.sort.must_equal %w'1 3 4'
 
     Artist.filter(:related_artists=>@artist1).all.map{|a| a.name}.sort.must_equal %w'1 2 4'
     Artist.filter(:related_artists=>@artist2).all.map{|a| a.name}.sort.must_equal %w'1 2 3'
@@ -346,8 +346,8 @@ describe "Many Through Many Plugin" do
     c.filter(:related_artists=>[@artist1, @artist4]).all.map{|a| a.name}.sort.must_equal %w'1 2 3 4'
     c.exclude(:related_artists=>[@artist1, @artist4]).all.map{|a| a.name}.sort.must_equal %w''
 
-    c.filter(:related_artists=>c.filter(:artists__id=>@artist1.id)).all.map{|a| a.name}.sort.must_equal %w'1 2 4'
-    c.exclude(:related_artists=>c.filter(:artists__id=>@artist1.id)).all.map{|a| a.name}.sort.must_equal %w'3'
+    c.filter(:related_artists=>c.filter(Sequel[:artists][:id]=>@artist1.id)).all.map{|a| a.name}.sort.must_equal %w'1 2 4'
+    c.exclude(:related_artists=>c.filter(Sequel[:artists][:id]=>@artist1.id)).all.map{|a| a.name}.sort.must_equal %w'3'
   end
 
   it "should handle extreme case with 5 join tables" do
@@ -377,10 +377,10 @@ describe "Many Through Many Plugin" do
     Artist.filter(:id=>@artist3.id).eager(:related_albums).all.map{|x| x.related_albums.map{|a| a.name}}.flatten.sort.must_equal %w'A B D'
     Artist.filter(:id=>@artist4.id).eager(:related_albums).all.map{|x| x.related_albums.map{|a| a.name}}.flatten.sort.must_equal %w'B D'
     
-    Artist.filter(:artists__id=>@artist1.id).eager_graph(:related_albums).all.map{|x| x.related_albums.map{|a| a.name}}.flatten.sort.must_equal %w'A B C'
-    Artist.filter(:artists__id=>@artist2.id).eager_graph(:related_albums).all.map{|x| x.related_albums.map{|a| a.name}}.flatten.sort.must_equal %w'A B C D'
-    Artist.filter(:artists__id=>@artist3.id).eager_graph(:related_albums).all.map{|x| x.related_albums.map{|a| a.name}}.flatten.sort.must_equal %w'A B D'
-    Artist.filter(:artists__id=>@artist4.id).eager_graph(:related_albums).all.map{|x| x.related_albums.map{|a| a.name}}.flatten.sort.must_equal %w'B D'
+    Artist.filter(Sequel[:artists][:id]=>@artist1.id).eager_graph(:related_albums).all.map{|x| x.related_albums.map{|a| a.name}}.flatten.sort.must_equal %w'A B C'
+    Artist.filter(Sequel[:artists][:id]=>@artist2.id).eager_graph(:related_albums).all.map{|x| x.related_albums.map{|a| a.name}}.flatten.sort.must_equal %w'A B C D'
+    Artist.filter(Sequel[:artists][:id]=>@artist3.id).eager_graph(:related_albums).all.map{|x| x.related_albums.map{|a| a.name}}.flatten.sort.must_equal %w'A B D'
+    Artist.filter(Sequel[:artists][:id]=>@artist4.id).eager_graph(:related_albums).all.map{|x| x.related_albums.map{|a| a.name}}.flatten.sort.must_equal %w'B D'
 
     Artist.filter(:related_albums=>@album1).all.map{|a| a.name}.sort.must_equal %w'1 2 3'
     Artist.filter(:related_albums=>@album2).all.map{|a| a.name}.sort.must_equal %w'1 2 3 4'
@@ -418,8 +418,8 @@ describe "Many Through Many Plugin" do
     c.exclude(:related_albums=>[@album1, @album3]).all.map{|a| a.name}.sort.must_equal %w'4'
     c.exclude(:related_albums=>[@album2, @album4]).all.map{|a| a.name}.sort.must_equal %w''
 
-    c.filter(:related_albums=>self_join(Album).filter(:albums__id=>[@album1.id, @album3.id])).all.map{|a| a.name}.sort.must_equal %w'1 2 3'
-    c.exclude(:related_albums=>self_join(Album).filter(:albums__id=>[@album1.id, @album3.id])).all.map{|a| a.name}.sort.must_equal %w'4'
+    c.filter(:related_albums=>self_join(Album).filter(Sequel[:albums][:id]=>[@album1.id, @album3.id])).all.map{|a| a.name}.sort.must_equal %w'1 2 3'
+    c.exclude(:related_albums=>self_join(Album).filter(Sequel[:albums][:id]=>[@album1.id, @album3.id])).all.map{|a| a.name}.sort.must_equal %w'4'
   end
 end
 
@@ -1893,7 +1893,7 @@ describe "Sequel::Plugins::PreparedStatements with schema changes" do
     @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.many_to_many :mps_tests, :left_key=>:id, :right_key=>:id, :class=>@c, :join_table=>Sequel[:ps_test].as(:x)
     @c.plugin :prepared_statements
     @c.plugin :prepared_statements_associations
   end

data/spec/integration/prepared_statement_test.rb

@@ -444,7 +444,7 @@ describe "Dataset#unbind" do
 
   it "should handle QualifiedIdentifiers" do
     @ct[Integer, 10]
-    @u[@ds.filter{items__c > 1}].must_equal(:c=>10)
+    @u[@ds.filter{items[:c] > 1}].must_equal(:c=>10)
   end
 
   cspecify "should handle deep nesting", :h2 do

data/spec/integration/schema_test.rb

@@ -515,6 +515,27 @@ describe "Database schema modifiers" do
     proc{@ds.insert(:id=>nil)}.must_raise(Sequel::NotNullConstraintViolation, Sequel::ConstraintViolation, Sequel::DatabaseError)
   end
 
+  it "should not allow NULLs when adding a primary key column" do
+    @db.create_table!(:items){String :foo}
+    @db.alter_table(:items){add_column :id, String, :primary_key=>true, :default=>'a'}
+    proc{@ds.insert(:id=>nil)}.must_raise(Sequel::NotNullConstraintViolation, Sequel::ConstraintViolation, Sequel::DatabaseError)
+  end
+
+  it "should not allow NULLs when creating table with primary key constraint" do
+    @db.create_table!(:items){String :id1; String :id2; primary_key [:id1, :id2]}
+    proc{@ds.insert(:id1=>nil, :id2=>nil)}.must_raise(Sequel::NotNullConstraintViolation, Sequel::ConstraintViolation, Sequel::DatabaseError)
+    proc{@ds.insert(:id1=>nil, :id2=>'1')}.must_raise(Sequel::NotNullConstraintViolation, Sequel::ConstraintViolation, Sequel::DatabaseError)
+    proc{@ds.insert(:id1=>'1', :id2=>nil)}.must_raise(Sequel::NotNullConstraintViolation, Sequel::ConstraintViolation, Sequel::DatabaseError)
+  end
+
+  it "should not allow NULLs when adding a primary key constraint" do
+    @db.create_table!(:items){String :id1; String :id2}
+    @db.alter_table(:items){add_primary_key [:id1, :id2]}
+    proc{@ds.insert(:id1=>nil, :id2=>nil)}.must_raise(Sequel::NotNullConstraintViolation, Sequel::ConstraintViolation, Sequel::DatabaseError)
+    proc{@ds.insert(:id1=>nil, :id2=>'1')}.must_raise(Sequel::NotNullConstraintViolation, Sequel::ConstraintViolation, Sequel::DatabaseError)
+    proc{@ds.insert(:id1=>'1', :id2=>nil)}.must_raise(Sequel::NotNullConstraintViolation, Sequel::ConstraintViolation, Sequel::DatabaseError)
+  end
+
   it "should rename columns correctly" do
     @db.create_table!(:items){Integer :id}
     @ds.insert(:id=>10)

data/spec/integration/spec_helper.rb

@@ -16,6 +16,7 @@ rescue LoadError
 end
 Sequel::Deprecation.backtrace_filter = lambda{|line, lineno| lineno < 4 || line =~ /_(spec|test)\.rb/}
 
+Sequel.split_symbols = false if ENV['SEQUEL_NO_SPLIT_SYMBOLS']
 Sequel::Database.extension :columns_introspection if ENV['SEQUEL_COLUMNS_INTROSPECTION']
 Sequel::Model.cache_associations = false if ENV['SEQUEL_NO_CACHE_ASSOCIATIONS']
 Sequel::Model.use_transactions = false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequel
 version: !ruby/object:Gem::Version
-  version: 4.39.0
+  version: 4.40.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-01 00:00:00.000000000 Z
+date: 2016-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -240,6 +240,7 @@ extra_rdoc_files:
 - doc/release_notes/4.37.0.txt
 - doc/release_notes/4.38.0.txt
 - doc/release_notes/4.39.0.txt
+- doc/release_notes/4.40.0.txt
 files:
 - CHANGELOG
 - MIT-LICENSE
@@ -369,6 +370,7 @@ files:
 - doc/release_notes/4.38.0.txt
 - doc/release_notes/4.39.0.txt
 - doc/release_notes/4.4.0.txt
+- doc/release_notes/4.40.0.txt
 - doc/release_notes/4.5.0.txt
 - doc/release_notes/4.6.0.txt
 - doc/release_notes/4.7.0.txt
@@ -531,6 +533,7 @@ files:
 - lib/sequel/extensions/query_literals.rb
 - lib/sequel/extensions/round_timestamps.rb
 - lib/sequel/extensions/ruby18_symbol_extensions.rb
+- lib/sequel/extensions/s.rb
 - lib/sequel/extensions/schema_caching.rb
 - lib/sequel/extensions/schema_dumper.rb
 - lib/sequel/extensions/select_remove.rb
@@ -543,6 +546,10 @@ files:
 - lib/sequel/extensions/sql_expr.rb
 - lib/sequel/extensions/string_agg.rb
 - lib/sequel/extensions/string_date_time.rb
+- lib/sequel/extensions/symbol_aref.rb
+- lib/sequel/extensions/symbol_aref_refinement.rb
+- lib/sequel/extensions/symbol_as.rb
+- lib/sequel/extensions/symbol_as_refinement.rb
 - lib/sequel/extensions/thread_local_timezones.rb
 - lib/sequel/extensions/to_dot.rb
 - lib/sequel/model.rb
@@ -757,6 +764,7 @@ files:
 - spec/extensions/query_spec.rb
 - spec/extensions/rcte_tree_spec.rb
 - spec/extensions/round_timestamps_spec.rb
+- spec/extensions/s_spec.rb
 - spec/extensions/schema_caching_spec.rb
 - spec/extensions/schema_dumper_spec.rb
 - spec/extensions/schema_spec.rb
@@ -784,6 +792,8 @@ files:
 - spec/extensions/string_stripper_spec.rb
 - spec/extensions/subclasses_spec.rb
 - spec/extensions/subset_conditions_spec.rb
+- spec/extensions/symbol_aref_refinement_spec.rb
+- spec/extensions/symbol_as_refinement_spec.rb
 - spec/extensions/table_select_spec.rb
 - spec/extensions/tactical_eager_loading_spec.rb
 - spec/extensions/thread_local_timezones_spec.rb