sequel_pg 1.18.1 → 1.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2662871f93e6779540dacacdcee37d0942f65c456ddd7d6d5c2587936a0f5903
-  data.tar.gz: 9b364ee075aabd1af37cd0980b5eb256c4cbefd8a473b4aead23203709896e12
+  metadata.gz: 8ce323f82d06024c56ba214fa69c6e63e243c29370b530eda09865d9eebd8ad1
+  data.tar.gz: 2719034e2a533d328ffe3a2e73834c0074c5f9efc6053d4865c58e136eee5554
 SHA512:
-  metadata.gz: 935750c355575ef4f7b5ccdfb87aa098e46c110bac13699175b7dbbd7eb292dfd4664f88f9cca3c795c0ba35a89fc5a44d57120fd1d9a4ad6ed13046c5c75bd6
-  data.tar.gz: b7b3eca0d8b4f938ed8678efec72c057e3208d9656964a44dbb4e9f68f28aeff1b5d3c2dfe7c94f9b5d63d5ccb852ef9016515c146c70457ec228291a3d0feb1
+  metadata.gz: 4dcf359f0300e00c3249a3caaea255d18dff3770a1e6bfb51e6ac96dee7809a31680f093fb476457fea4b67ccf457355d5295b369c725d2b142773bd21171aa9
+  data.tar.gz: 32275e2f6cbc631f513606b053d8c6660d497a76cc926dd8af7314f2ebad0c17f5b72db1a02d0267f4e265070a3874921e2a4b3a8bfe9f40467728e5a62a25d9

data/CHANGELOG

@@ -1,3 +1,11 @@
+=== 1.19.0 (2026-03-06)
+
+* Cancel the query if an exception is raised while streaming query results (jtmkrueger, jeremyevans) (#66)
+
+=== 1.18.2 (2025-12-18)
+
+* Avoid bogus warnings about the implicit block parameter in Ruby 3.3 (jeremyevans) (#64)
+
 === 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)

data/ext/sequel_pg/extconf.rb

@@ -10,6 +10,7 @@ if (have_library('pq') || have_library('libpq') || have_library('ms/libpq')) &&
   have_func 'rb_hash_new_capa'
   have_func 'rb_set_new_capa'
   have_func 'PQsetSingleRowMode'
+  have_func 'PQcancelCreate'
   have_func 'timegm'
   create_makefile("sequel_pg")
 else

data/ext/sequel_pg/sequel_pg.c

@@ -1,4 +1,4 @@
-#define SEQUEL_PG_VERSION_INTEGER 11801
+#define SEQUEL_PG_VERSION_INTEGER 11900
 
 #include <string.h>
 #include <stdio.h>
@@ -2004,6 +2004,38 @@ static VALUE spg__flush_results(VALUE rconn) {
   VALUE error = 0;
   conn = pg_get_pgconn(rconn);
 
+  /* 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. */
+  if (rb_errinfo() != Qnil) {
+#ifdef HAVE_PQCANCELCREATE
+    PGcancelConn *cancel = PQcancelCreate(conn);
+    if (cancel) {
+      int cancel_ok = PQcancelBlocking(cancel);
+      PQcancelFinish(cancel);
+#else
+    PGcancel *cancel = PQgetCancel(conn);
+    if (cancel) {
+      char errbuf[256];
+      int cancel_ok = PQcancel(cancel, errbuf, sizeof(errbuf));
+      PQfreeCancel(cancel);
+#endif
+
+      if (cancel_ok) {
+        /* Cancel succeeded. Drain remaining results without raising.
+         * The cancel produces an expected error result ("canceling
+         * statement due to user request"). The original exception
+         * will propagate via rb_ensure. */
+        while ((res = PQgetResult(conn)) != NULL) {
+          PQclear(res);
+        }
+        return rconn;
+      }
+      /* Cancel failed. Fallthrough to the normal drain loop which
+       * will check for and report any real errors. */
+    }
+  }
+
   while ((res = PQgetResult(conn)) != NULL) {
     if (!error) {
       switch (PQresultStatus(res))
@@ -2019,7 +2051,7 @@ static VALUE spg__flush_results(VALUE rconn) {
     }
     PQclear(res);
   }
-  
+
   if (error) {
     VALUE exception = rb_exc_new3(spg_PGError, error);
     rb_iv_set(exception, "@connection", rconn);

data/lib/sequel_pg/sequel_pg.rb

@@ -27,7 +27,7 @@ class Sequel::Postgres::Dataset
     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}
+        clone(:_sequel_pg_type=>:map_set, :_sequel_pg_value=>column).fetch_rows(sql){|s| return s}
         Set.new
       end
     # :nocov:
@@ -142,14 +142,14 @@ class Sequel::Postgres::Dataset
       # 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}
+        clone(:_sequel_pg_type=>:array_set).fetch_rows(sql){|s| return s}
         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}
+        clone(:_sequel_pg_type=>:first_set).fetch_rows(sql){|s| return s}
         Set.new
       end
     # :nocov:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sequel_pg
 version: !ruby/object:Gem::Version
-  version: 1.18.1
+  version: 1.19.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: 3.6.9
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Faster SELECTs when using Sequel with pg
 test_files: []