sequel 4.44.0 → 4.45.0

data/spec/extensions/prepared_statements_with_pk_spec.rb

@@ -2,34 +2,36 @@ require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
 describe "prepared_statements_with_pk plugin" do
   before 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
+    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
 
-  it "should load the prepared_statements plugin" do
+  deprecated "should load the prepared_statements plugin" do
     @c.plugins.must_include(Sequel::Plugins::PreparedStatements)
   end
 
-  it "should correctly lookup by primary key from dataset" do
+  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
 
-  it "should still work correctly if there are multiple conflicting variables" do
+  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
 
-  it "should still work correctly if the primary key is used elsewhere in the query" do
+  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
 
-  it "should respect explicitly set server" do
+  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

data/spec/extensions/query_spec.rb

@@ -89,7 +89,7 @@ describe "Dataset#query" do
   
   # SEQUEL5: Remove
   unless Sequel.mock.dataset.frozen?
-    it "should have an appropriate mutation method" do
+    deprecated "should have an appropriate mutation method" do
       @d.query! do
         select :a, :b___mongo
         from :yyy

data/spec/extensions/schema_dumper_spec.rb

@@ -75,9 +75,9 @@ end
 describe "Sequel::Database dump methods" do
   before do
     @d = Sequel::Database.new.extension(:schema_dumper)
-    @d.meta_def(:tables){|o| [:t1, :t2]}
+    @d.meta_def(:tables){|o| o[:schema] ? [o[:schema]] : [:t1, :t2]}
     @d.meta_def(:schema) do |t, *o|
-      case t
+      v = case t
       when :t1, 't__t1', Sequel.identifier(:t__t1)
         [[:c1, {:db_type=>'integer', :primary_key=>true, :auto_increment=>true, :allow_null=>false}],
          [:c2, {:db_type=>'varchar(20)', :allow_null=>true}]]
@@ -90,9 +90,19 @@ describe "Sequel::Database dump methods" do
       when :t5
         [[:c1, {:db_type=>'blahblah', :allow_null=>true}]]
       end
+
+      if o.first.is_a?(Hash) && o.first[:schema]
+        v.last.last[:db_type] = o.first[:schema]
+      end
+
+      v
     end
   end
 
+  it "should support dumping table with :schema option" do
+    @d.dump_table_schema(:t1, :schema=>'varchar(15)').must_equal "create_table(:t1) do\n  primary_key :c1\n  String :c2, :size=>15\nend"
+  end
+
   it "should support dumping table schemas as create_table method calls" do
     @d.dump_table_schema(:t1).must_equal "create_table(:t1) do\n  primary_key :c1\n  String :c2, :size=>20\nend"
   end
@@ -110,6 +120,11 @@ describe "Sequel::Database dump methods" do
     @d.dump_table_schema(:t6).must_equal "create_table(:t6) do\n  primary_key :c1, :type=>:Bignum\nend"
   end
 
+  it "should dump non-Integer primary key columns with explicit :type when using :same_db=>true" do
+    @d.meta_def(:schema){|*s| [[:c1, {:db_type=>'bigint', :primary_key=>true, :allow_null=>true, :auto_increment=>true}]]}
+    @d.dump_table_schema(:t6, :same_db=>true).must_equal "create_table(:t6) do\n  primary_key :c1, :type=>:Bignum\nend"
+  end
+
   it "should dump auto incrementing primary keys with :keep_order option if they are not first" do
     @d.dump_table_schema(:t3).must_equal "create_table(:t3) do\n  String :c2, :size=>20\n  primary_key :c1, :keep_order=>true\nend"
   end
@@ -206,6 +221,19 @@ describe "Sequel::Database dump methods" do
     @d.dump_table_schema(:t1).must_equal "create_table(:t1, :ignore_index_errors=>true) do\n  primary_key :c1\n  String :c2, :size=>20\n  \n  index [:c1], :name=>:i1\n  index [:c2, :c1], :unique=>true\nend"
   end
 
+  it "should support dumping the whole database as a migration with a :schema option" do
+    @d.dump_schema_migration(:schema=>'t__t1').must_equal <<-END_MIG
+Sequel.migration do
+  change do
+    create_table("t__t1") do
+      primary_key :c1
+      String :c2
+    end
+  end
+end
+END_MIG
+  end
+
   it "should support dumping the whole database as a migration" do
     @d.dump_schema_migration.must_equal <<-END_MIG
 Sequel.migration do
@@ -249,7 +277,7 @@ END_MIG
 
   it "should sort table names topologically when dumping a migration with foreign keys" do
     @d.meta_def(:tables){|o| [:t1, :t2]}
-    @d.meta_def(:schema) do |t|
+    @d.meta_def(:schema) do |t, *o|
       t == :t1 ? [[:c2, {:db_type=>'integer'}]] : [[:c1, {:db_type=>'integer', :primary_key=>true, :auto_increment=>true}]]
     end
     @d.meta_def(:supports_foreign_key_parsing?){true}
@@ -273,7 +301,7 @@ END_MIG
 
   it "should handle circular dependencies when dumping a migration with foreign keys" do
     @d.meta_def(:tables){|o| [:t1, :t2]}
-    @d.meta_def(:schema) do |t|
+    @d.meta_def(:schema) do |t, *o|
       t == :t1 ? [[:c2, {:db_type=>'integer'}]] : [[:c1, {:db_type=>'integer'}]]
     end
     @d.meta_def(:supports_foreign_key_parsing?){true}
@@ -301,7 +329,7 @@ END_MIG
 
   it "should sort topologically even if the database raises an error when trying to parse foreign keys for a non-existent table" do
     @d.meta_def(:tables){|o| [:t1, :t2]}
-    @d.meta_def(:schema) do |t|
+    @d.meta_def(:schema) do |t, *o|
       t == :t1 ? [[:c2, {:db_type=>'integer'}]] : [[:c1, {:db_type=>'integer', :primary_key=>true, :auto_increment=>true}]]
     end
     @d.meta_def(:supports_foreign_key_parsing?){true}
@@ -582,7 +610,7 @@ END_MIG
 
   it "should support dumping just foreign_keys as a migration" do
     @d.meta_def(:tables){|o| [:t1, :t2, :t3]}
-    @d.meta_def(:schema) do |t|
+    @d.meta_def(:schema) do |t, *o|
       t == :t1 ? [[:c2, {:db_type=>'integer'}]] : [[:c1, {:db_type=>'integer'}]]
     end
     @d.meta_def(:supports_foreign_key_parsing?){true}

data/spec/extensions/schema_spec.rb

@@ -3,7 +3,9 @@ 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))
-    @model.plugin :schema
+    deprecated do
+      @model.plugin :schema
+    end
   end 
 
   it "sets schema with implicit table name" do
@@ -26,11 +28,13 @@ end
 describe Sequel::Model, "create_table and schema" do
   before do
     @model = Class.new(Sequel::Model)
-    @model.class_eval do
-      plugin :schema
-      set_schema(:items) do
-        text :name
-        float :price, :null => false
+    deprecated do
+      @model.class_eval do
+        plugin :schema
+        set_schema(:items) do
+          text :name
+          float :price, :null => false
+        end
       end
     end
     DB.reset
@@ -76,7 +80,9 @@ end
 describe Sequel::Model, "schema methods" do
   before do
     @model = Class.new(Sequel::Model(:items))
-    @model.plugin :schema
+    deprecated do
+      @model.plugin :schema
+    end
     DB.reset
   end
 

data/spec/extensions/scissors_spec.rb

@@ -4,7 +4,9 @@ describe "scissors plugin" do
   before do
     @m = Class.new(Sequel::Model(:items))
     @m.use_transactions = true
-    @m.plugin :scissors
+    deprecated do
+      @m.plugin :scissors
+    end
     @m.db.sqls
   end
 

data/spec/extensions/sequel_3_dataset_methods_spec.rb

@@ -59,7 +59,7 @@ end
 # SEQUEL5: Remove
 unless Sequel.mock.dataset.frozen?
   describe "Dataset#db=" do
-    it "should change the dataset's database" do
+    deprecated "should change the dataset's database" do
       db = Sequel.mock
       ds = db[:items].extension(:sequel_3_dataset_methods)
       db2 = Sequel.mock
@@ -68,14 +68,14 @@ unless Sequel.mock.dataset.frozen?
       ds.db.wont_equal db
     end
 
-    it "should raise error for frozen datasets" do
+    deprecated "should raise error for frozen datasets" do
       ds = Sequel.mock.dataset.extension(:sequel_3_dataset_methods).freeze
       proc{ds.db = ds.db}.must_raise RuntimeError
     end
   end
 
   describe "Dataset#opts=" do
-    it "should change the dataset's opts" do
+    deprecated "should change the dataset's opts" do
       db = Sequel.mock
       ds = db[:items].extension(:sequel_3_dataset_methods)
       ds.sql.must_equal 'SELECT * FROM items'
@@ -84,7 +84,7 @@ unless Sequel.mock.dataset.frozen?
       ds.opts.must_equal({})
     end
 
-    it "should raise error for frozen datasets" do
+    deprecated "should raise error for frozen datasets" do
       ds = Sequel.mock.dataset.extension(:sequel_3_dataset_methods).freeze
       proc{ds.opts = {}}.must_raise RuntimeError
     end

data/spec/extensions/serialization_spec.rb

@@ -12,6 +12,13 @@ describe "Serialization plugin" do
     DB.reset
   end
   
+  deprecated "should allow access to serialization_module" do
+    @c.plugin :serialization, :yaml, :abc
+    @c.serialization_module.must_be_kind_of Module
+    @c.serialization_module = v = Module.new
+    @c.serialization_module.must_equal v
+  end
+
   it "should allow setting additional serializable attributes via plugin :serialization call" do
     @c.plugin :serialization, :yaml, :abc
     @c.create(:abc => 1, :def=> 2)
@@ -366,6 +373,5 @@ describe "Serialization plugin" do
     @c.freeze
     @c.serialization_map.frozen?.must_equal true
     @c.deserialization_map.frozen?.must_equal true
-    @c.serialization_module.frozen?.must_equal true
   end
 end

data/spec/extensions/set_overrides_spec.rb

@@ -27,7 +27,7 @@ describe "Sequel::Dataset #set_defaults" do
 
   # SEQUEL5: Remove
   unless Sequel.mock.dataset.frozen?
-    it "should have working mutation method" do
+    deprecated "should have working mutation method" do
       @ds = Sequel.mock.dataset.from(:items).extension(:set_overrides)
       @ds.set_defaults!(:x=>1)
       @ds.insert_sql.must_equal "INSERT INTO items (x) VALUES (1)"
@@ -58,7 +58,7 @@ describe "Sequel::Dataset #set_overrides" do
 
   # SEQUEL5: Remove
   unless Sequel.mock.dataset.frozen?
-    it "should have working mutation method" do
+    deprecated "should have working mutation method" do
       @ds = Sequel.mock.dataset.from(:items).extension(:set_overrides)
       @ds.set_overrides!(:x=>1)
       @ds.insert_sql.must_equal "INSERT INTO items (x) VALUES (1)"

data/spec/extensions/shared_caching_spec.rb

@@ -93,26 +93,30 @@ describe "Shared caching behavior" do
     end
 
     it "should not use a simple primary key lookup if the prepared_statements_associations method is being used" do
-      c2 = Class.new(Sequel::Model(@db[:not_caching_model].with_fetch(:id=>1)))
-      c = Class.new(Sequel::Model(@db[:lookup_model]))
-      c.class_eval do
-        plugin :prepared_statements_associations
-        columns :id, :caching_model_id
-        many_to_one :caching_model, :class=>c2
+      deprecated do
+        c2 = Class.new(Sequel::Model(@db[:not_caching_model].with_fetch(:id=>1)))
+        c = Class.new(Sequel::Model(@db[:lookup_model]))
+        c.class_eval do
+          plugin :prepared_statements_associations
+          columns :id, :caching_model_id
+          many_to_one :caching_model, :class=>c2
+        end
+        c.load(:id=>3, :caching_model_id=>1).caching_model.must_equal c2.load(:id=>1)
+        @db.sqls.wont_equal []
       end
-      c.load(:id=>3, :caching_model_id=>1).caching_model.must_equal c2.load(:id=>1)
-      @db.sqls.wont_equal []
     end
 
     it "should use a simple primary key lookup if the prepared_statements_associations method is being used but associated model also uses caching" do
-      c = Class.new(Sequel::Model(:lookup_model))
-      c.class_eval do
-        plugin :prepared_statements_associations
-        columns :id, :caching_model_id
-        many_to_one :caching_model
+      deprecated do
+        c = Class.new(Sequel::Model(:lookup_model))
+        c.class_eval do
+          plugin :prepared_statements_associations
+          columns :id, :caching_model_id
+          many_to_one :caching_model
+        end
+        c.load(:id=>3, :caching_model_id=>1).caching_model.must_be_same_as(@cm1)
+        @db.sqls.must_equal []
       end
-      c.load(:id=>3, :caching_model_id=>1).caching_model.must_be_same_as(@cm1)
-      @db.sqls.must_equal []
     end
   end
 

data/spec/extensions/spec_helper.rb

@@ -15,8 +15,8 @@ unless Object.const_defined?('Sequel') && Sequel.const_defined?('Model')
   $:.unshift(File.join(File.dirname(File.expand_path(__FILE__)), "../../lib/"))
   require 'sequel'
 end
-Sequel::Deprecation.backtrace_filter = lambda{|line, lineno| lineno < 4 || line =~ /_spec\.rb/}
-SEQUEL_EXTENSIONS_NO_DEPRECATION_WARNING = true
+
+require "#{File.dirname(File.dirname(__FILE__))}/deprecation_helper.rb"
 
 begin
   # Attempt to load ActiveSupport blank extension and inflector first, so Sequel
@@ -35,9 +35,13 @@ def skip_warn(s)
   warn "Skipping test of #{s}" if ENV["SKIPPED_TEST_WARN"]
 end
 
+# SEQUEL5: Remove
+output = Sequel::Deprecation.output
+Sequel::Deprecation.output = nil
 Sequel.quote_identifiers = false
 Sequel.identifier_input_method = nil
 Sequel.identifier_output_method = nil
+Sequel::Deprecation.output = output
 
 class << Sequel::Model
   attr_writer :db_schema
@@ -54,7 +58,7 @@ class << Sequel::Model
 end
 
 Sequel::Model.use_transactions = false
-Sequel.cache_anonymous_models = false
+Sequel::Model.cache_anonymous_models = false
 
 db = Sequel.mock(:fetch=>{:id => 1, :x => 1}, :numrows=>1, :autoid=>proc{|sql| 10})
 def db.schema(*) [[:id, {:primary_key=>true}]] end

data/spec/extensions/split_values_spec.rb

@@ -1,22 +1,57 @@
 require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
 describe "Sequel::Plugins::SplitValues" do
+  before do
+    @c = Class.new(Sequel::Model(:a))
+    @c.columns :id, :x
+    @c.plugin :split_values
+  end
+
   it "stores non-columns in a separate hash" do
-    c = Class.new(Sequel::Model(:a))
-    c.columns :id, :x
-    c.plugin :split_values
-    c.dataset = c.dataset.with_fetch(:id=>1, :x=>2, :y=>3)
-    o = c.first
-    c.db.reset
-
-    o.must_equal c.load(:id=>1, :x=>2)
+    @c.dataset = @c.dataset.with_fetch(:id=>1, :x=>2, :y=>3)
+    o = @c.first
+    @c.db.reset
+
+    o.must_equal @c.load(:id=>1, :x=>2)
     o[:id].must_equal 1
     o[:x].must_equal 2
     o[:y].must_equal 3
-    {c.load(:id=>1, :x=>2)=>4}[o].must_equal 4
+    {@c.load(:id=>1, :x=>2)=>4}[o].must_equal 4
     o.values.must_equal(:id=>1, :x=>2)
 
     o.save
-    c.db.sqls.must_equal ["UPDATE a SET x = 2 WHERE (id = 1)"]
+    @c.db.sqls.must_equal ["UPDATE a SET x = 2 WHERE (id = 1)"]
+  end
+
+  it "handles false values" do
+    @c.dataset = @c.dataset.with_fetch(:id=>1, :x=>false, :y=>3)
+    o = @c.first
+    @c.db.reset
+
+    o.must_equal @c.load(:id=>1, :x=>false)
+    o[:id].must_equal 1
+    o[:x].must_equal false
+    o[:y].must_equal 3
+    {@c.load(:id=>1, :x=>false)=>4}[o].must_equal 4
+    o.values.must_equal(:id=>1, :x=>false)
+
+    o.save
+    @c.db.sqls.must_equal ["UPDATE a SET x = 'f' WHERE (id = 1)"]
+  end
+
+  it "handles nil values" do
+    @c.dataset = @c.dataset.with_fetch(:id=>1, :x=>nil, :y=>3)
+    o = @c.first
+    @c.db.reset
+
+    o.must_equal @c.load(:id=>1, :x=>nil)
+    o[:id].must_equal 1
+    o[:x].must_be_nil
+    o[:y].must_equal 3
+    {@c.load(:id=>1, :x=>nil)=>4}[o].must_equal 4
+    o.values.must_equal(:id=>1, :x=>nil)
+
+    o.save
+    @c.db.sqls.must_equal ["UPDATE a SET x = NULL WHERE (id = 1)"]
   end
 end

data/spec/extensions/string_agg_spec.rb

@@ -45,8 +45,8 @@ describe "string_agg extension" do
     ds.literal(@sa4).must_equal "list(DISTINCT c, ',' ORDER BY o)"
   end
 
-  it "should correctly literalize on MySQL, H2, HSQLDB, CUBRID" do
-    [:mysql, :h2, :hsqldb, :cubrid].each do |type|
+  it "should correctly literalize on MySQL, H2, HSQLDB" do
+    [:mysql, :h2, :hsqldb].each do |type|
       db = dbf.call(type)
       db.meta_def(:database_type){type}
       ds = db.dataset.with_quote_identifiers(false).with_extend{def input_identifier(v) v.to_s end}

data/spec/extensions/subset_conditions_spec.rb

@@ -13,7 +13,7 @@ describe "subset_conditions plugin" do
     @c.subset(:active, :active)
     @c.where(@c.active_conditions).sql.must_equal @c.active.sql
 
-    @c.subset(:active_published, :active, :published => true)
+    @c.subset(:active_published, Sequel.&(:active, :published => true))
     @c.where(@c.active_published_conditions).sql.must_equal @c.active_published.sql
     @c.where(Sequel.&(@c.active_conditions, @c.published_conditions)).sql.must_equal @c.active_published.sql
     @c.where(Sequel.|(@c.active_conditions, @c.published_conditions)).sql.must_equal "SELECT * FROM a WHERE (active OR (published IS TRUE))"
@@ -25,8 +25,8 @@ describe "subset_conditions plugin" do
     @c.subset(:published, &p1)
     @c.where(@c.published_conditions).sql.must_equal @c.published.sql
 
-    p2 = proc{:active}
-    @c.subset(:active, &p2)
+    p2 = :active
+    @c.subset(:active, p2)
     @c.where(@c.active_conditions).sql.must_equal @c.active.sql
 
     @c.subset(:active_published, p2, &p1)