pgsql 1.5.1 → 1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5224c8b4aff8e7d39e4ea3b4bf14ab733d88653caab96507376db480777aaa86
-  data.tar.gz: 717901a45ef2f837911f1aba2cd4ba716354b5a299be9f10bc0684ffd8cda75e
+  metadata.gz: 5906425e386ca8404df02a1d14dec2ec92e730cabd03c8192f624112d537c3d2
+  data.tar.gz: 5bc40a7923bc2076aef6cdd8a2af71b679f01bee63fed44bbc475bf8e3a12dbb
 SHA512:
-  metadata.gz: aedc9283cc1bf0179cfedc2f145403aff24fe4267286b4c31566df795d359109799df65010f978271546fa657508d8f3821133a295cf9f8345ce6e23414bbce7
-  data.tar.gz: 2aaf604cdaf9c72ada34eb0cb790235000b4b798d993536980855ffbfb62683aa499cfbaf7701bad8a5626ebd2749de05aa14159ead7ded3d2bb26eb54bfaa7f
+  metadata.gz: a32d74928d3a5c2d04dd30d4453e11a346ce7f4bb24db40665d375776b6caa89dabed59fa87774ab52fdb1d09a9d37e3e8eca13118e04a35572c33c8e827856c
+  data.tar.gz: c405985704ae2c8a1bb52d957965a9b6ad4811bec41fe9785b3c56dba79c463fe1569ab27426a5853bfb1c5dfea4b10ae85505f7944bf5f6cdb6a0595174b895

data/lib/Rakefile

@@ -4,7 +4,7 @@
 
 require "autorake"
 
-c = compiler "-O2", "-fPIC"
+c = compiler "-O2", "-fPIC", "-Wall"
 l = linker "-shared"
 
 rule ".o" => ".c" do |t|

data/lib/conn.c

@@ -31,7 +31,7 @@ static VALUE pgconn_init( int argc, VALUE *argv, VALUE self);
 static int   set_connect_params( st_data_t key, st_data_t val, st_data_t args);
 static void  connstr_to_hash( VALUE params, VALUE str);
 static void  connstr_passwd( VALUE self, VALUE params);
-static VALUE connstr_getparam( VALUE yielded, VALUE params);
+static VALUE connstr_getparam( RB_BLOCK_CALL_FUNC_ARGLIST( yielded, params));
 
 static VALUE pgconn_close( VALUE self);
 static VALUE pgconn_reset( VALUE self);
@@ -393,7 +393,8 @@ connstr_passwd( VALUE self, VALUE params)
     }
 }
 
-VALUE connstr_getparam( VALUE yielded, VALUE params)
+VALUE
+connstr_getparam( RB_BLOCK_CALL_FUNC_ARGLIST( yielded, params))
 {
     return rb_hash_aref( params, yielded);
 }

data/lib/conn_exec.c

@@ -9,13 +9,6 @@
 #include "result.h"
 
 
-#ifdef HAVE_FUNC_RB_ERRINFO
-    #define RB_ERRINFO (rb_errinfo())
-#else
-    #define RB_ERRINFO ruby_errinfo
-#endif
-
-
 static void pg_raise_connexec( struct pgconn_data *c);
 
 static VALUE pg_statement_exec( VALUE conn, VALUE cmd, VALUE par);
@@ -37,11 +30,11 @@ static VALUE pgconn_select_values( int argc, VALUE *argv, VALUE self);
 static VALUE pgconn_get_notify( VALUE self);
 
 static VALUE pgconn_transaction( int argc, VALUE *argv, VALUE self);
-static VALUE rollback_transaction( VALUE self);
+static VALUE rollback_transaction( VALUE self, VALUE err);
 static VALUE commit_transaction( VALUE self);
 static VALUE yield_transaction( VALUE self);
 static VALUE pgconn_subtransaction( int argc, VALUE *argv, VALUE self);
-static VALUE rollback_subtransaction( VALUE ary);
+static VALUE rollback_subtransaction( VALUE ary, VALUE err);
 static VALUE release_subtransaction( VALUE ary);
 static VALUE yield_subtransaction( VALUE ary);
 static VALUE pgconn_transaction_status( VALUE self);
@@ -166,8 +159,6 @@ free_strings( char **strs, int len)
 void
 pg_parse_parameters( int argc, VALUE *argv, VALUE *cmd, VALUE *par)
 {
-    int len;
-
     rb_scan_args( argc, argv, "1*", cmd, par);
     StringValue( *cmd);
     if (RARRAY_LEN( *par) <= 0)
@@ -244,7 +235,6 @@ pgconn_fetch( VALUE self)
 {
     struct pgconn_data *c;
     PGresult *result;
-    VALUE res;
 
     Data_Get_Struct( self, struct pgconn_data, c);
     pg_check_conninvalid( c);
@@ -260,9 +250,6 @@ pgconn_fetch( VALUE self)
 VALUE
 yield_or_return_result( VALUE result)
 {
-    struct pgresult_data *r;
-
-    Data_Get_Struct( result, struct pgresult_data, r);
     return rb_block_given_p() ?
         rb_ensure( rb_yield, result, pgresult_clear, result) : result;
 }
@@ -472,10 +459,10 @@ yield_transaction( VALUE self)
 }
 
 VALUE
-rollback_transaction( VALUE self)
+rollback_transaction( VALUE self, VALUE err)
 {
     pgresult_clear( pg_statement_exec( self, rb_str_new2( "ROLLBACK;"), Qnil));
-    rb_exc_raise( RB_ERRINFO);
+    rb_exc_raise( err);
     return Qnil;
 }
 
@@ -533,7 +520,7 @@ yield_subtransaction( VALUE ary)
 }
 
 VALUE
-rollback_subtransaction( VALUE ary)
+rollback_subtransaction( VALUE ary, VALUE err)
 {
     VALUE cmd;
 
@@ -542,7 +529,7 @@ rollback_subtransaction( VALUE ary)
     rb_str_buf_cat2( cmd, ";");
     pgresult_clear( pg_statement_exec( rb_ary_entry( ary, 0), cmd, Qnil));
     rb_ary_store( ary, 1, Qnil);
-    rb_exc_raise( RB_ERRINFO);
+    rb_exc_raise( err);
     return Qnil;
 }
 
@@ -625,7 +612,7 @@ put_end( VALUE self)
     Data_Get_Struct( self, struct pgconn_data, c);
     /*
      * I would like to hand over something like
-     *     RSTRING_PTR( rb_obj_as_string( RB_ERRINFO))
+     *     RSTRING_PTR( rb_obj_as_string( rb_errinfo()))
      * here but when execution is inside a rescue block
      * the error info will be non-null even though the
      * exception just has been caught.
@@ -908,6 +895,6 @@ Init_pgsql_conn_exec( void)
 
     rb_define_method( rb_cPgConn, "backup", &pgconn_backup, 1);
 
-    ID id_to_a = 0;
+    id_to_a = 0;
 }
 

data/lib/conn_quote.c

@@ -23,7 +23,8 @@ extern VALUE pgconn_for_copy( VALUE self, VALUE str);
 static int   needs_dquote_string( VALUE str);
 static VALUE dquote_string( VALUE str);
 static VALUE stringize_array( VALUE self, VALUE result, VALUE ary);
-static VALUE gsub_escape_i( VALUE c, VALUE arg);
+static VALUE gsub_escape_i( RB_BLOCK_CALL_FUNC_ARGLIST( c, arg));
+
 
 static VALUE pgconn_quote( VALUE self, VALUE obj);
 static VALUE pgconn_quote_all( int argc, VALUE *argv, VALUE self);
@@ -199,11 +200,11 @@ pgconn_unescape_bytea( VALUE self, VALUE obj)
     size_t l;
     VALUE ret;
 
-    if (NIL_P( obj))
-        return Qnil;
 #ifdef RUBY_ENCODING
     rb_scan_args( argc, argv, "11", &obj, &enc);
 #endif
+    if (NIL_P( obj))
+        return Qnil;
     StringValue( obj);
 
     s = PQunescapeBytea( (unsigned char *) RSTRING_PTR( obj), &l);
@@ -319,7 +320,7 @@ pgconn_stringize_line( VALUE self, VALUE ary)
     VALUE a;
     VALUE *p;
     int l;
-    VALUE ret, s;
+    VALUE ret;
 
     a = rb_check_convert_type( ary, T_ARRAY, "Array", "to_ary");
     if (NIL_P(a))
@@ -411,13 +412,13 @@ dquote_string( VALUE str)
 VALUE
 stringize_array( VALUE self, VALUE result, VALUE ary)
 {
-    long i, j;
+    long i;
     VALUE *o;
     VALUE cf, co;
     VALUE r;
 
     cf = Qundef;
-    for (o = RARRAY_PTR( ary), j = RARRAY_LEN( ary); j; ++o, --j) {
+    for (o = RARRAY_PTR( ary), i = RARRAY_LEN( ary); i; ++o, --i) {
         co = CLASS_OF( *o);
         if (cf == Qundef)
             cf = co;
@@ -438,7 +439,7 @@ stringize_array( VALUE self, VALUE result, VALUE ary)
 
 
 VALUE
-gsub_escape_i( VALUE c, VALUE arg)
+gsub_escape_i( RB_BLOCK_CALL_FUNC_ARGLIST( c, arg))
 {
     const char *r;
 
@@ -584,12 +585,12 @@ quote_string( VALUE conn, VALUE str)
 VALUE
 quote_array( VALUE self, VALUE result, VALUE ary)
 {
-    long i, j;
+    long i;
     VALUE *o;
     VALUE cf, co;
 
     cf = Qundef;
-    for (o = RARRAY_PTR( ary), j = RARRAY_LEN( ary); j; ++o, --j) {
+    for (o = RARRAY_PTR( ary), i = RARRAY_LEN( ary); i; ++o, --i) {
         co = CLASS_OF( *o);
         if (cf == Qundef)
             cf = co;

data/lib/mkrf_conf

@@ -10,27 +10,19 @@ Autorake.configure {
 
   extending_ruby
 
-  if RUBY_VERSION < "1.9" then
-    have_header "ruby.h"
-    have_header "rubyio.h"
-    have_header "st.h"
-  else
-    have_header "ruby/ruby.h"
-    have_header "ruby/io.h"
-  end
+  need_header "ruby/ruby.h"
+  need_header "ruby/io.h"
+
 
   incdir :postgres,        `pg_config --pkgincludedir`
   incdir :postgres_server, `pg_config --includedir-server`
 
-  have_library "crypto"
-  have_library "ssl"
-  have_library "pq"
+  need_library "pq"
 
-  have_header "postgres.h"
-  have_header "libpq-fe.h"
-  have_header "catalog/pg_type.h"
+  need_header "postgres.h"
+  need_header "libpq-fe.h"
+  need_header "catalog/pg_type.h"
 
-  have_func "rb_errinfo"
   have_func "rb_io_stdio_file"
   have_func "rb_locale_encoding"
 

data/lib/module.c

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

data/lib/module.h

@@ -18,15 +18,9 @@
 #endif
 #include "undef.h"
 
-#ifdef HAVE_HEADER_POSTGRES_H
-    #include <postgres.h>
-#endif
-#ifdef HAVE_HEADER_LIBPQ_FE_H
-    #include <libpq-fe.h>
-#endif
-#ifdef HAVE_HEADER_CATALOG_PG_TYPE_H
-    #include <catalog/pg_type.h>
-#endif
+#include <postgres.h>
+#include <libpq-fe.h>
+#include <catalog/pg_type.h>
 #include "undef.h"
 
 

data/lib/result.c

@@ -11,9 +11,6 @@
 static void pgresult_init( struct pgresult_data *r, PGresult *result, struct pgconn_data *conn);
 static VALUE pgreserror_new( VALUE result, VALUE cmd, VALUE par);
 
-static VALUE pgreserror_command( VALUE self);
-static VALUE pgreserror_params(  VALUE self);
-
 static struct pgresult_data *pgreserror_result( VALUE self);
 static VALUE pgreserror_status(  VALUE self);
 static VALUE pgreserror_sqlst(   VALUE self);
@@ -25,7 +22,6 @@ static VALUE pgreserror_diag(    VALUE self, VALUE field);
 
 static VALUE pgresult_s_translate_results_set( VALUE cls, VALUE fact);
 
-static void pgresult_mark( struct pgresult_data *ptr);
 static void pgresult_free( struct pgresult_data *ptr);
 extern VALUE pgresult_new( PGresult *result, struct pgconn_data *conn, VALUE cmd, VALUE par);
 
@@ -214,13 +210,6 @@ pgresult_s_translate_results_set( VALUE cls, VALUE fact)
 
 
 
-void
-pgresult_mark( struct pgresult_data *ptr)
-{
-    rb_gc_mark( ptr->fields);
-    rb_gc_mark( ptr->indices);
-}
-
 void
 pgresult_free( struct pgresult_data *ptr)
 {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pgsql
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: '1.6'
 platform: ruby
 authors:
 - Bertram Scharpf
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-01-13 00:00:00.000000000 Z
+date: 2020-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autorake
@@ -55,7 +55,7 @@ homepage: http://www.bertram-scharpf.de/software/pgsql
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--main"
 - README
@@ -73,8 +73,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - PostgreSQL
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: PostgreSQL-API for Ruby
 test_files: []