pgsql 1.9 → 1.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2519cf85dd607a31191b7992cc99a93c31fb0b1103a38462f28cd77081599f0c
-  data.tar.gz: 026e108f08ffa63454f29504120c04f8fe8b3b1ffb664bd4626e7ca9f98f078a
+  metadata.gz: d735e83feb39d55f95efc1a196d433800c523fd0e73538b2c6415edd098f405c
+  data.tar.gz: e8e6e0b0526a73de32bf227effe13337ef125ea9f69d05099401aae4455c4288
 SHA512:
-  metadata.gz: 608f44789a6b5c009558c75b1d37f71fd2b86d283c2b78bf361d76bf3d7bb37065b6426a26f7ecb7d97829b3b31e4e7cf4a0f53453e11fc7327a914d2d65ca8c
-  data.tar.gz: 5e4e1fe2084fb5ba67646128d145de12840ad66c3fd54e0b22e65ea150c0d16444fc157ff19f61864fe048dd1eca4b3d7731ca8411376708ac81a2c7114b9774
+  metadata.gz: bbccf68542f27fc341ed1b517109655d5dd96b9d8cb21ac94e9d874f54d40eec9b3f50652967bb592cf04da68804c1351e01598ab8e4f3487ecc50b706dee65a
+  data.tar.gz: 388001a630086ddb47acb19672291ebe1cbd95f0349038e97189ff676e246047c4ce055bc726d065a9aea399cfdf1ff8d1e62d293178ebc6b8c131b10e4b951a

data/lib/conn_exec.c

@@ -20,11 +20,13 @@ static void free_strings( char **strs, int len);
 static void pg_parse_parameters( int argc, VALUE *argv, VALUE *cmd, VALUE *par);
 
 static VALUE pgconn_exec( int argc, VALUE *argv, VALUE obj);
+static VALUE yield_or_return_result( VALUE res);
 static VALUE pgconn_send( int argc, VALUE *argv, VALUE obj);
 static VALUE pgconn_fetch( int argc, VALUE *argv, VALUE conn);
 static void wait_for_pgsocket( PGconn *c, VALUE to);
-static VALUE yield_or_return_result( VALUE res);
 static VALUE clear_resultqueue( VALUE self);
+static VALUE pgconn_fetch_rows( int argc, VALUE *argv, VALUE conn);
+static VALUE fetch_result_each( RB_BLOCK_CALL_FUNC_ARGLIST( res, arg));
 
 static VALUE pgconn_query(         int argc, VALUE *argv, VALUE self);
 static VALUE pgconn_select_row(    int argc, VALUE *argv, VALUE self);
@@ -61,6 +63,7 @@ static VALUE rb_ePgConnTrans;
 static VALUE rb_ePgConnCopy;
 
 static ID id_to_a;
+static ID id_fetch;
 
 
 void
@@ -190,6 +193,13 @@ pgconn_exec( int argc, VALUE *argv, VALUE self)
     return yield_or_return_result( res);
 }
 
+VALUE
+yield_or_return_result( VALUE result)
+{
+    return rb_block_given_p() ?
+        rb_ensure( rb_yield, result, pgresult_clear, result) : result;
+}
+
 
 /*
  * call-seq:
@@ -213,8 +223,7 @@ pgconn_exec( int argc, VALUE *argv, VALUE self)
  *     end
  *   end
  *
- * Multiple select statements will not be separated by an empty result
- * or something similar. Query twice if you want to separate them.
+ * Multiple select statements will be separated by an empty result.
  *
  *   Pg::Conn.connect do |conn|
  *     conn.send "SELECT 33; SELECT 'foo';" do
@@ -241,7 +250,6 @@ pgconn_send( int argc, VALUE *argv, VALUE self)
  * Fetches the results of the previous Pg::Conn#send call.
  * See there for an example.
  *
- * The result will be +nil+ if there are no more results.
  */
 VALUE
 pgconn_fetch( int argc, VALUE *argv, VALUE conn)
@@ -258,10 +266,10 @@ pgconn_fetch( int argc, VALUE *argv, VALUE conn)
         pg_raise_connexec( c);
     if (PQisBusy( c->conn) == 0)
         while ((result = PQgetResult( c->conn)) != NULL) {
-            if (PQntuples( result) == 0)
-                PQclear( result);
-            else
-                rb_yield( pgresult_new( result, c, Qnil, Qnil));
+            VALUE res;
+
+            res = pgresult_new( result, c, Qnil, Qnil);
+            rb_ensure( rb_yield, res, pgresult_clear, res);
         }
     return Qnil;
 }
@@ -310,13 +318,6 @@ wait_for_pgsocket( PGconn *c, VALUE to)
         rb_raise( rb_ePgConnTimeout, "Wait for data timed out.");
 }
 
-VALUE
-yield_or_return_result( VALUE result)
-{
-    return rb_block_given_p() ?
-        rb_ensure( rb_yield, result, pgresult_clear, result) : result;
-}
-
 VALUE
 clear_resultqueue( VALUE conn)
 {
@@ -347,6 +348,37 @@ clear_resultqueue( VALUE conn)
 }
 
 
+/*
+ * call-seq:
+ *    conn.fetch_rows( timeout = nil) { |row| ... }  -> obj
+ *
+ * Fetches the results of the previous Pg::Conn#send call as an array.
+ *
+ * Multiple select statements will _not_ be separated by an empty array or
+ * something similar. Query twice or call +#fetch+ if you want to separate
+ * them.
+ *
+ *   Pg::Conn.connect do |conn|
+ *     conn.send "SELECT 33; SELECT 'foo';" do
+ *       conn.fetch { |row|
+ *         puts row.inspect
+ *       }
+ *     end
+ *   end
+ */
+VALUE
+pgconn_fetch_rows( int argc, VALUE *argv, VALUE conn)
+{
+    if (!id_fetch)
+        id_fetch = rb_intern( "fetch");
+    return rb_block_call( conn, id_fetch, argc, argv, fetch_result_each, Qnil);
+}
+
+VALUE
+fetch_result_each( RB_BLOCK_CALL_FUNC_ARGLIST( res, arg))
+{
+    return pgresult_each( res);
+}
 
 
 /*
@@ -945,6 +977,7 @@ Init_pgsql_conn_exec( void)
     rb_define_method( rb_cPgConn, "exec", &pgconn_exec, -1);
     rb_define_method( rb_cPgConn, "send", &pgconn_send, -1);
     rb_define_method( rb_cPgConn, "fetch", &pgconn_fetch, -1);
+    rb_define_method( rb_cPgConn, "fetch_rows", &pgconn_fetch_rows, -1);
 
     rb_define_method( rb_cPgConn, "query", &pgconn_query, -1);
     rb_define_method( rb_cPgConn, "select_row", &pgconn_select_row, -1);
@@ -977,6 +1010,7 @@ Init_pgsql_conn_exec( void)
 
     rb_define_method( rb_cPgConn, "backup", &pgconn_backup, 1);
 
-    id_to_a = 0;
+    id_to_a  = 0;
+    id_fetch = 0;
 }
 

data/lib/conn_quote.c

@@ -355,7 +355,7 @@ pgconn_for_copy( VALUE self, VALUE obj)
             rb_global_variable( &pg_escape_regex);
         }
         if (RTEST( rb_reg_match( pg_escape_regex, ret)))
-            ret = rb_block_call( ret, id_gsub, 1, &pg_escape_regex, gsub_escape_i, Qnil);
+            ret = rb_block_call( ret, id_gsub, 1, &pg_escape_regex, &gsub_escape_i, Qnil);
     }
     return ret;
 }

data/lib/module.c

@@ -8,7 +8,7 @@
 #include "result.h"
 
 
-#define PGSQL_VERSION "1.9"
+#define PGSQL_VERSION "1.9.1"
 
 
 VALUE rb_mPg;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pgsql
 version: !ruby/object:Gem::Version
-  version: '1.9'
+  version: 1.9.1
 platform: ruby
 authors:
 - Bertram Scharpf
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-08 00:00:00.000000000 Z
+date: 2021-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autorake