sequel 5.0.0 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d494778be10a685dadd0181b0f35d8976ad80de5
-  data.tar.gz: 3de435547bc07c151e6511915b034c4c70909b28
+  metadata.gz: d380edb41288b7e5fd091c8ffd8215b9a8c0a8b2
+  data.tar.gz: e4c34f33035f7e2354f53e264683a60337c66d28
 SHA512:
-  metadata.gz: 71e23a94e737525c4bcf0ad0e16376a8ec933bf6962dce7c5032971ec3f8b7cb140c194ad51a41e818c4597025c3403b5f3777941ecf247595f8b7294ac9804f
-  data.tar.gz: d57c4092428f1ca13fb1fce70e9f26dae1f53e5c04f75aef5c5ad2ea5d0ac664c06443b86f7881a7abe7c499b977476fddb3155c9856290eb573b3a6d810b7a4
+  metadata.gz: a18ccd0f5974af2610e2d274963b83fdba2aab99559c3e1cf2bceba99d890d6d4c0dda13c0c6b2f9fba913f41ba39983d65df52e39651e745fa86a1097c3c003
+  data.tar.gz: ac9efe8f2e33539d322b94b6e9e76cadf64091a2af6958bdbdd8e67bea691849382c5aae0032b29498ab4d3b9c4ddf599737be8170d6f435fd03028fbcfc1019

data/CHANGELOG

@@ -1,3 +1,23 @@
+=== 5.1.0 (2017-10-01)
+
+* Make jdbc/h2 and jdbc/hsqldb adapters respect :foreign_key_constraint_name option when adding new foreign key column (jeremyevans)
+
+* Do not issue unnecessary query for macaddr type oid when loading the pg_inet extension (jeltz) (#1423)
+
+* Make alter_table add_foreign_key with a column symbol reversible when using the :foreign_key_constraint_name option (jeremyevans) (#1422)
+
+* Do not raise an error if calling Model.freeze on a frozen model (jeremyevans) (#1421)
+
+* Make Database#copy_into in the jdbc/postgresql adapter handle multi-byte strings (ckoenig) (#1416)
+
+* Remove deprecated Model use_after_commit_rollback class and instance methods (jeremyevans)
+
+* Remove deprecated Model.allowed_columns method in the base model support (jeremyevans)
+
+* Remove deprecated Model.plugin_module_defined? private method (jeremyevans)
+
+* Remove deprecated support for Model#_before_validation private method (jeremyevans)
+
 === 5.0.0 (2017-09-01)
 
 * Make bin/sequel -M option always use base 10 (jeremyevans)

data/doc/advanced_associations.rdoc

@@ -710,14 +710,14 @@ name, with no duplicates?
         ids = h.keys
         eo[:rows].each{|r| r.associations[:songs] = []}
         Song.select_all(:songs).
-          select_append{[lyrics[:composer_id], lyrics[:arranger_id], lyrics[:vocalist_id], lyrics[:lyricist_id]}.
+          select_append{[lyrics[:composer_id], lyrics[:arranger_id], lyrics[:vocalist_id], lyrics[:lyricist_id]]}.
           join(:lyrics, id: :lyric_id){Sequel.or(composer_id: ids, arranger_id: ids, vocalist_id: ids, lyricist_id: ids)}.
           order{songs[:name]}.all do |song|
-          [:composer_id, :arranger_id, :vocalist_id, :lyricist_id].each do |x|
-            recs = h[song.values.delete(x)]
-            recs.each{|r| r.associations[:songs] << song} if recs
+            [:composer_id, :arranger_id, :vocalist_id, :lyricist_id].each do |x|
+              recs = h[song.values.delete(x)]
+              recs.each{|r| r.associations[:songs] << song} if recs
+            end
           end
-        end
         eo[:rows].each{|r| r.associations[:songs].uniq!}
       end)
   end

data/doc/association_basics.rdoc

@@ -1551,11 +1551,11 @@ extensions.
   #   :id  <----- :meta -------> :id
   #   :name                      :name
   class Album < Sequel::Model
-    many_to_many :artists, left_key: Sequel.pg_jsonb(:meta)['album_id'].cast(String).cast(Integer)
+    many_to_many :artists, left_key: Sequel.pg_jsonb(:meta)['album_id'].cast(String).cast(Integer),
       right_key: Sequel.pg_jsonb(:meta)['artist_id'].cast(String).cast(Integer)
   end
   class Artist < Sequel::Model
-    many_to_many :albums, left_key: Sequel.pg_jsonb(:meta)['artist_id'].cast(String).cast(Integer)
+    many_to_many :albums, left_key: Sequel.pg_jsonb(:meta)['artist_id'].cast(String).cast(Integer),
       right_key: Sequel.pg_jsonb(:meta)['album_id'].cast(String).cast(Integer)
   end
 

data/doc/release_notes/5.1.0.txt

@@ -0,0 +1,31 @@
+= Improvements
+
+* Database#copy_into in the jdbc/postgresql adapter now works
+  correctly when using multibyte characters in strings.
+
+* The alter_table add_foreign_key method is now reversible when the
+  :foreign_key_constraint_name option is used.
+
+* The jdbc/h2 and jdbc/hsqldb adapters now respect the
+  :foreign_key_constraint_name option.
+
+* Calling Model.freeze on an already frozen model no longer raises
+  an error.
+
+* An unnecessary database query is now avoided when loading the
+  pg_inet extension when the pg_array extension is already loaded.
+
+* A better exception message is now used when migrating with an
+  empty migration directory.
+
+= Backwards Compatibility
+
+* Model.allowed_columns has been removed. Use the whitelist_security
+  plugin if you want to call it.
+
+* Model use_after_commit_rollback class and instance accessors have
+  been removed.
+
+* Support for the Model#_before_validation method has been removed.
+
+* The private Model.plugin_module_defined? method has been removed.

data/lib/sequel/adapters/jdbc/h2.rb

@@ -89,7 +89,8 @@ module Sequel
 
               if ref
                 op[:table] = ref
-                sqls << "ALTER TABLE #{quote_schema_table(table)} ADD FOREIGN KEY (#{quote_identifier(op[:name])}) #{column_references_sql(op)}"
+                constraint_name = op[:foreign_key_constraint_name]
+                sqls << "ALTER TABLE #{quote_schema_table(table)} ADD#{" CONSTRAINT #{quote_identifier(constraint_name)}" if constraint_name} FOREIGN KEY (#{quote_identifier(op[:name])}) #{column_references_sql(op)}"
               end
 
               sqls

data/lib/sequel/adapters/jdbc/hsqldb.rb

@@ -53,7 +53,7 @@ module Sequel
           when :add_column
             if op[:table]
               [super(table, op.merge(:table=>nil)),
-               alter_table_sql(table, op.merge(:op=>:add_constraint, :type=>:foreign_key, :name=>op[:foreign_key_name], :columns=>[op[:name]], :table=>op[:table]))]
+               alter_table_sql(table, op.merge(:op=>:add_constraint, :type=>:foreign_key, :name=>op[:foreign_key_constraint_name], :columns=>[op[:name]], :table=>op[:table]))]
             else
               super
             end

data/lib/sequel/adapters/jdbc/postgresql.rb

@@ -65,10 +65,14 @@ module Sequel
               copier = copy_manager.copy_in(copy_into_sql(table, opts))
               if block_given?
                 while buf = yield
-                  copier.writeToCopy(buf.to_java_bytes, 0, buf.length)
+                  java_bytes = buf.to_java_bytes
+                  copier.writeToCopy(java_bytes, 0, java_bytes.length)
                 end
               else
-                data.each { |d| copier.writeToCopy(d.to_java_bytes, 0, d.length) }
+                data.each do |d|
+                  java_bytes = d.to_java_bytes
+                  copier.writeToCopy(java_bytes, 0, java_bytes.length)
+                end
               end
             rescue Exception => e
               copier.cancelCopy if copier

data/lib/sequel/database/schema_generator.rb

@@ -520,6 +520,10 @@ module Sequel
       #   drop_foreign_key(:artist_id) # DROP CONSTRAINT table_artist_id_fkey, DROP COLUMN artist_id
       #   drop_foreign_key([:name]) # DROP CONSTRAINT table_name_fkey
       def drop_foreign_key(name, opts=OPTS)
+        if !name.is_a?(Array) && opts[:foreign_key_constraint_name]
+          opts = Hash[opts]
+          opts[:name] = opts[:foreign_key_constraint_name]
+        end
         drop_composite_foreign_key(Array(name), opts)
         drop_column(name) unless name.is_a?(Array)
       end

data/lib/sequel/dataset/actions.rb

@@ -494,6 +494,10 @@ module Sequel
     # Sequel checks that the datasets using this method have an order, but it cannot
     # ensure that the order is unambiguous.
     #
+    # Note that this method is not safe to use on many adapters if you are
+    # running additional queries inside the provided block.  If you are
+    # running queries inside the block, use a separate thread or shard inside +paged_each+.
+    #
     # Options:
     # :rows_per_fetch :: The number of rows to fetch per query.  Defaults to 1000.
     # :strategy :: The strategy to use for paging of results.  By default this is :offset,

data/lib/sequel/extensions/migration.rb

@@ -516,6 +516,8 @@ module Sequel
     def initialize(db, directory, opts=OPTS)
       super
       @current = opts[:current] || current_migration_version
+      raise(Error, "No current version available") unless current
+
       latest_version = latest_migration_version
 
       @target = if opts[:target]
@@ -526,15 +528,14 @@ module Sequel
         latest_version
       end
 
+      raise(Error, "No target version available, probably because no migration files found or filenames don't follow the migration filename convention") unless target
+
       if @target > latest_version
         @target = latest_version
       elsif @target < 0
         @target = 0
       end
 
-      raise(Error, "No current version available") unless current
-      raise(Error, "No target version available, probably because no migration files found or filenames don't follow the migration filename convention") unless target
-
       @direction = current < target ? :up : :down
       @migrations = get_migrations
     end

data/lib/sequel/extensions/pg_inet.rb

@@ -46,7 +46,7 @@ module Sequel
           if respond_to?(:register_array_type)
             register_array_type('inet', :oid=>1041, :scalar_oid=>869)
             register_array_type('cidr', :oid=>651, :scalar_oid=>650)
-            register_array_type('macaddr', :oid=>1040)
+            register_array_type('macaddr', :oid=>1040, :scalar_oid=>829)
           end
           @schema_type_classes[:ipaddr] = IPAddr
         end

data/lib/sequel/model/associations.rb

@@ -2543,7 +2543,7 @@ module Sequel
 
           begin
             cbs.each do |cb|
-              res = case cb
+              case cb
               when Symbol
                 # Allow calling private methods in association callbacks
                 send(cb, object)

data/lib/sequel/model/base.rb

@@ -22,13 +22,6 @@ module Sequel
     #   truncate, unfiltered, ungraphed, ungrouped, union, unlimited, unordered, where, where_all,
     #   where_each, where_single_value, with, with_recursive, with_sql
     module ClassMethods
-      # :nocov:
-      def allowed_columns
-        Sequel::Deprecation.deprecate("Model.allowed_columns", "It has been moved to the whitelist_security plugin")
-        nil
-      end
-      # :nocov:
-
       # Whether to cache the anonymous models created by Sequel::Model(), true by default.  This is
       # required for reloading them correctly (avoiding the superclass mismatch).
       attr_accessor :cache_anonymous_models
@@ -83,7 +76,7 @@ module Sequel
       # Sequel will not check the number of rows modified (default: true).
       attr_accessor :require_modification
   
-      # If true (the default), tequires that all models have valid tables,
+      # If true (the default), requires that all models have valid tables,
       # raising exceptions if creating a model without a valid table backing it.
       # Setting this to false will allow the creation of model classes where the
       # underlying table doesn't exist.
@@ -116,17 +109,6 @@ module Sequel
       # database to typecast the value correctly.
       attr_accessor :typecast_on_assignment
   
-      # :nocov:
-      def use_after_commit_rollback
-        Sequel::Deprecation.deprecate("Model.use_after_commit_rollback", "Model transaction hooks have been removed, switch to using database transaction hooks")
-        false
-      end
-      def use_after_commit_rollback=(v)
-        Sequel::Deprecation.deprecate("Model.use_after_commit_rollback=", "Model transaction hooks have been removed, switch to using database transaction hooks")
-        false
-      end
-      # :nocov:
-  
       # Whether to use a transaction by default when saving/deleting records (default: true).
       # If you are sending database queries in before_* or after_* hooks, you shouldn't change
       # the default setting without a good reason.
@@ -445,6 +427,7 @@ module Sequel
 
       # Freeze a model class, disallowing any further changes to it.
       def freeze
+        return self if frozen?
         dataset_module.freeze
         overridable_methods_module.freeze
 
@@ -933,13 +916,6 @@ module Sequel
         Sequel::Plugins.const_get(module_name)
       end
 
-      # :nocov:
-      def plugin_module_defined?(plugin, submod)
-        Sequel::Deprecation.deprecate("Model.plugin_module_defined? (private method)", "Use const_defined?(submod, false)")
-        plugin.const_defined?(submod, false)
-      end
-      # :nocov:
-  
       # Find the row in the dataset that matches the primary key.  Uses
       # a static SQL optimization if the table and primary key are simple.
       #
@@ -1044,17 +1020,6 @@ module Sequel
         attr_writer(meth)
       end
 
-      # :nocov:
-      def use_after_commit_rollback
-        Sequel::Deprecation.deprecate("Model#use_after_commit_rollback", "Model transaction hooks have been removed, switch to using database transaction hooks")
-        false
-      end
-      def use_after_commit_rollback=(v)
-        Sequel::Deprecation.deprecate("Model#use_after_commit_rollback=", "Model transaction hooks have been removed, switch to using database transaction hooks")
-        false
-      end
-      # :nocov:
-  
       # The hash of attribute values.  Keys are symbols with the names of the
       # underlying database columns. The returned hash is a reference to the
       # receiver's values hash, and modifying it will also modify the receiver's
@@ -1469,12 +1434,6 @@ module Sequel
       def save(opts=OPTS)
         raise Sequel::Error, "can't save frozen object" if frozen?
         set_server(opts[:server]) if opts[:server] 
-        # :nocov:
-        if method(:_before_validation).owner != InstanceMethods
-          Sequel::Deprecation.deprecate("Using Model#_before_validation", "You should switch to using Model#before_validation")
-          _before_validation
-        end
-        # :nocov:
         unless checked_save_failure(opts){_valid?(opts)}
           raise(ValidationFailed.new(self)) if raise_on_failure?(opts)
           return
@@ -1622,12 +1581,6 @@ module Sequel
       #   artist.set(name: 'Invalid').valid? # => false
       #   artist.errors.full_messages # => ['name cannot be Invalid']
       def valid?(opts = OPTS)
-        # :nocov:
-        if method(:_before_validation).owner != InstanceMethods
-          Sequel::Deprecation.deprecate("Using Model#_before_validation", "You should switch to using Model#before_validation")
-          _before_validation
-        end
-        # :nocov:
         begin
           _valid?(opts)
         rescue HookFailed
@@ -1637,10 +1590,6 @@ module Sequel
 
       private
       
-      # SEQUEL51: Remove
-      def _before_validation
-      end
-
       # Do the deletion of the object's dataset, and check that the row
       # was actually deleted.
       def _delete

data/lib/sequel/plugins/class_table_inheritance.rb

@@ -132,7 +132,7 @@ module Sequel
     #                 Cook:      :staff,
     #                 Manager:   :managers,
     #                 Executive: :executives,
-    #                 CEO:       ::executives }
+    #                 CEO:       :executives }
     #
     #   # Using integers to store the class type, with a :model_map hash
     #   # and an sti_key of :type

data/lib/sequel/version.rb

@@ -5,7 +5,7 @@ module Sequel
   MAJOR = 5
   # The minor version of Sequel.  Bumped for every non-patch level
   # release, generally around once a month.
-  MINOR = 0
+  MINOR = 1
   # The tiny version of Sequel.  Usually 0, only bumped for bugfix
   # releases that fix regressions from previous versions.
   TINY  = 0

data/spec/adapters/postgres_spec.rb

@@ -1748,6 +1748,31 @@ if uses_pg_or_jdbc && DB.server_version >= 90000
     end
   end
 
+  describe "Postgres::Database#copy_into using UTF-8 encoding" do
+    before(:all) do
+      @db = DB
+      @db.create_table!(:test_copy){String :t}
+      @ds = @db[:test_copy].order(:t)
+    end
+    before do
+      @db[:test_copy].delete
+    end
+    after(:all) do
+      @db.drop_table?(:test_copy)
+    end
+
+    it "should work with UTF-8 characters using the :data option" do
+      @db.copy_into(:test_copy, :data=>(["\u00E4\n"]*2))
+      @ds.select_map([:t]).map{|a| a.map{|s| s.force_encoding('UTF-8')}}.must_equal([["\u00E4"]] * 2)
+    end
+
+    it "should work with UTF-8 characters using a block" do
+      buf = (["\u00E4\n"]*2)
+      @db.copy_into(:test_copy){buf.shift}
+      @ds.select_map([:t]).map{|a| a.map{|s| s.force_encoding('UTF-8')}}.must_equal([["\u00E4"]] * 2)
+    end
+  end
+
   describe "Postgres::Database#copy_table" do
     before(:all) do
       @db = DB
@@ -1828,7 +1853,6 @@ if uses_pg_or_jdbc && DB.server_version >= 90000
       e.wrapped_exception.must_be_kind_of ArgumentError
       e.message.must_include "foo"
     end
-
   end
 end
 

data/spec/core/schema_spec.rb

@@ -1204,6 +1204,20 @@ describe "DB#alter_table" do
     @db.sqls.must_equal ["ALTER TABLE cats DROP CONSTRAINT cats_node_id_fkey", "ALTER TABLE cats DROP COLUMN node_id"]
   end
 
+  it "should support drop_foreign_key with :foreign_key_constraint_name option" do
+    @db.alter_table(:cats) do
+      drop_foreign_key :node_id, :foreign_key_constraint_name=>:foo
+    end
+    @db.sqls.must_equal ["ALTER TABLE cats DROP CONSTRAINT foo", "ALTER TABLE cats DROP COLUMN node_id"]
+  end
+
+  it "should support drop_foreign_key with :name option" do
+    @db.alter_table(:cats) do
+      drop_foreign_key :node_id, :name=>:foo
+    end
+    @db.sqls.must_equal ["ALTER TABLE cats DROP CONSTRAINT foo", "ALTER TABLE cats DROP COLUMN node_id"]
+  end
+
   it "should support drop_foreign_key with composite foreign keys" do
     def @db.foreign_key_list(table_name)
       [{:name=>:cats_node_id_prop_id_fkey, :columns=>[:node_id, :prop_id]}] 

data/spec/extensions/migration_spec.rb

@@ -195,6 +195,16 @@ describe "Reversible Migrations with Sequel.migration{change{}}" do
       [:drop_table, :a, {:foo=>:bar}]]
   end
   
+  it "should reverse add_foreign_key with :foreign_key_constraint_name option" do
+    Sequel.migration{change{alter_table(:t){add_foreign_key :b, :c, :foreign_key_constraint_name=>:f}}}.apply(@db, :down)
+    actions = @db.actions
+    actions.must_equal [[:alter_table, [[:drop_foreign_key, :b, {:foreign_key_constraint_name=>:f}]]]]
+    @db.sqls
+    db = Sequel.mock
+    db.alter_table(:t){send(*actions[0][1][0])}
+    db.sqls.must_equal ["ALTER TABLE t DROP CONSTRAINT f", "ALTER TABLE t DROP COLUMN b"]
+  end
+  
   it "should raise in the down direction if migration uses unsupported method" do
     m = Sequel.migration{change{run 'SQL'}}
     m.apply(@db, :up)

data/spec/integration/prepared_statement_test.rb

@@ -341,7 +341,7 @@ describe "Bound Argument Types" do
     @ds.filter(:dt=>:$x).prepare(:first, :ps_datetime).call(:x=>@vs[:dt])[:dt].must_equal @vs[:dt]
   end
 
-  cspecify "should handle datetime type with fractional seconds", [:jdbc, :sqlite], [:oracle] do
+  cspecify "should handle datetime type with fractional seconds", [:jdbc, :sqlite], [:jdbc, :mysql], [:oracle] do
     Sequel.datetime_class = DateTime
     fract_time = DateTime.parse('2010-10-12 13:14:15.500000')
     @ds.prepare(:update, :ps_datetime_up, :dt=>:$x).call(:x=>fract_time)
@@ -352,7 +352,7 @@ describe "Bound Argument Types" do
     @ds.filter(:t=>:$x).prepare(:first, :ps_time).call(:x=>@vs[:t])[:t].must_equal @vs[:t]
   end
 
-  cspecify "should handle time type with fractional seconds", [:jdbc, :sqlite] do
+  cspecify "should handle time type with fractional seconds", [:jdbc, :sqlite], [:jdbc, :mysql] do
     fract_time = @vs[:t] + 0.5
     @ds.prepare(:update, :ps_time_up, :t=>:$x).call(:x=>fract_time)
     @ds.literal(@ds.filter(:t=>:$x).prepare(:first, :ps_time).call(:x=>fract_time)[:t]).must_equal @ds.literal(fract_time)

data/spec/integration/schema_test.rb

@@ -215,7 +215,7 @@ describe "Database index parsing" do
     DB.indexes(:items).must_equal({})
   end
 
-  it "should not include partial indexes" do
+  cspecify "should not include partial indexes", [proc{|db| db.sqlite_version < 30808}, :sqlite] do
     DB.create_table!(:items){Integer :n; Integer :a; index :n, :where=>proc{n > 10}}
     DB.indexes(:items).must_equal({})
   end if DB.supports_partial_indexes?

data/spec/model/model_spec.rb

@@ -191,6 +191,11 @@ describe "Sequel::Model.freeze" do
     proc{model.dataset_module{}}.must_raise RuntimeError
   end
 
+  it "should work if the model is already frozen" do
+    model = Class.new(Sequel::Model(:items))
+    model.freeze.freeze
+  end
+
   it "should freeze a model class without a dataset without breaking" do
     model = Class.new(Sequel::Model)
     model.freeze

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequel
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.1.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-02 00:00:00.000000000 Z
+date: 2017-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -251,6 +251,7 @@ extra_rdoc_files:
 - doc/release_notes/4.48.0.txt
 - doc/release_notes/4.49.0.txt
 - doc/release_notes/5.0.0.txt
+- doc/release_notes/5.1.0.txt
 files:
 - CHANGELOG
 - MIT-LICENSE
@@ -396,6 +397,7 @@ files:
 - doc/release_notes/4.8.0.txt
 - doc/release_notes/4.9.0.txt
 - doc/release_notes/5.0.0.txt
+- doc/release_notes/5.1.0.txt
 - doc/schema_modification.rdoc
 - doc/security.rdoc
 - doc/sharding.rdoc
@@ -915,7 +917,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: The Database Toolkit for Ruby