sequel_pg 1.18.2 → 1.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 371cfb0adb516e68f44ec7ca7f984b382afb2326da27f5f28529763f97de4639
-  data.tar.gz: 9840a973b0177c38c729d2fa18adfb2ceb27ab46415acc0af44bb030ebd88789
+  metadata.gz: 8ce323f82d06024c56ba214fa69c6e63e243c29370b530eda09865d9eebd8ad1
+  data.tar.gz: 2719034e2a533d328ffe3a2e73834c0074c5f9efc6053d4865c58e136eee5554
 SHA512:
-  metadata.gz: e42329a94078d6321715169e11935083d48f6e931662c48cb118003d5039adc95385b8ef4a12e20c095d0253cd1ccd6f413f7e0fcece885584dfb78927350efa
-  data.tar.gz: 2735511f3a2d456abdc196ea7db8a7c1fdb74f1648d004b00b794a7b7d1cc39186fa9db02a1d92aac3a962eb7208ec7a96aa432eeb82a8609e310add3ebf0613
+  metadata.gz: 4dcf359f0300e00c3249a3caaea255d18dff3770a1e6bfb51e6ac96dee7809a31680f093fb476457fea4b67ccf457355d5295b369c725d2b142773bd21171aa9
+  data.tar.gz: 32275e2f6cbc631f513606b053d8c6660d497a76cc926dd8af7314f2ebad0c17f5b72db1a02d0267f4e265070a3874921e2a4b3a8bfe9f40467728e5a62a25d9

data/CHANGELOG

@@ -1,3 +1,7 @@
+=== 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)

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 11802
+#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);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sequel_pg
 version: !ruby/object:Gem::Version
-  version: 1.18.2
+  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: []