pgsql 1.9 → 1.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2519cf85dd607a31191b7992cc99a93c31fb0b1103a38462f28cd77081599f0c
-  data.tar.gz: 026e108f08ffa63454f29504120c04f8fe8b3b1ffb664bd4626e7ca9f98f078a
+  metadata.gz: '09bfda9c735da18dfbd986a66e29ad0fb7d7a89257e47fe2696094e6deb6d012'
+  data.tar.gz: ffb57400fdf3a67e777a76f8070d85c785bd3a588679da9316e620c96460ff84
 SHA512:
-  metadata.gz: 608f44789a6b5c009558c75b1d37f71fd2b86d283c2b78bf361d76bf3d7bb37065b6426a26f7ecb7d97829b3b31e4e7cf4a0f53453e11fc7327a914d2d65ca8c
-  data.tar.gz: 5e4e1fe2084fb5ba67646128d145de12840ad66c3fd54e0b22e65ea150c0d16444fc157ff19f61864fe048dd1eca4b3d7731ca8411376708ac81a2c7114b9774
+  metadata.gz: eda3796cb0d7604b3e2119d08f6cea4cee5d1a1455ceee2fa018fbbc5a9426f88d97ffd1714e9d01879fd6b5fadbafe2eb23b4b60b959f85d7a85c73aa9311e1
+  data.tar.gz: b9cd0c5e075530a708bca6956977dfd7482b3e478186fb1bc169633ce1d4fcbf8f02f88668a3dcca3552103c545f0c1a19d6d89190cfd5441ed7a7d4cbce51aa

data/lib/conn.c

@@ -166,7 +166,7 @@ pgconn_mkstring( struct pgconn_data *ptr, const char *str)
     VALUE r;
 
     if (str) {
-        r = rb_tainted_str_new2( str);
+        r = rb_str_new2( str);
         pgconn_encode_out4in( ptr, r);
     } else
         r = Qnil;
@@ -179,7 +179,7 @@ pgconn_mkstringn( struct pgconn_data *ptr, const char *str, int len)
     VALUE r;
 
     if (str) {
-        r = rb_tainted_str_new( str, len);
+        r = rb_str_new( str, len);
         pgconn_encode_out4in( ptr, r);
     } else
         r = Qnil;
@@ -438,7 +438,7 @@ pgconn_client_encoding( VALUE self)
 {
     char *encoding = (char *) pg_encoding_to_char(
                             PQclientEncoding( get_pgconn( self)->conn));
-    return rb_tainted_str_new2( encoding);
+    return rb_str_new2( encoding);
 }
 
 /*

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

@@ -159,7 +159,6 @@ pgconn_escape_bytea( VALUE self, VALUE str)
             (unsigned char *) RSTRING_PTR( str), RSTRING_LEN( str), &l);
     ret = rb_str_new( (char *) s, l - 1);
     PQfreemem( s);
-    OBJ_INFECT( ret, str);
     return ret;
 }
 
@@ -216,7 +215,6 @@ pgconn_unescape_bytea( VALUE self, VALUE obj)
         rb_enc_associate( ret, rb_to_encoding( enc));
 #endif
 
-    OBJ_INFECT( ret, obj);
     return ret;
 }
 
@@ -285,10 +283,9 @@ pgconn_stringize( VALUE self, VALUE obj)
                 VALUE co;
 
                 co = CLASS_OF( obj);
-                if        (co == rb_cTime) {
+                if        (co == rb_cTime)
                     result = rb_funcall( obj, id_iso8601, 0);
-                    OBJ_INFECT( result, obj);
-                } else if (co == rb_cDate)
+                else if (co == rb_cDate)
                     result = rb_obj_as_string( obj);
                 else if   (co == rb_cDateTime)
                     result = rb_obj_as_string( obj);
@@ -298,7 +295,6 @@ pgconn_stringize( VALUE self, VALUE obj)
                 else if   (rb_respond_to( obj, id_to_postgres)) {
                     result = rb_funcall( obj, id_to_postgres, 0);
                     StringValue( result);
-                    OBJ_INFECT( result, obj);
                 } else
                     result = rb_obj_as_string( obj);
             }
@@ -355,7 +351,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;
 }
@@ -428,10 +424,8 @@ stringize_array( VALUE self, VALUE result, VALUE ary)
             rb_str_buf_cat2( result, ",");
         }
         r = pgconn_stringize( self, *o);
-        if (!NIL_P( *o)) {
+        if (!NIL_P( *o))
             r = dquote_string( r);
-            OBJ_INFECT( result, *o);
-        }
         rb_str_buf_append( result, r);
     }
     return result;
@@ -542,7 +536,6 @@ VALUE pgconn_quote( VALUE self, VALUE obj)
                     rb_str_buf_cat2( res, "::");
                     rb_str_buf_cat2( res, type);
                 }
-                OBJ_INFECT( res, obj);
             }
             break;
     }
@@ -578,7 +571,6 @@ quote_string( VALUE conn, VALUE str)
     res = rb_str_new2( p);
     PQfreemem( p);
     rb_enc_associate( res, rb_enc_get( str));
-    OBJ_INFECT( res, str);
     return res;
 }
 
@@ -643,7 +635,6 @@ pgconn_quote_identifier( VALUE self, VALUE str)
     res = rb_str_new2( p);
     PQfreemem( p);
     rb_enc_associate( res, rb_enc_get( str));
-    OBJ_INFECT( res, str);
     return res;
 }
 

data/lib/module.c

@@ -8,7 +8,7 @@
 #include "result.h"
 
 
-#define PGSQL_VERSION "1.9"
+#define PGSQL_VERSION "1.9.2"
 
 
 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.2
 platform: ruby
 authors:
 - Bertram Scharpf
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-08 00:00:00.000000000 Z
+date: 2023-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autorake
@@ -73,7 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - PostgreSQL
-rubygems_version: 3.0.8
+rubygems_version: 3.4.17
 signing_key:
 specification_version: 4
 summary: PostgreSQL-API for Ruby