sequel_pg 1.18.0 → 1.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d497c75bd5ace025a1696d5b5df76116dd54495afee2178872f8f19f06b9257
-  data.tar.gz: 24a06481753cb39885de374dfca9e3adcc041e7b0c42550d3406513f79b41ba9
+  metadata.gz: 2662871f93e6779540dacacdcee37d0942f65c456ddd7d6d5c2587936a0f5903
+  data.tar.gz: 9b364ee075aabd1af37cd0980b5eb256c4cbefd8a473b4aead23203709896e12
 SHA512:
-  metadata.gz: ddf3c461fd892e80c199f7f5f37cf65a46f14a6a41285e7eec0fdb6ec0da5d4cfa9c74a866f1d3f7da5d8ef1a967ca713da3b12f167b82c2ee0b53bafbcd1bf3
-  data.tar.gz: c656f25a3ab3aa13286db0586d843b690c864fc219210de328edbca195b501c874046f96e098b8e3adcc549f11c052615c62ecec03f6821e6ebeab2dff6e874a
+  metadata.gz: 935750c355575ef4f7b5ccdfb87aa098e46c110bac13699175b7dbbd7eb292dfd4664f88f9cca3c795c0ba35a89fc5a44d57120fd1d9a4ad6ed13046c5c75bd6
+  data.tar.gz: b7b3eca0d8b4f938ed8678efec72c057e3208d9656964a44dbb4e9f68f28aeff1b5d3c2dfe7c94f9b5d63d5ccb852ef9016515c146c70457ec228291a3d0feb1

data/CHANGELOG

@@ -1,3 +1,9 @@
+=== 1.18.1 (2025-12-16)
+
+* Fix truncated results for map/select_map/select_order_map/as_hash/to_hash_groups/select_hash/select_hash_groups/as_set/select_set for datasets using use_cursor (jeremyevans) (#62)
+
+* Avoid compilation warnings checking for HAVE_* definitions (jeremyevans)
+
 === 1.18.0 (2025-12-01)
 
 * Optimize Dataset#all and #with_sql_all (jeremyevans)

data/ext/sequel_pg/sequel_pg.c

@@ -1,4 +1,4 @@
-#define SEQUEL_PG_VERSION_INTEGER 11800
+#define SEQUEL_PG_VERSION_INTEGER 11801
 
 #include <string.h>
 #include <stdio.h>
@@ -24,7 +24,7 @@
 #define RARRAY_AREF(a, i) (RARRAY_PTR(a)[i])
 #endif
 
-#if !HAVE_RB_HASH_NEW_CAPA
+#ifndef HAVE_RB_HASH_NEW_CAPA
 #define rb_hash_new_capa(_) rb_hash_new()
 #endif
 
@@ -193,7 +193,7 @@ static ID spg_id_family;
 static ID spg_id_addr;
 static ID spg_id_mask_addr;
 
-#if HAVE_PQSETSINGLEROWMODE
+#ifdef HAVE_PQSETSINGLEROWMODE
 static ID spg_id_get_result;
 static ID spg_id_clear;
 static ID spg_id_check;
@@ -1433,7 +1433,7 @@ static VALUE spg_yield_hash_rows_internal(VALUE self, PGresult *res, int enc_ind
         } else if (rb_type(pg_value) == T_ARRAY) {
           type = SPG_YIELD_COLUMNS_ARRAY;
         }
-#if HAVE_RB_SET_NEW_CAPA
+#ifdef HAVE_RB_SET_NEW_CAPA
       } else if (pg_type == spg_sym_map_set) {
         if (SYMBOL_P(pg_value)) {
           type = SPG_YIELD_COLUMN_SET;
@@ -1449,7 +1449,7 @@ static VALUE spg_yield_hash_rows_internal(VALUE self, PGresult *res, int enc_ind
         type = SPG_YIELD_FIRST_ARRAY;
       } else if (pg_type == spg_sym_array_array) {
         type = SPG_YIELD_ARRAY_ARRAY;
-#if HAVE_RB_SET_NEW_CAPA
+#ifdef HAVE_RB_SET_NEW_CAPA
       } else if (pg_type == spg_sym_first_set) {
         type = SPG_YIELD_FIRST_SET;
       } else if (pg_type == spg_sym_array_set) {
@@ -1542,7 +1542,7 @@ static VALUE spg_yield_hash_rows_internal(VALUE self, PGresult *res, int enc_ind
         rb_yield(ary);
       }
       break;
-#if HAVE_RB_SET_NEW_CAPA
+#ifdef HAVE_RB_SET_NEW_CAPA
     case SPG_YIELD_COLUMN_SET:
       /* Set containing single column */
       {
@@ -1608,7 +1608,7 @@ static VALUE spg_yield_hash_rows_internal(VALUE self, PGresult *res, int enc_ind
         rb_yield(ary);
       }
       break;
-#if HAVE_RB_SET_NEW_CAPA
+#ifdef HAVE_RB_SET_NEW_CAPA
     case SPG_YIELD_FIRST_SET:
       /* Array of first column */
       h = rb_set_new_capa(ntuples);
@@ -1837,14 +1837,14 @@ static VALUE spg_yield_hash_rows(VALUE self, VALUE rres, VALUE ignore) {
 
 static VALUE spg_supports_streaming_p(VALUE self) {
   return
-#if HAVE_PQSETSINGLEROWMODE
+#ifdef HAVE_PQSETSINGLEROWMODE
   Qtrue;
 #else
   Qfalse;
 #endif
 }
 
-#if HAVE_PQSETSINGLEROWMODE
+#ifdef HAVE_PQSETSINGLEROWMODE
 static VALUE spg_set_single_row_mode(VALUE self) {
   PGconn *conn;
   conn = pg_get_pgconn(self);
@@ -2193,7 +2193,7 @@ void Init_sequel_pg(void) {
 
   rb_define_singleton_method(spg_Postgres, "supports_streaming?", spg_supports_streaming_p, 0);
 
-#if HAVE_PQSETSINGLEROWMODE
+#ifdef HAVE_PQSETSINGLEROWMODE
   spg_id_get_result = rb_intern("get_result");
   spg_id_clear = rb_intern("clear");
   spg_id_check = rb_intern("check");

data/lib/sequel_pg/sequel_pg.rb

@@ -26,12 +26,14 @@ class Sequel::Postgres::Dataset
   # :nocov:
     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){return it}
         Set.new
       end
     # :nocov:
     else
       def as_set(column)
+        return super unless allow_sequel_pg_optimization?
         rows = Set.new
         clone(:_sequel_pg_type=>:map, :_sequel_pg_value=>column).fetch_rows(sql){|s| rows.add(s)}
         rows
@@ -46,6 +48,7 @@ class Sequel::Postgres::Dataset
       if block_given?
         super
       else
+        return super unless allow_sequel_pg_optimization?
         clone(:_sequel_pg_type=>:map_array, :_sequel_pg_value=>sym).fetch_rows(sql){|a| return a}
         []
       end
@@ -62,6 +65,7 @@ class Sequel::Postgres::Dataset
   # In the case where both arguments given, use an optimized version.
   def as_hash(key_column, value_column = nil, opts = Sequel::OPTS)
     if value_column && !opts[:hash]
+      return super unless allow_sequel_pg_optimization?
       clone(:_sequel_pg_type=>:hash, :_sequel_pg_value=>[key_column, value_column]).fetch_rows(sql){|s| return s}
       {}
     elsif opts.empty?
@@ -82,6 +86,7 @@ class Sequel::Postgres::Dataset
   # In the case where both arguments given, use an optimized version.
   def to_hash_groups(key_column, value_column = nil, opts = Sequel::OPTS)
     if value_column && !opts[:hash]
+      return super unless allow_sequel_pg_optimization?
       clone(:_sequel_pg_type=>:hash_groups, :_sequel_pg_value=>[key_column, value_column]).fetch_rows(sql){|s| return s}
       {}
     elsif opts.empty?
@@ -118,12 +123,14 @@ class Sequel::Postgres::Dataset
 
   # Always use optimized version
   def _select_map_multiple(ret_cols)
+    return super unless allow_sequel_pg_optimization?
     clone(:_sequel_pg_type=>:array_array).fetch_rows(sql){|a| return a}
     []
   end
 
   # Always use optimized version
   def _select_map_single
+    return super unless allow_sequel_pg_optimization?
     clone(:_sequel_pg_type=>:first_array).fetch_rows(sql){|a| return a}
     []
   end
@@ -134,12 +141,14 @@ class Sequel::Postgres::Dataset
     if RUBY_VERSION > '4'
       # Always use optimized version
       def _select_set_multiple(ret_cols)
+        return super unless allow_sequel_pg_optimization?
         clone(:_sequel_pg_type=>:array_set).fetch_rows(sql){return it}
         Set.new
       end
 
       # Always use optimized version
       def _select_set_single
+        return super unless allow_sequel_pg_optimization?
         clone(:_sequel_pg_type=>:first_set).fetch_rows(sql){return it}
         Set.new
       end
@@ -147,6 +156,7 @@ class Sequel::Postgres::Dataset
     else
       # Always use optimized version
       def _select_set_multiple(ret_cols)
+        return super unless allow_sequel_pg_optimization?
         set = Set.new
         clone(:_sequel_pg_type=>:array).fetch_rows(sql){|s| set.add s}
         set
@@ -154,6 +164,7 @@ class Sequel::Postgres::Dataset
 
       # Always use optimized version
       def _select_set_single
+        return super unless allow_sequel_pg_optimization?
         set = Set.new
         clone(:_sequel_pg_type=>:first).fetch_rows(sql){|s| set.add s}
         set

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sequel_pg
 version: !ruby/object:Gem::Version
-  version: 1.18.0
+  version: 1.18.1
 platform: ruby
 authors:
 - Jeremy Evans