sequel 5.64.0 → 5.65.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1971882f6efac487f21b4b5fb74695b757f2e129c14d82ffdca062cd5bc9d58f
-  data.tar.gz: ca4d9df4e18bd2806ad0a288856cb87f270f702a73f8de0ebea3934776d4304c
+  metadata.gz: 24bfe7c123337539140b0385dd9a828fe0fec4d6ad4e39e5fd8f150258ae7a03
+  data.tar.gz: d820be46e60ba7b08b1129f0a6b67a24a550a27d5b682a84730172bc256f4118
 SHA512:
-  metadata.gz: abdd0fbcb5da74256493a8cfb7ff32f9247d8b021096344d3d072d2d5981fec557ed222df11da3db12abae7318c43c09b9bb2c63795816244aea76425f4106ba
-  data.tar.gz: 7b37c7c8cdc9172baf273ee80b328fa79bd6694a070ef81220e31bbaa20bcb0dc90a137b5cccd4c0326a7b99f17dd57591deab375dbaf61881bac3536b4eeb12
+  metadata.gz: bd5c7dacdf48f8ada7c34c88210ac804faa1b47741f946ca16cd6f645c1f86055eb85ac6b601e9cef2ab4aa8a5cba3dc444e3005d6ed61d324c1158f2e03a70e
+  data.tar.gz: d17eb580a3f50f4b0c33561aed320c2ea3089044b905f4dc845ea8682afe1cdbf2798c6cd202f1233b1d168d06c9686a94728d41e0f47264245a33da5a99b251

data/CHANGELOG

@@ -1,3 +1,11 @@
+=== 5.65.0 (2023-02-01)
+
+* Allow pg_auto_parameterize extension to use placeholder loaders (jeremyevans)
+
+* Do not include :min_value and :max_value schema entries for decimal/numeric columns on MySQL versions not supporting check constraints (jeremyevans)
+
+* Make Database#indexes return indexes for partitioned tables on PostgreSQL 11+ (jeremyevans)
+
 === 5.64.0 (2023-01-01)
 
 * Make :db_type column schema entries on SQLAnywhere include precision/scale information (jeremyevans)

data/MIT-LICENSE

@@ -1,5 +1,5 @@
 Copyright (c) 2007-2008 Sharon Rosner
-Copyright (c) 2008-2022 Jeremy Evans
+Copyright (c) 2008-2023 Jeremy Evans
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to

data/doc/association_basics.rdoc

@@ -864,14 +864,14 @@ You can set this to +nil+ to not create a remove_all_<i>association</i> method.
 
 === :no_dataset_method
 
-Setting this to true will not result in the <i>association</i>_dataset method
+Setting this to true will result in the <i>association</i>_dataset method
 not being defined. This can save memory if you only use the <i>association</i>
 method and do not call the <i>association</i>_dataset method directly or
 indirectly.
 
 === :no_association_method
 
-Setting this to true will not result in the <i>association</i> method
+Setting this to true will result in the <i>association</i> method
 not being defined. This can save memory if you only use the
 <i>association</i>_dataset method and do not call the <i>association</i> method
 directly or indirectly.

data/doc/release_notes/5.65.0.txt

@@ -0,0 +1,21 @@
+= Improvements
+
+* The pg_auto_parameterize extension now uses a modified placeholder
+  literalizer for speeding up the generation of SQL queries in the same
+  cases where a standard dataset would use a placeholder literalizer.
+  This can provide a 4% speedup for simple queries, with greater
+  speedups for more complex queries.
+
+* Database#indexes now returns indexes for partitioned tables on
+  PostgreSQL 11+.
+
+* MySQL versions not supporting CHECK constraints no longer include
+  :min_value/:max_value schema entries for decimal/numeric columns.
+
+= Backwards Compatibility
+
+* The Dataset::PlaceholderLiterlizer::Record.loader API has changed,
+  it now accepts the Dataset::PlaceholderLiterlizer class to use as
+  the first argument.  This makes it easier to create
+  Dataset::PlaceholderLiterlizer subclasses, such as the one now used
+  by the pg_auto_parameterize extension.

data/doc/sql.rdoc

@@ -59,7 +59,7 @@ Then, you call the +insert+, +update+, or +delete+ method on the returned datase
   update_ds.update
   delete_ds.delete
 
-+update+ and +delete+ should return the number of rows affected, and +insert+ should return the autogenerated primary key integer for the row inserted (if any).
++update+ and +delete+ generally return the number of rows affected, and +insert+ generally returns the autogenerated primary key integer for the row inserted (if any), but not all adapters/databases support this behavior for datasets using custom SQL (notably it is not supported for +insert+ on PostgreSQL).
 
 === Other Queries
 

data/lib/sequel/adapters/shared/mysql.rb

@@ -557,6 +557,13 @@ module Sequel
         super if supports_check_constraints?
       end
 
+      # Return nil if CHECK constraints are not supported, because
+      # versions that don't support check constraints don't raise
+      # errors for values outside of range.
+      def column_schema_decimal_min_max_values(column)
+        super if supports_check_constraints?
+      end
+
       # Split DROP INDEX ops on MySQL 5.6+, as dropping them in the same
       # statement as dropping a related foreign key causes an error.
       def split_alter_table_op?(op)

data/lib/sequel/adapters/shared/postgres.rb

@@ -919,7 +919,7 @@ module Sequel
             join(Sequel[:pg_attribute].as(:att), :attrelid=>Sequel[:tab][:oid], :attnum=>attnums).
             left_join(Sequel[:pg_constraint].as(:con), :conname=>Sequel[:indc][:relname]).
             where{{
-              indc[:relkind]=>'i',
+              indc[:relkind]=>%w'i I',
               ind[:indisprimary]=>false,
               :indexprs=>nil,
               :indisvalid=>true}}.

data/lib/sequel/dataset/misc.rb

@@ -158,6 +158,16 @@ module Sequel
      !!((opts[:from].is_a?(Array) && opts[:from].size > 1) || opts[:join])
     end
 
+    # The class to use for placeholder literalizers for the current dataset.
+    def placeholder_literalizer_class
+      ::Sequel::Dataset::PlaceholderLiteralizer
+    end
+
+    # A placeholder literalizer loader for the current dataset.
+    def placeholder_literalizer_loader(&block)
+      placeholder_literalizer_class.loader(self, &block)
+    end
+
     # The alias to use for the row_number column, used when emulating OFFSET
     # support and for eager limit strategies
     def row_number_column
@@ -296,7 +306,7 @@ module Sequel
         loader += 1
 
         if loader >= 3
-          loader = Sequel::Dataset::PlaceholderLiteralizer.loader(self){|pl, _| yield pl}
+          loader = placeholder_literalizer_loader{|pl, _| yield pl}
           cache_set(key, loader)
         else
           cache_set(key, loader + 1)

data/lib/sequel/dataset/placeholder_literalizer.rb

@@ -77,8 +77,8 @@ module Sequel
         # Yields the receiver and the dataset to the block, which should
         # call #arg on the receiver for each placeholder argument, and
         # return the dataset that you want to load.
-        def loader(dataset, &block)
-          PlaceholderLiteralizer.new(*process(dataset, &block))
+        def loader(pl, dataset, &block)
+          pl.new(*process(dataset, &block))
         end
 
         # Return an Argument with the specified position, or the next position. In
@@ -145,7 +145,7 @@ module Sequel
       # given block, recording the offsets at which the recorders arguments
       # are used in the query.
       def self.loader(dataset, &block)
-        Recorder.new.loader(dataset, &block)
+        Recorder.new.loader(self, dataset, &block)
       end
 
       # Save the dataset, array of SQL fragments, and ending SQL string.
@@ -199,20 +199,31 @@ module Sequel
       # Return the SQL query to use for the given arguments.
       def sql(*args)
         raise Error, "wrong number of arguments (#{args.length} for #{@arity})" unless args.length == @arity
-        s = String.new
+        s = sql_origin
+        append_sql(s, *args)
+      end
+
+      # Append the SQL query to use for the given arguments to the given SQL string.
+      def append_sql(sql, *args)
         ds = @dataset
-        @fragments.each do |sql, i, transformer|
-          s << sql
+        @fragments.each do |s, i, transformer|
+          sql << s
           if i.is_a?(Integer)
             v = args.fetch(i)
             v = transformer.call(v) if transformer
           else
             v = i.call
           end
-          ds.literal_append(s, v)
+          ds.literal_append(sql, v)
         end
-        s << @final_sql
-        s
+        sql << @final_sql
+        sql
+      end
+
+      private
+
+      def sql_origin
+        String.new
       end
     end
   end

data/lib/sequel/extensions/pg_auto_parameterize.rb

@@ -148,7 +148,10 @@ module Sequel
 
         # Freeze the stored arguments when freezing the query string.
         def freeze
-          @args.freeze if @args
+          if @args
+            @args.freeze
+            @arg_map.freeze
+          end
           super
         end
 
@@ -156,6 +159,14 @@ module Sequel
         def inspect
           @args ? "#{self}; #{@args.inspect}".inspect : super
         end
+
+        def initialize_copy(other)
+          super
+          if args = other.instance_variable_get(:@args)
+            @args = args.dup
+            @arg_map = other.instance_variable_get(:@arg_map).dup
+          end
+        end
       end
 
       # Wrapper class that skips auto parameterization for the wrapped object.
@@ -169,6 +180,22 @@ module Sequel
         end
       end
 
+      # PlacholderLiteralizer subclass with support for stored auto parameters.
+      class PlaceholderLiteralizer < ::Sequel::Dataset::PlaceholderLiteralizer
+        def initialize(dataset, fragments, final_sql, arity)
+          s = dataset.sql.dup
+          s.clear
+          @sql_origin = s.freeze
+          super
+        end
+
+        private
+
+        def sql_origin
+          @sql_origin.dup
+        end
+      end
+
       module DatabaseMethods
         def self.extended(db)
           unless (db.adapter_scheme == :postgres && USES_PG) || (db.adapter_scheme == :mock && db.database_type == :postgres)
@@ -282,9 +309,13 @@ module Sequel
           end
         end
 
-        # Placeholder literalizers are not supported supported when using automatic parameterization.
-        def supports_placeholder_literalizer?
-          @opts[:no_auto_parameterize]
+        # The class to use for placeholder literalizers.
+        def placeholder_literalizer_class
+          if @opts[:no_auto_parameterize]
+            super
+          else
+            PlaceholderLiteralizer
+          end
         end
 
         # Disable automatic parameterization when using a cursor.

data/lib/sequel/model/associations.rb

@@ -310,7 +310,17 @@ module Sequel
             loader = union_eager_loader
             joiner = " UNION ALL "
             ids.each_slice(subqueries_per_union).each do |slice|
-              objects.concat(ds.with_sql(slice.map{|k| loader.sql(*k)}.join(joiner)).to_a)
+              sql = loader.send(:sql_origin)
+              join = false
+              slice.each do |k|
+                if join
+                  sql << joiner
+                else
+                  join = true
+                end
+                loader.append_sql(sql, *k)
+              end
+              objects.concat(ds.with_sql(sql).to_a)
             end
             ds = ds.eager(cascade) if cascade
             ds.send(:post_load, objects)
@@ -446,7 +456,7 @@ module Sequel
         def placeholder_loader
           if use_placeholder_loader?
             cached_fetch(:placeholder_loader) do
-              Sequel::Dataset::PlaceholderLiteralizer.loader(associated_dataset) do |pl, ds|
+              associated_dataset.placeholder_literalizer_loader do |pl, ds|
                 ds = ds.where(Sequel.&(*predicate_keys.map{|k| SQL::BooleanExpression.new(:'=', k, pl.arg)}))
                 if self[:block]
                   ds = self[:block].call(ds)
@@ -748,8 +758,8 @@ module Sequel
         # A placeholder literalizer used to speed up eager loading.
         def placeholder_eager_loader
           cached_fetch(:placeholder_eager_loader) do
-            Sequel::Dataset::PlaceholderLiteralizer.loader(associated_dataset) do |pl, ds|
-              apply_eager_limit_strategy(eager_loading_dataset.where(predicate_key=>pl.arg), eager_limit_strategy)
+            eager_loading_dataset.placeholder_literalizer_loader do |pl, ds|
+              apply_eager_limit_strategy(ds.where(predicate_key=>pl.arg), eager_limit_strategy)
             end
           end
         end
@@ -808,7 +818,7 @@ module Sequel
         # loading a limited association.
         def union_eager_loader
           cached_fetch(:union_eager_loader) do
-            Sequel::Dataset::PlaceholderLiteralizer.loader(associated_dataset) do |pl, ds|
+            associated_dataset.placeholder_literalizer_loader do |pl, ds|
               ds = self[:eager_block].call(ds) if self[:eager_block]
               keys = predicate_keys
               ds = ds.where(keys.map{pl.arg}.zip(keys))

data/lib/sequel/plugins/finder.rb

@@ -151,7 +151,7 @@ module Sequel
                 ds
               end
 
-              Sequel::Dataset::PlaceholderLiteralizer.loader(model, &block) 
+              model.dataset.placeholder_literalizer_class.loader(model, &block) 
             end
           end
 

data/lib/sequel/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequel
 version: !ruby/object:Gem::Version
-  version: 5.64.0
+  version: 5.65.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-01 00:00:00.000000000 Z
+date: 2023-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -196,6 +196,7 @@ extra_rdoc_files:
 - doc/release_notes/5.62.0.txt
 - doc/release_notes/5.63.0.txt
 - doc/release_notes/5.64.0.txt
+- doc/release_notes/5.65.0.txt
 - doc/release_notes/5.7.0.txt
 - doc/release_notes/5.8.0.txt
 - doc/release_notes/5.9.0.txt
@@ -288,6 +289,7 @@ files:
 - doc/release_notes/5.62.0.txt
 - doc/release_notes/5.63.0.txt
 - doc/release_notes/5.64.0.txt
+- doc/release_notes/5.65.0.txt
 - doc/release_notes/5.7.0.txt
 - doc/release_notes/5.8.0.txt
 - doc/release_notes/5.9.0.txt