sequel_pg 1.19.0 → 1.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ce323f82d06024c56ba214fa69c6e63e243c29370b530eda09865d9eebd8ad1
-  data.tar.gz: 2719034e2a533d328ffe3a2e73834c0074c5f9efc6053d4865c58e136eee5554
+  metadata.gz: 14718a7aa7ca80b5952b679a8bbcd29bc3b381c80ac8df005d864f34a6c0da45
+  data.tar.gz: 816ea1b4bed0b6292c4d30e02954c1bc436af0126eda4b70bc177cf634cc7702
 SHA512:
-  metadata.gz: 4dcf359f0300e00c3249a3caaea255d18dff3770a1e6bfb51e6ac96dee7809a31680f093fb476457fea4b67ccf457355d5295b369c725d2b142773bd21171aa9
-  data.tar.gz: 32275e2f6cbc631f513606b053d8c6660d497a76cc926dd8af7314f2ebad0c17f5b72db1a02d0267f4e265070a3874921e2a4b3a8bfe9f40467728e5a62a25d9
+  metadata.gz: f79306d514d96bcfefea76f9afcebc3efcb67f0a8ff6ff0ceaba9b00c767277be24190357d344c3301f7d5aded60991b11ecbd72d2e1684eec4b4f278695f37e
+  data.tar.gz: 2214385a1e511c1c408aa1800ef5a0abdbc6fccaa963ac064a343dec6a99b176ed134aa007922803c7c492b687215a2a7fb545ab52bfea0030af53a46d20d1eb

data/CHANGELOG

@@ -1,3 +1,11 @@
+=== 1.20.0 (2026-09-06)
+
+* Skip query canceling on Ruby < 2.4 (jeremyevans)
+
+* Only allow parsing arrays of up to 6 dimensions (jeremyevans)
+
+* Disable model optimization if the model_class.shape_friendly is true (jeremyevans)
+
 === 1.19.0 (2026-03-06)
 
 * Cancel the query if an exception is raised while streaming query results (jtmkrueger, jeremyevans) (#66)

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2020 Jeremy Evans
+Copyright (c) 2010-2026 Jeremy Evans and contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to

data/ext/sequel_pg/sequel_pg.c

@@ -1,4 +1,4 @@
-#define SEQUEL_PG_VERSION_INTEGER 11900
+#define SEQUEL_PG_VERSION_INTEGER 12000
 
 #include <string.h>
 #include <stdio.h>
@@ -279,7 +279,7 @@ pg_text_dec_integer(char *val, size_t len)
 
 static VALUE spg__array_col_value(char *v, size_t length, VALUE converter, int enc_index, int oid, VALUE db);
 
-static VALUE read_array(int *index, char *c_pg_array_string, long array_string_length, VALUE buf, VALUE converter, int enc_index, int oid, VALUE db) {
+static VALUE read_array(int *index, char *c_pg_array_string, long array_string_length, VALUE buf, VALUE converter, int enc_index, int oid, VALUE db, int level) {
   int word_index = 0;
   char *word = RSTRING_PTR(buf);
 
@@ -341,7 +341,10 @@ static VALUE read_array(int *index, char *c_pg_array_string, long array_string_l
       else if(c == '{')
       {
         (*index)++;
-        rb_ary_push(array, read_array(index, c_pg_array_string, array_string_length, buf, converter, enc_index, oid, db));
+        if (level >= 6) {
+            rb_raise(rb_eArgError, "cannot parse array with more than 6 dimensions");
+        }
+        rb_ary_push(array, read_array(index, c_pg_array_string, array_string_length, buf, converter, enc_index, oid, db, level + 1));
         escapeNext = 1;
       }
       else
@@ -425,7 +428,8 @@ static VALUE parse_pg_array(VALUE self, VALUE pg_array_string, VALUE converter)
     converter,
     enc_get_index(pg_array_string),
     0,
-    Qnil);
+    Qnil,
+    1);
 }
 
 static VALUE spg_timestamp_error(const char *s, VALUE self, const char *error_msg) {
@@ -980,7 +984,7 @@ static VALUE spg_array_value(char *c_pg_array_string, int array_string_length, V
   buf = rb_str_buf_new(array_string_length);
   rb_str_set_len(buf, array_string_length);
   rb_obj_freeze(buf);
-  args[0] = read_array(&index, c_pg_array_string, array_string_length, buf, converter, enc_index, oid, self);
+  args[0] = read_array(&index, c_pg_array_string, array_string_length, buf, converter, enc_index, oid, self, 1);
   return rb_class_new_instance(2, args, spg_PGArray);
 }
 
@@ -2004,6 +2008,7 @@ static VALUE spg__flush_results(VALUE rconn) {
   VALUE error = 0;
   conn = pg_get_pgconn(rconn);
 
+#if (RUBY_API_VERSION_MAJOR > 2 || (RUBY_API_VERSION_MAJOR == 2 && RUBY_API_VERSION_MINOR >= 4))
   /* Only cancel if an exception is being unwound. During normal
    * completion, the query has already finished and there are no
    * results to drain, so canceling is unnecessary. */
@@ -2035,6 +2040,7 @@ static VALUE spg__flush_results(VALUE rconn) {
        * will check for and report any real errors. */
     }
   }
+#endif
 
   while ((res = PQgetResult(conn)) != NULL) {
     if (!error) {

data/lib/sequel/extensions/pg_streaming.rb

@@ -1,11 +1,11 @@
-# :nocov:
+# simplecov:disable
 unless Sequel::Postgres.respond_to?(:supports_streaming?)
   raise LoadError, "either sequel_pg not loaded, or an old version of sequel_pg loaded"
 end
 unless Sequel::Postgres.supports_streaming?
   raise LoadError, "streaming is not supported by the version of libpq in use"
 end
-# :nocov:
+# simplecov:enable
 
 # Database methods necessary to support streaming.  You should load this extension
 # into your database object:
@@ -75,13 +75,13 @@ module Sequel::Postgres::Streaming
 
     private
 
-    # :nocov:
+    # simplecov:disable
     unless Sequel::Postgres::Adapter.method_defined?(:send_query_params)
       def send_query_params(*args)
         send_query(*args)
       end
     end
-    # :nocov:
+    # simplecov:enable
 
     if Sequel::Database.instance_methods.map(&:to_s).include?('log_connection_yield')
       # If using single row mode, send the query instead of executing it.
@@ -97,7 +97,7 @@ module Sequel::Postgres::Streaming
         end
       end
     else
-      # :nocov:
+      # simplecov:disable
       def execute_query(sql, args)
         if @single_row_mode
           @single_row_mode = false
@@ -109,7 +109,7 @@ module Sequel::Postgres::Streaming
           super
         end
       end
-      # :nocov:
+      # simplecov:enable
     end
   end
 

data/lib/sequel_pg/model.rb

@@ -37,12 +37,26 @@ class Sequel::Postgres::Dataset
 
   private
 
-  # The model load can only be optimized if it's for a model and it's not a graphed dataset
-  # or using a cursor.
-  def optimize_model_load?(rp)
-    rp.is_a?(Class) &&
-      rp < Sequel::Model &&
-      rp.method(:call).owner == Sequel::Model::ClassMethods &&
-      opts[:optimize_model_load] != false
+  if Sequel::Model.respond_to?(:shape_friendly)
+    # The model load can only be optimized if it's for a model and it's not a graphed dataset
+    # or using a cursor.
+    def optimize_model_load?(rp)
+      rp.is_a?(Class) &&
+        rp < Sequel::Model &&
+        !rp.shape_friendly &&
+        rp.method(:call).owner == Sequel::Model::ClassMethods &&
+        opts[:optimize_model_load] != false
+    end
+  # simplecov:disable
+  else
+    # The model load can only be optimized if it's for a model and it's not a graphed dataset
+    # or using a cursor.
+    def optimize_model_load?(rp)
+      rp.is_a?(Class) &&
+        rp < Sequel::Model &&
+        rp.method(:call).owner == Sequel::Model::ClassMethods &&
+        opts[:optimize_model_load] != false
+    end
+  # simplecov:enable
   end
 end

data/lib/sequel_pg/sequel_pg.rb

@@ -21,16 +21,16 @@ class Sequel::Postgres::Dataset
     opts.has_key?(:optimize_model_load) ?  opts[:optimize_model_load] : true
   end
 
-  # :nocov:
+  # simplecov:disable
   if method_defined?(:as_set)
-  # :nocov:
+  # simplecov:enable
     if RUBY_VERSION > '4'
       def as_set(column)
         return super unless allow_sequel_pg_optimization?
         clone(:_sequel_pg_type=>:map_set, :_sequel_pg_value=>column).fetch_rows(sql){|s| return s}
         Set.new
       end
-    # :nocov:
+    # simplecov:disable
     else
       def as_set(column)
         return super unless allow_sequel_pg_optimization?
@@ -39,7 +39,7 @@ class Sequel::Postgres::Dataset
         rows
       end
     end
-    # :nocov:
+    # simplecov:enable
   end
 
   # In the case where an argument is given, use an optimized version.
@@ -75,13 +75,13 @@ class Sequel::Postgres::Dataset
     end
   end
 
-  # :nocov:
+  # simplecov:disable
   unless Sequel::Dataset.method_defined?(:as_hash)
     # Handle previous versions of Sequel that use to_hash instead of as_hash
     alias to_hash as_hash
     remove_method :as_hash
   end
-  # :nocov:
+  # simplecov:enable
 
   # In the case where both arguments given, use an optimized version.
   def to_hash_groups(key_column, value_column = nil, opts = Sequel::OPTS)
@@ -101,7 +101,7 @@ class Sequel::Postgres::Dataset
     with_sql_all(sql, &block)
   end
 
-  # :nocov:
+  # simplecov:disable
   # Generally overridden by the model support, only used if the model
   # support is not used.
   def with_sql_all(sql, &block)
@@ -117,7 +117,7 @@ class Sequel::Postgres::Dataset
     end
     []
   end
-  # :nocov:
+  # simplecov:enable
     
   protected
 
@@ -135,9 +135,9 @@ class Sequel::Postgres::Dataset
     []
   end
 
-  # :nocov:
+  # simplecov:disable
   if method_defined?(:_select_set_multiple)
-  # :nocov:
+  # simplecov:enable
     if RUBY_VERSION > '4'
       # Always use optimized version
       def _select_set_multiple(ret_cols)
@@ -152,7 +152,7 @@ class Sequel::Postgres::Dataset
         clone(:_sequel_pg_type=>:first_set).fetch_rows(sql){|s| return s}
         Set.new
       end
-    # :nocov:
+    # simplecov:disable
     else
       # Always use optimized version
       def _select_set_multiple(ret_cols)
@@ -170,7 +170,7 @@ class Sequel::Postgres::Dataset
         set
       end
     end
-    # :nocov:
+    # simplecov:enable
   end
 
   if defined?(Sequel::Model::ClassMethods)
@@ -189,10 +189,10 @@ if defined?(Sequel::Postgres::PGArray)
   # pg_array extension previously loaded
 
   class Sequel::Postgres::PGArray::Creator
-    # :nocov:
+    # simplecov:disable
     # Avoid method redefined verbose warning
     alias call call if method_defined?(:call)
-    # :nocov:
+    # simplecov:enable
 
     # Override Creator to use sequel_pg's C-based parser instead of the pure ruby parser.
     def call(string)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sequel_pg
 version: !ruby/object:Gem::Version
-  version: 1.19.0
+  version: 1.20.0
 platform: ruby
 authors:
 - Jeremy Evans
@@ -100,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.16
 specification_version: 4
 summary: Faster SELECTs when using Sequel with pg
 test_files: []