sequel 5.50.0 → 5.51.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '088fd20b772371a3a765e7f8c24103c940fdc4f9a33828fee9e3e2f04dc38768'
-  data.tar.gz: 46daff6f4e927d98035fdf6f967a5c8020aefd4278308e788fa5f640877bda24
+  metadata.gz: ebee8a266be02f6ba3c1d5d340b606336dbb0fb74beb4b4333eb3c930cd59b5c
+  data.tar.gz: f657a1aaedf3e0ef8f644097ee94760dfb04381730dd0c6f0a53c57e3f2bc742
 SHA512:
-  metadata.gz: 84b5d7b1dc1689c55da14e745de590f62a9052df9171043d9232b7817751a3c045d1021429fb05f2663a6754958a2c3935426b85e5f1ff4f8895fc57aa6049f3
-  data.tar.gz: 458d85e4f05fd97f4c74a0af4a324b6ee47207d8afb00aee4fb8c1b6b1854175e50162a3b5ad0bac4e35498620cd4b4d3531ad7a71e7e65c3604f0a1677a53d5
+  metadata.gz: 9a0aac448e73636a0c20e5e4d87d65ac648a56bb4267034c5b92fdf2cf297aeeaff408dc4e79c6fe05bdd113e22824a5d7bc7a5b236b44346cda6ed427a377c1
+  data.tar.gz: d99a2b488a0735ba9012e4dfcaae30bec76fce1e7d3c34a14be9395241432a3d00ec5fa7a22df371810adf734e0c39230d212934f10a7d39c5839e58231d6625

data/CHANGELOG

@@ -1,3 +1,17 @@
+=== 5.51.0 (2021-12-01)
+
+* Make eager loading via tactical_eager_loading no longer modify objects who already have a cached value for the association (jeremyevans)
+
+* Make association cloning handle cases where clone association sets different :class option than cloned association (jeremyevans)
+
+* Make column schema entries on MySQL include an :extra entry for the Extra column in DESCRIBE output (bschmeck) (#1791)
+
+* Update mock PostgreSQL adapter to default to PostgreSQL 14 instead of PostgreSQL 9.5 (jeremyevans)
+
+* Support Dataset#with_recursive :search and :cycle options on PostgreSQL 14+ for result ordering and cycle detection (jeremyevans)
+
+* Avoid method redefined verbose mode warnings in lazy_attributes plugin (jeremyevans)
+
 === 5.50.0 (2021-11-01)
 
 * Make Migrator :allow_missing_migration_files also allow down migrations where the current database version is greater than the last migration file version (francisconeves97) (#1789)

data/README.rdoc

@@ -17,11 +17,12 @@ toolkit for Ruby.
 
 == Resources
 
-Website :: http://sequel.jeremyevans.net
-RDoc Documentation :: http://sequel.jeremyevans.net/rdoc
+Website :: https://sequel.jeremyevans.net
+RDoc Documentation :: https://sequel.jeremyevans.net/rdoc
 Source Code :: https://github.com/jeremyevans/sequel
-Bug tracking (GitHub Issues) :: http://github.com/jeremyevans/sequel/issues
-Discussion Forum (sequel-talk Google Group) :: http://groups.google.com/group/sequel-talk
+Bug tracking (GitHub Issues) :: https://github.com/jeremyevans/sequel/issues
+Discussion Forum (GitHub Discussions) :: https://github.com/jeremyevans/sequel/discussions
+Alternate Discussion Forum (sequel-talk Google Group) :: http://groups.google.com/group/sequel-talk
 
 If you have questions about how to use Sequel, please ask on the
 sequel-talk Google Group.  Only use the the bug tracker to report

data/doc/release_notes/5.51.0.txt

@@ -0,0 +1,47 @@
+= New Features
+
+* On PostgreSQL 14+, Dataset#with_recursive now supports :search and
+  :cycle options for result ordering and cycle detection.  These use
+  the SEARCH and CYCLE clauses added in PostgreSQL 14:
+
+    DB[:t].with_recursive(:t,
+      DB[:i1].where(parent_id: nil),
+      DB[:i1].join(:t, id: :parent_id).select_all(:i1),
+      search: {by: :id, type: :breadth},
+      cycle: {columns: :id, cycle_value: 1, noncycle_value: 2})
+
+    # WITH RECURSIVE t AS (
+    #     SELECT * FROM i1 WHERE (parent_id IS NULL)
+    #     UNION ALL
+    #     (SELECT i1.* FROM i1 INNER JOIN t ON (t.id = i1.parent_id))
+    #   )
+    #   SEARCH BREADTH FIRST BY id SET ordercol
+    #   CYCLE id SET is_cycle TO 1 DEFAULT 2 USING path
+
+* On MySQL, column schema hashes now contain an :extra entry, which
+  contains the Extra string returned in MySQL's DESCRIBE results
+  for the column.
+
+= Other Improvements
+
+* When eager loading via the tactical_eager_loading plugin, objects
+  that already have an association loaded will not have it reloaded
+  unless the :eager_reload option is given.
+
+* When cloning an association and using a different :class option
+  than the cloned association, the :class option given when cloning
+  will now take precedence over the :class option for the cloned
+  association.
+
+* When using the mock postgres adapter, the adapter defaults to
+  supporting PostgreSQL 14 (previously, it defaulted to supporting
+  PostgreSQL 9.5).
+
+* Sequel now avoids a method redefined warning in the lazy attributes
+  plugin in verbose warnings mode.
+
+= Other
+
+* Sequel's primary discussion forum is now GitHub Discussions. The
+  sequel-talk Google Group is still available for users who would
+  prefer to use that instead.

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

@@ -533,6 +533,7 @@ module Sequel
           row[:default] = row.delete(:Default)
           row[:db_type] = row.delete(:Type)
           row[:type] = schema_column_type(row[:db_type])
+          row[:extra] = extra
           [m.call(row.delete(:Field)), row]
         end
       end

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

@@ -87,7 +87,7 @@ module Sequel
 
     def self.mock_adapter_setup(db)
       db.instance_exec do
-        @server_version = 90500
+        @server_version = 140000
         initialize_postgres_adapter
         extend(MockAdapterDatabaseMethods)
       end
@@ -2162,6 +2162,38 @@ module Sequel
         opts[:with].any?{|w| w[:recursive]} ? "WITH RECURSIVE " : super
       end
 
+      # Support PostgreSQL 14+ CTE SEARCH/CYCLE clauses
+      def select_with_sql_cte(sql, cte)
+        super
+
+        if search_opts = cte[:search]
+          sql << if search_opts[:type] == :breadth
+            " SEARCH BREADTH FIRST BY "
+          else
+            " SEARCH DEPTH FIRST BY "
+          end
+
+          identifier_list_append(sql, Array(search_opts[:by]))
+          sql << " SET "
+          identifier_append(sql, search_opts[:set] || :ordercol)
+        end
+
+        if cycle_opts = cte[:cycle]
+          sql << " CYCLE "
+          identifier_list_append(sql, Array(cycle_opts[:columns]))
+          sql << " SET "
+          identifier_append(sql, cycle_opts[:cycle_column] || :is_cycle)
+          if cycle_opts.has_key?(:cycle_value)
+            sql << " TO "
+            literal_append(sql, cycle_opts[:cycle_value])
+            sql << " DEFAULT "
+            literal_append(sql, cycle_opts.fetch(:noncycle_value, false))
+          end
+          sql << " USING "
+          identifier_append(sql, cycle_opts[:path_column] || :path)
+        end
+      end
+
       # The version of the database server
       def server_version
         db.server_version(@opts[:server])

data/lib/sequel/dataset/query.rb

@@ -1060,6 +1060,7 @@ module Sequel
 
     # Add a common table expression (CTE) with the given name and a dataset that defines the CTE.
     # A common table expression acts as an inline view for the query.
+    #
     # Options:
     # :args :: Specify the arguments/columns for the CTE, should be an array of symbols.
     # :recursive :: Specify that this is a recursive CTE
@@ -1080,10 +1081,35 @@ module Sequel
 
     # Add a recursive common table expression (CTE) with the given name, a dataset that
     # defines the nonrecursive part of the CTE, and a dataset that defines the recursive part
-    # of the CTE.  Options:
+    # of the CTE.
+    #
+    # Options:
     # :args :: Specify the arguments/columns for the CTE, should be an array of symbols.
     # :union_all :: Set to false to use UNION instead of UNION ALL combining the nonrecursive and recursive parts.
     #
+    # PostgreSQL 14+ Options:
+    # :cycle :: Stop recursive searching when a cycle is detected. Includes two columns in the
+    #           result of the CTE, a cycle column indicating whether a cycle was detected for
+    #           the current row, and a path column for the path traversed to get to the current
+    #           row.  If given, must be a hash with the following keys:
+    #           :columns :: (required) The column or array of columns to use to detect a cycle.
+    #                       If the value of these columns match columns already traversed, then
+    #                       a cycle is detected, and recursive searching will not traverse beyond
+    #                       the cycle (the CTE will include the row where the cycle was detected).
+    #           :cycle_column :: The name of the cycle column in the output, defaults to :is_cycle.
+    #           :cycle_value :: The value of the cycle column in the output if the current row was
+    #                           detected as a cycle, defaults to true.
+    #           :noncycle_value :: The value of the cycle column in the output if the current row
+    #                              was not detected as a cycle, defaults to false. Only respected
+    #                              if :cycle_value is given.
+    #           :path_column :: The name of the path column in the output, defaults to :path.
+    # :search :: Include an order column in the result of the CTE that allows for breadth or
+    #            depth first searching. If given, must be a hash with the following keys:
+    #            :by :: (required) The column or array of columns to search by.
+    #            :order_column :: The name of the order column in the output, defaults to :ordercol.
+    #            :type :: Set to :breadth to use breadth-first searching (depth-first searching
+    #                     is the default).
+    #
     #   DB[:t].with_recursive(:t,
     #     DB[:i1].select(:id, :parent_id).where(parent_id: nil),
     #     DB[:i1].join(:t, id: :parent_id).select(Sequel[:i1][:id], Sequel[:i1][:parent_id]),
@@ -1094,6 +1120,21 @@ module Sequel
     #   #   UNION ALL
     #   #   SELECT i1.id, i1.parent_id FROM i1 INNER JOIN t ON (t.id = i1.parent_id)
     #   # ) SELECT * FROM t
+    #
+    #   DB[:t].with_recursive(:t,
+    #     DB[:i1].where(parent_id: nil),
+    #     DB[:i1].join(:t, id: :parent_id).select_all(:i1),
+    #     search: {by: :id, type: :breadth},
+    #     cycle: {columns: :id, cycle_value: 1, noncycle_value: 2})
+    #     
+    #   # WITH RECURSIVE t AS (
+    #   #     SELECT * FROM i1 WHERE (parent_id IS NULL)
+    #   #     UNION ALL
+    #   #     (SELECT i1.* FROM i1 INNER JOIN t ON (t.id = i1.parent_id))
+    #   #   )
+    #   #   SEARCH BREADTH FIRST BY id SET ordercol
+    #   #   CYCLE id SET is_cycle TO 1 DEFAULT 2 USING path
+    #   # SELECT * FROM t
     def with_recursive(name, nonrecursive, recursive, opts=OPTS)
       raise(Error, 'This dataset does not support common table expressions') unless supports_cte?
       if hoist_cte?(nonrecursive)

data/lib/sequel/dataset/sql.rb

@@ -1543,15 +1543,14 @@ module Sequel
 
     def select_with_sql(sql)
       return unless supports_cte?
-      ws = opts[:with]
-      return if !ws || ws.empty?
+      ctes = opts[:with]
+      return if !ctes || ctes.empty?
       sql << select_with_sql_base
       c = false
       comma = ', '
-      ws.each do |w|
+      ctes.each do |cte|
         sql << comma if c
-        select_with_sql_prefix(sql, w)
-        literal_dataset_append(sql, w[:dataset])
+        select_with_sql_cte(sql, cte)
         c ||= true
       end
       sql << ' '
@@ -1564,6 +1563,11 @@ module Sequel
       "WITH "
     end
 
+    def select_with_sql_cte(sql, cte)
+      select_with_sql_prefix(sql, cte)
+      literal_dataset_append(sql, cte[:dataset])
+    end
+    
     def select_with_sql_prefix(sql, w)
       quote_identifier_append(sql, w[:name])
       if args = w[:args]

data/lib/sequel/model/associations.rb

@@ -1836,7 +1836,9 @@ module Sequel
 
           if opts[:clone]
             cloned_assoc = association_reflection(opts[:clone])
+            remove_class_name = orig_opts[:class] && !orig_opts[:class_name]
             orig_opts = cloned_assoc[:orig_opts].merge(orig_opts)
+            orig_opts.delete(:class_name) if remove_class_name
           end
 
           opts = Hash[default_association_options]

data/lib/sequel/plugins/lazy_attributes.rb

@@ -73,6 +73,7 @@ module Sequel
                 super()
               end
             end
+            alias_method(a, a)
           end
         end
       end

data/lib/sequel/plugins/tactical_eager_loading.rb

@@ -143,9 +143,15 @@ module Sequel
         def load_associated_objects(opts, dynamic_opts=OPTS, &block)
           dynamic_opts = load_association_objects_options(dynamic_opts, &block)
           name = opts[:name]
-          if (!associations.include?(name) || dynamic_opts[:eager_reload]) && opts[:allow_eager] != false && retrieved_by && !frozen? && !dynamic_opts[:callback] && !dynamic_opts[:reload]
+          eager_reload = dynamic_opts[:eager_reload]
+          if (!associations.include?(name) || eager_reload) && opts[:allow_eager] != false && retrieved_by && !frozen? && !dynamic_opts[:callback] && !dynamic_opts[:reload]
             begin
-              retrieved_by.send(:eager_load, retrieved_with.reject(&:frozen?), name=>dynamic_opts[:eager] || OPTS)
+              objects = if eager_reload
+                retrieved_with.reject(&:frozen?)
+              else
+                retrieved_with.reject{|x| x.frozen? || x.associations.include?(name)}
+              end
+              retrieved_by.send(:eager_load, objects, name=>dynamic_opts[:eager] || OPTS)
             rescue Sequel::UndefinedAssociation
               # This can happen if class table inheritance is used and the association
               # is only defined in a subclass.  This particular instance can use the

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 = 50
+  MINOR = 51
 
   # 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.50.0
+  version: 5.51.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-01 00:00:00.000000000 Z
+date: 2021-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -195,6 +195,7 @@ extra_rdoc_files:
 - doc/release_notes/5.49.0.txt
 - doc/release_notes/5.5.0.txt
 - doc/release_notes/5.50.0.txt
+- doc/release_notes/5.51.0.txt
 - doc/release_notes/5.6.0.txt
 - doc/release_notes/5.7.0.txt
 - doc/release_notes/5.8.0.txt
@@ -273,6 +274,7 @@ files:
 - doc/release_notes/5.49.0.txt
 - doc/release_notes/5.5.0.txt
 - doc/release_notes/5.50.0.txt
+- doc/release_notes/5.51.0.txt
 - doc/release_notes/5.6.0.txt
 - doc/release_notes/5.7.0.txt
 - doc/release_notes/5.8.0.txt
@@ -562,7 +564,7 @@ metadata:
   bug_tracker_uri: https://github.com/jeremyevans/sequel/issues
   changelog_uri: http://sequel.jeremyevans.net/rdoc/files/CHANGELOG.html
   documentation_uri: http://sequel.jeremyevans.net/documentation.html
-  mailing_list_uri: https://groups.google.com/forum/#!forum/sequel-talk
+  mailing_list_uri: https://github.com/jeremyevans/sequel/discussions
   source_code_uri: https://github.com/jeremyevans/sequel
 post_install_message: 
 rdoc_options:
@@ -586,7 +588,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
 summary: The Database Toolkit for Ruby