pgsql 1.9.2 → 1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09bfda9c735da18dfbd986a66e29ad0fb7d7a89257e47fe2696094e6deb6d012'
-  data.tar.gz: ffb57400fdf3a67e777a76f8070d85c785bd3a588679da9316e620c96460ff84
+  metadata.gz: d5e250aaea34af2f5b9f76ebb8d6ef7d590836e8826dd189ef9c1721a8aced6b
+  data.tar.gz: e24f7f58eb083c0c95c544ac72ed17c8423759fc335798ce8957e8c085262fab
 SHA512:
-  metadata.gz: eda3796cb0d7604b3e2119d08f6cea4cee5d1a1455ceee2fa018fbbc5a9426f88d97ffd1714e9d01879fd6b5fadbafe2eb23b4b60b959f85d7a85c73aa9311e1
-  data.tar.gz: b9cd0c5e075530a708bca6956977dfd7482b3e478186fb1bc169633ce1d4fcbf8f02f88668a3dcca3552103c545f0c1a19d6d89190cfd5441ed7a7d4cbce51aa
+  metadata.gz: 62aea91052765eb84cbedae7140e05574cc919eb53a18123a5b9818f58cd188b7bad70c17ebb175019056db33f46da6c810fd1483b78694680338a51cd88ba37
+  data.tar.gz: 86eb5356770eea1bbd0a66151f49ba61d6c221a4cdfcc2f86d11c5982c6fe6adc9d0d0a41ca9d128bd2796c07c40a0305d6828be80df509b0b933bc765bbeac8

data/LICENSE

@@ -1,19 +1,24 @@
-= pgsql Ruby Gem
+# BSD-2-clause license, extended by language use conditions
 
-Copyright (C) 2011-2020, Bertram Scharpf <software@bertram-scharpf.de>.
+Copyright (C) 2011-2025, Bertram Scharpf <software@bertram-scharpf.de>.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
 met:
 
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
 
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in
-      the documentation and/or other materials provided with the
-      distribution.
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+
+  * Redistributions must not contain any clauses about anticipated
+    harassment or discrimination, nor must they be held in a so-called
+    "inclusive language". As far as German language is used, the
+    conditions mentioned below additionally apply.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
 IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -27,3 +32,21 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+
+## Use of the German Language
+
+Beim Gebrauch deutscher Sprache sind Weiterentwicklungen und
+-verbreitungen nur gestattet unter Einhaltung sowie abermaligen
+Einforderns folgender zusätzlicher Bedingungen:
+
+  * Keine Verwendung von sogenannter „geschlechtergerechter Sprache“,
+    also Anfügen von weiblichen Endungen mit Binnen-I, Sternchen,
+    Doppelpunkt, Unterstrich oder ähnlichem, oder Konstruktionen, die
+    den Sachverhalt falsch wiedergeben („Radfahrende“, „Studierende“).
+
+  * Keine Verwendung der „reformierten Rechtschreibung“ von 1996,
+    insbesondere Doppel-S am Silbenende, „plazieren“ mit T, sowie
+    Großschreibung von Wendungen wie „des weiteren“.
+
+
+<!-- vim:set ft=markdown : -->

data/README.md

@@ -0,0 +1,57 @@
+# pgsql Ruby Gem
+
+A PostgreSQL library that was carefully designed.
+
+
+## Author
+
+Bertram Scharpf <software@bertram-scharpf.de>
+
+
+## Features
+
+  * Connection parameters from hash
+  * Query parameters
+  * Asynchronous queries
+  * Quick query of single lines or values
+  * Full PostgreSQL quoting support
+  * Built-in transactions and savepoints by Ruby blocks
+
+
+## Example
+
+Write something like this:
+
+```ruby
+require "pgsql"
+
+Pg::Conn.open :dbname => "test1", :user => "jdoe" do |conn|
+  conn.exec "SELECT * FROM mytable;" do |result|
+  result.each { |row|
+    l = row.join ", "
+    ...
+  }
+  end
+  cmd = <<~ENDSQL
+    SELECT * FROM mytable WHERE num=$1::INTEGER;
+  ENDSQL
+  conn.query cmd, 42 do |row|
+    l = row.join ", "
+    ...
+  end
+  ...
+end
+```
+
+
+## Thanks
+
+In the remembrance of Guy Decoux.
+
+
+## Copyright
+
+  * (C) 2011-2025 Bertram Scharpf <software@bertram-scharpf.de>
+  * License: [BSD-2-Clause+](./LICENSE)
+  * Repository: [ruby-pgsql](https://github.com/BertramScharpf/ruby-pgsql)
+

data/lib/conn.c

@@ -13,17 +13,13 @@
 #endif
 
 
-extern void pg_check_conninvalid( struct pgconn_data *c);
 static VALUE pgconnfailederror_new( struct pgconn_data *c, VALUE params);
 
-static void  pgconn_mark( struct pgconn_data *ptr);
-static void  pgconn_free( struct pgconn_data *ptr);
-extern struct pgconn_data *get_pgconn( VALUE obj);
+static void   pgconn_mark( void *ptr);
+static void   pgconn_free( void *ptr);
+static size_t pgconn_memsize( const void *ptr);
 static VALUE pgconn_encode_in4out( struct pgconn_data *ptr, VALUE str);
-extern const char *pgconn_destring( struct pgconn_data *ptr, VALUE str, int *len);
 static VALUE pgconn_encode_out4in( struct pgconn_data *ptr, VALUE str);
-extern VALUE pgconn_mkstring( struct pgconn_data *ptr, const char *str);
-extern VALUE pgconn_mkstringn( struct pgconn_data *ptr, const char *str, int len);
 static VALUE pgconn_alloc( VALUE cls);
 static VALUE pgconn_s_connect( int argc, VALUE *argv, VALUE cls);
 static VALUE pgconn_init( int argc, VALUE *argv, VALUE self);
@@ -76,6 +72,12 @@ static VALUE sym_password = Qundef;
 
 static ID id_to_s;
 
+static const rb_data_type_t pgconn_data_data_type = {
+    "pgsql:pgconn_data",
+    { &pgconn_mark, &pgconn_free, &pgconn_memsize,},
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
+};
+
 
 void
 pg_check_conninvalid( struct pgconn_data *c)
@@ -99,21 +101,29 @@ pgconnfailederror_new( struct pgconn_data *c, VALUE params)
 
 
 void
-pgconn_mark( struct pgconn_data *ptr)
+pgconn_mark( void *ptr)
 {
-    rb_gc_mark( ptr->notice);
+    struct pgconn_data *pd = ptr;
 #ifdef RUBY_ENCODING
-    rb_gc_mark( ptr->external);
-    rb_gc_mark( ptr->internal);
+    rb_gc_mark( pd->external);
+    rb_gc_mark( pd->internal);
 #endif
+    rb_gc_mark( pd->notice);
 }
 
 void
-pgconn_free( struct pgconn_data *ptr)
+pgconn_free( void *ptr)
+{
+    struct pgconn_data *pd = ptr;
+    if (pd->conn != NULL)
+        PQfinish( pd->conn);
+    ruby_xfree( ptr);
+}
+
+static size_t
+pgconn_memsize( const void *ptr)
 {
-    if (ptr->conn != NULL)
-        PQfinish( ptr->conn);
-    free( ptr);
+    return sizeof (struct pgconn_data);
 }
 
 struct pgconn_data *
@@ -121,7 +131,7 @@ get_pgconn( VALUE obj)
 {
     struct pgconn_data *c;
 
-    Data_Get_Struct( obj, struct pgconn_data, c);
+    TypedData_Get_Struct( obj, struct pgconn_data, &pgconn_data_data_type, c);
     pg_check_conninvalid( c);
     return c;
 }
@@ -190,17 +200,16 @@ VALUE
 pgconn_alloc( VALUE cls)
 {
     struct pgconn_data *c;
-    VALUE r;
+    VALUE obj;
 
-    r = Data_Make_Struct( cls, struct pgconn_data,
-                            &pgconn_mark, &pgconn_free, c);
+    obj = TypedData_Make_Struct( cls, struct pgconn_data, &pgconn_data_data_type, c);
     c->conn    = NULL;
 #ifdef RUBY_ENCODING
     c->external = rb_enc_from_encoding( rb_default_external_encoding());
     c->internal = rb_enc_from_encoding( rb_default_internal_encoding());
 #endif
     c->notice  = Qnil;
-    return r;
+    return obj;
 }
 
 /*
@@ -287,7 +296,7 @@ pgconn_init( int argc, VALUE *argv, VALUE self)
             str = Qnil;
         }
 
-    Data_Get_Struct( self, struct pgconn_data, c);
+    TypedData_Get_Struct( self, struct pgconn_data, &pgconn_data_data_type, c);
 
     if (NIL_P( params)) {
         c->conn = PQconnectdb( RSTRING_PTR( rb_funcall( str, id_to_s, 0)));
@@ -405,7 +414,7 @@ pgconn_close( VALUE self)
 {
     struct pgconn_data *c;
 
-    Data_Get_Struct( self, struct pgconn_data, c);
+    TypedData_Get_Struct( self, struct pgconn_data, &pgconn_data_data_type, c);
     PQfinish( c->conn);
     c->conn = NULL;
     return Qnil;
@@ -470,7 +479,7 @@ pgconn_externalenc( VALUE self)
 {
     struct pgconn_data *c;
 
-    Data_Get_Struct( self, struct pgconn_data, c);
+    TypedData_Get_Struct( self, struct pgconn_data, &pgconn_data_data_type, c);
     return c->external;
 }
 
@@ -487,7 +496,7 @@ pgconn_set_externalenc( VALUE self, VALUE enc)
     rb_encoding *e;
 
     e = NIL_P( enc) ? rb_to_encoding( enc) : rb_default_external_encoding();
-    Data_Get_Struct( self, struct pgconn_data, c);
+    TypedData_Get_Struct( self, struct pgconn_data, &pgconn_data_data_type, c);
     c->external = rb_enc_from_encoding( e);
 
     return Qnil;
@@ -504,7 +513,7 @@ pgconn_internalenc( VALUE self)
 {
     struct pgconn_data *c;
 
-    Data_Get_Struct( self, struct pgconn_data, c);
+    TypedData_Get_Struct( self, struct pgconn_data, &pgconn_data_data_type, c);
     return c->internal;
 }
 
@@ -521,7 +530,7 @@ pgconn_set_internalenc( VALUE self, VALUE enc)
     rb_encoding *e;
 
     e = NIL_P( enc) ? rb_to_encoding( enc) : rb_default_internal_encoding();
-    Data_Get_Struct( self, struct pgconn_data, c);
+    TypedData_Get_Struct( self, struct pgconn_data, &pgconn_data_data_type, c);
     c->internal = rb_enc_from_encoding( e);
 
     return Qnil;
@@ -785,7 +794,7 @@ pgconn_on_notice( VALUE self)
 {
     struct pgconn_data *c;
 
-    Data_Get_Struct( self, struct pgconn_data, c);
+    TypedData_Get_Struct( self, struct pgconn_data, &pgconn_data_data_type, c);
     if (PQsetNoticeReceiver( c->conn, NULL, NULL) != &notice_receiver) {
         PQsetNoticeReceiver( c->conn, &notice_receiver, (void *) c);
     }

data/lib/conn_exec.c

@@ -36,11 +36,9 @@ static VALUE pgconn_get_notify( VALUE self);
 
 static VALUE pgconn_transaction( int argc, VALUE *argv, VALUE self);
 static VALUE rollback_transaction( VALUE conn, VALUE err);
-static VALUE commit_transaction( VALUE self);
 static VALUE yield_transaction( VALUE conn);
 static VALUE pgconn_subtransaction( int argc, VALUE *argv, VALUE self);
 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);
 
@@ -93,7 +91,7 @@ pg_statement_exec( VALUE conn, VALUE cmd, VALUE par)
     }
     if (result == NULL)
         pg_raise_connexec( c);
-    return pgresult_new( result, c, cmd, par);
+    return pgresult_new( result, conn, cmd, par);
 }
 
 
@@ -268,7 +266,7 @@ pgconn_fetch( int argc, VALUE *argv, VALUE conn)
         while ((result = PQgetResult( c->conn)) != NULL) {
             VALUE res;
 
-            res = pgresult_new( result, c, Qnil, Qnil);
+            res = pgresult_new( result, conn, Qnil, Qnil);
             rb_ensure( rb_yield, res, pgresult_clear, res);
         }
     return Qnil;
@@ -430,7 +428,7 @@ pgconn_select_row( int argc, VALUE *argv, VALUE self)
     pg_parse_parameters( argc, argv, &cmd, &par);
     res = pg_statement_exec( self, cmd, par);
 
-    Data_Get_Struct( res, struct pgresult_data, r);
+    TypedData_Get_Struct( res, struct pgresult_data, &pgresult_data_data_type, r);
     return pg_fetchrow( r, 0);
 }
 
@@ -451,7 +449,7 @@ pgconn_select_value( int argc, VALUE *argv, VALUE self)
     pg_parse_parameters( argc, argv, &cmd, &par);
     res = pg_statement_exec( self, cmd, par);
 
-    Data_Get_Struct( res, struct pgresult_data, r);
+    TypedData_Get_Struct( res, struct pgresult_data, &pgresult_data_data_type, r);
     return PQntuples( r->res) > 0 && PQnfields( r->res) > 0 ?
                     pg_fetchresult( r, 0, 0) : Qnil;
 }
@@ -476,7 +474,7 @@ pgconn_select_values( int argc, VALUE *argv, VALUE self)
     pg_parse_parameters( argc, argv, &cmd, &par);
     res = pg_statement_exec( self, cmd, par);
 
-    Data_Get_Struct( res, struct pgresult_data, r);
+    TypedData_Get_Struct( res, struct pgresult_data, &pgresult_data_data_type, r);
     m = PQntuples( r->res), n = PQnfields( r->res);
     l = m * n;
     if (l == 0)
@@ -562,13 +560,17 @@ pgconn_transaction( int argc, VALUE *argv, VALUE conn)
         rb_raise( rb_ePgConnTrans,
             "Nested transaction block. Use Conn#subtransaction.");
     pgresult_clear( pg_statement_exec( conn, cmd, Qnil));
-    return rb_ensure( yield_transaction, conn, commit_transaction, conn);
+    return rb_rescue2( yield_transaction, conn, rollback_transaction, conn, rb_eException, (VALUE) 0);
 }
 
 VALUE
 yield_transaction( VALUE conn)
 {
-    return rb_rescue( rb_yield, conn, rollback_transaction, conn);
+    VALUE r;
+
+    r = rb_yield( conn);
+    pgresult_clear( pg_statement_exec( conn, rb_str_new2( "COMMIT;"), Qnil));
+    return r;
 }
 
 VALUE
@@ -579,17 +581,6 @@ rollback_transaction( VALUE conn, VALUE err)
     return Qnil;
 }
 
-VALUE
-commit_transaction( VALUE conn)
-{
-    struct pgconn_data *c;
-
-    c = get_pgconn( conn);
-    if (PQtransactionStatus( c->conn) > PQTRANS_IDLE)
-        pgresult_clear( pg_statement_exec( conn, rb_str_new2( "COMMIT;"), Qnil));
-    return Qnil;
-}
-
 
 /*
  * call-seq:
@@ -623,13 +614,23 @@ pgconn_subtransaction( int argc, VALUE *argv, VALUE self)
     rb_str_buf_cat2( cmd, ";");
 
     pgresult_clear( pg_statement_exec( self, cmd, Qnil));
-    return rb_ensure( yield_subtransaction, ya, release_subtransaction, ya);
+    return rb_rescue2( yield_subtransaction, ya, rollback_subtransaction, ya, rb_eException, (VALUE) 0);
 }
 
 VALUE
 yield_subtransaction( VALUE ary)
 {
-    return rb_rescue( rb_yield, ary, rollback_subtransaction, ary);
+    VALUE conn;
+    VALUE r;
+    VALUE cmd;
+
+    conn = rb_ary_entry( ary, 0);
+    r = rb_yield( conn);
+    cmd = rb_str_buf_new2( "RELEASE SAVEPOINT ");
+    rb_str_buf_append( cmd, rb_ary_entry( ary, 1));
+    rb_str_buf_cat2( cmd, ";");
+    pgresult_clear( pg_statement_exec( conn, cmd, Qnil));
+    return r;
 }
 
 VALUE
@@ -646,24 +647,6 @@ rollback_subtransaction( VALUE ary, VALUE err)
     return Qnil;
 }
 
-VALUE
-release_subtransaction( VALUE ary)
-{
-    VALUE cmd;
-    VALUE n;
-
-    n = rb_ary_entry( ary, 1);
-    if (!NIL_P( n)) {
-        cmd = rb_str_buf_new2( "RELEASE SAVEPOINT ");
-        rb_str_buf_append( cmd, n);
-        rb_str_buf_cat2( cmd, ";");
-        pgresult_clear( pg_statement_exec( rb_ary_entry( ary, 0), cmd, Qnil));
-    }
-    return Qnil;
-}
-
-
-
 
 /*
  * call-seq:
@@ -735,7 +718,7 @@ put_end( VALUE self)
     if (r < 0)
         rb_raise( rb_ePgConnCopy, "Copy from stdin failed to finish.");
     while ((res = PQgetResult( c->conn)) != NULL)
-        pgresult_new( res, c, Qnil, Qnil);
+        pgresult_new( res, self, Qnil, Qnil);
     return Qnil;
 }
 
@@ -836,7 +819,7 @@ get_end( VALUE self)
 
     c = get_pgconn( self);
     if ((res = PQgetResult( c->conn)) != NULL)
-        pgresult_new( res, c, Qnil, Qnil);
+        pgresult_new( res, self, Qnil, Qnil);
     return Qnil;
 }
 

data/lib/conn_quote.c

@@ -6,8 +6,6 @@
 #include "conn_quote.h"
 
 
-extern VALUE pg_monetary_class( void);
-
 static VALUE pgconn_format( VALUE self, VALUE obj);
 
 static VALUE pgconn_escape_bytea(   VALUE self, VALUE str);
@@ -17,9 +15,8 @@ static VALUE pgconn_unescape_bytea( int argc, VALUE *argv, VALUE self);
 static VALUE pgconn_unescape_bytea( VALUE self, VALUE obj);
 #endif
 
-extern VALUE pgconn_stringize( VALUE self, VALUE obj);
-extern VALUE pgconn_stringize_line( VALUE self, VALUE ary);
-extern VALUE pgconn_for_copy( VALUE self, VALUE str);
+static 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);

data/lib/module.c

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

data/lib/result.c

@@ -8,7 +8,6 @@
 #include "conn_quote.h"
 
 
-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 struct pgresult_data *pgreserror_result( VALUE self);
@@ -22,10 +21,10 @@ static VALUE pgreserror_diag(    VALUE self, VALUE field);
 
 static VALUE pgresult_s_translate_results_set( VALUE cls, VALUE fact);
 
-static void pgresult_free( struct pgresult_data *ptr);
-extern VALUE pgresult_new( PGresult *result, struct pgconn_data *conn, VALUE cmd, VALUE par);
-
-extern VALUE pgresult_clear( VALUE self);
+static void   pgresult_mark( void *ptr);
+static void   pgresult_free( void *ptr);
+static size_t pgresult_memsize( const void *ptr);
+static VALUE pgresult_alloc( VALUE cls);
 
 static VALUE pgresult_status( VALUE self);
 
@@ -35,10 +34,7 @@ static VALUE pgresult_num_fields( VALUE self);
 static VALUE pgresult_fieldname( VALUE self, VALUE index);
 static VALUE pgresult_fieldnum( VALUE self, VALUE name);
 
-extern VALUE pgresult_each( VALUE self);
 static VALUE pgresult_aref( int argc, VALUE *argv, VALUE self);
-extern VALUE pg_fetchrow( struct pgresult_data *r, int num);
-extern VALUE pg_fetchresult( struct pgresult_data *r, int row, int col);
 static VALUE pgresult_num_tuples( VALUE self);
 
 static VALUE pgresult_type( VALUE self, VALUE index);
@@ -64,6 +60,14 @@ static int translate_results = 1;
 
 
 
+const rb_data_type_t pgresult_data_data_type = {
+    "mydata",
+    { &pgresult_mark, &pgresult_free, &pgresult_memsize,},
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
+};
+
+
+
 
 VALUE
 pgreserror_new( VALUE result, VALUE cmd, VALUE par)
@@ -71,8 +75,8 @@ pgreserror_new( VALUE result, VALUE cmd, VALUE par)
     struct pgresult_data *r;
     VALUE rse, msg;
 
-    Data_Get_Struct( result, struct pgresult_data, r);
-    msg = pgconn_mkstring( r->conn, PQresultErrorMessage( r->res));
+    TypedData_Get_Struct( result, struct pgresult_data, &pgresult_data_data_type, r);
+    msg = pgconn_mkstring( get_pgconn( r->conn), PQresultErrorMessage( r->res));
     rse = rb_class_new_instance( 1, &msg, rb_ePgResError);
     rb_ivar_set( rse, id_result, result);
     rb_ivar_set( rse, rb_intern( "@command"),    cmd);
@@ -87,7 +91,7 @@ pgreserror_result( VALUE self)
 {
     struct pgresult_data *r;
 
-    Data_Get_Struct( rb_ivar_get( self, id_result), struct pgresult_data, r);
+    TypedData_Get_Struct( rb_ivar_get( self, id_result), struct pgresult_data, &pgresult_data_data_type, r);
     return r;
 }
 
@@ -120,7 +124,7 @@ pgreserror_sqlst( VALUE self)
     struct pgresult_data *r;
 
     r = pgreserror_result( self);
-    return pgconn_mkstring( r->conn, PQresultErrorField( r->res, PG_DIAG_SQLSTATE));
+    return pgconn_mkstring( get_pgconn( r->conn), PQresultErrorField( r->res, PG_DIAG_SQLSTATE));
 }
 
 /*
@@ -136,7 +140,7 @@ pgreserror_primary( VALUE self)
     struct pgresult_data *r;
 
     r = pgreserror_result( self);
-    return pgconn_mkstring( r->conn, PQresultErrorField( r->res, PG_DIAG_MESSAGE_PRIMARY));
+    return pgconn_mkstring( get_pgconn( r->conn), PQresultErrorField( r->res, PG_DIAG_MESSAGE_PRIMARY));
 }
 
 
@@ -153,7 +157,7 @@ pgreserror_detail( VALUE self)
     struct pgresult_data *r;
 
     r = pgreserror_result( self);
-    return pgconn_mkstring( r->conn, PQresultErrorField( r->res, PG_DIAG_MESSAGE_DETAIL));
+    return pgconn_mkstring( get_pgconn( r->conn), PQresultErrorField( r->res, PG_DIAG_MESSAGE_DETAIL));
 }
 
 
@@ -170,7 +174,7 @@ pgreserror_hint( VALUE self)
     struct pgresult_data *r;
 
     r = pgreserror_result( self);
-    return pgconn_mkstring( r->conn, PQresultErrorField( r->res, PG_DIAG_MESSAGE_HINT));
+    return pgconn_mkstring( get_pgconn( r->conn), PQresultErrorField( r->res, PG_DIAG_MESSAGE_HINT));
 }
 
 
@@ -188,7 +192,7 @@ pgreserror_diag( VALUE self, VALUE field)
     struct pgresult_data *r;
 
     r = pgreserror_result( self);
-    return pgconn_mkstring( r->conn, PQresultErrorField( r->res, NUM2INT( field)));
+    return pgconn_mkstring( get_pgconn( r->conn), PQresultErrorField( r->res, NUM2INT( field)));
 }
 
 
@@ -211,30 +215,57 @@ pgresult_s_translate_results_set( VALUE cls, VALUE fact)
 
 
 void
-pgresult_free( struct pgresult_data *ptr)
+pgresult_mark( void *ptr)
 {
-    if (ptr->res != NULL)
-        PQclear( ptr->res);
-    free( ptr);
+    struct pgresult_data *rd = ptr;
+    rb_gc_mark( rd->conn);
+    rb_gc_mark( rd->fields);
+    rb_gc_mark( rd->indices);
 }
 
 void
-pgresult_init( struct pgresult_data *r, PGresult *result, struct pgconn_data *conn)
+pgresult_free( void *ptr)
 {
-    r->res     = result;
-    r->conn    = conn;
+    struct pgresult_data *rd = ptr;
+    if (rd->res != NULL)
+        PQclear( rd->res);
+    ruby_xfree( ptr);
+}
+
+size_t
+pgresult_memsize( const void *ptr)
+{
+    return sizeof (struct pgresult_data);
+}
+
+
+
+VALUE
+pgresult_alloc( VALUE cls)
+{
+    struct pgresult_data *r;
+    VALUE obj;
+
+    obj = TypedData_Make_Struct( cls, struct pgresult_data, &pgresult_data_data_type, r);
+    r->res     = NULL;
+    r->conn    = Qnil;
     r->fields  = Qnil;
     r->indices = Qnil;
+    return obj;
 }
 
 VALUE
-pgresult_new( PGresult *result, struct pgconn_data *conn, VALUE cmd, VALUE par)
+pgresult_new( PGresult *result, VALUE conn, VALUE cmd, VALUE par)
 {
     struct pgresult_data *r;
     VALUE res;
 
-    res = Data_Make_Struct( rb_cPgResult, struct pgresult_data, 0, &pgresult_free, r);
-    pgresult_init( r, result, conn);
+    res = rb_class_new_instance( 0, NULL, rb_cPgResult);
+    TypedData_Get_Struct( res, struct pgresult_data, &pgresult_data_data_type, r);
+    r->res     = result;
+    r->conn    = conn;
+    r->fields  = Qnil;
+    r->indices = Qnil;
     switch (PQresultStatus( result)) {
         case PGRES_EMPTY_QUERY:
         case PGRES_COMMAND_OK:
@@ -267,7 +298,7 @@ pgresult_clear( VALUE self)
 {
     struct pgresult_data *r;
 
-    Data_Get_Struct( self, struct pgresult_data, r);
+    TypedData_Get_Struct( self, struct pgresult_data, &pgresult_data_data_type, r);
     if (r->res != NULL) {
         PQclear( r->res);
         r->res = NULL;
@@ -292,7 +323,7 @@ pgresult_status( VALUE self)
 {
     struct pgresult_data *r;
 
-    Data_Get_Struct( self, struct pgresult_data, r);
+    TypedData_Get_Struct( self, struct pgresult_data, &pgresult_data_data_type, r);
     return INT2FIX( PQresultStatus( r->res));
 }
 
@@ -313,7 +344,7 @@ pgresult_fields( VALUE self)
 {
     struct pgresult_data *r;
 
-    Data_Get_Struct( self, struct pgresult_data, r);
+    TypedData_Get_Struct( self, struct pgresult_data, &pgresult_data_data_type, r);
     if (NIL_P( r->fields)) {
         VALUE ary;
         int n, i;
@@ -322,7 +353,7 @@ pgresult_fields( VALUE self)
         n = PQnfields( r->res);
         ary = rb_ary_new2( n);
         for (i = 0; n; i++, n--) {
-            str = pgconn_mkstring( r->conn, PQfname( r->res, i));
+            str = pgconn_mkstring( get_pgconn( r->conn), PQfname( r->res, i));
             rb_str_freeze( str);
             rb_ary_push( ary, str);
         }
@@ -347,7 +378,7 @@ pgresult_field_indices( VALUE self)
 {
     struct pgresult_data *r;
 
-    Data_Get_Struct( self, struct pgresult_data, r);
+    TypedData_Get_Struct( self, struct pgresult_data, &pgresult_data_data_type, r);
     if (NIL_P( r->indices)) {
         VALUE hsh;
         int n, i;
@@ -356,7 +387,7 @@ pgresult_field_indices( VALUE self)
         n = PQnfields( r->res);
         hsh = rb_hash_new();
         for (i = 0; n; i++, n--) {
-            str = pgconn_mkstring( r->conn, PQfname( r->res, i));
+            str = pgconn_mkstring( get_pgconn( r->conn), PQfname( r->res, i));
             rb_str_freeze( str);
             rb_hash_aset( hsh, str, INT2FIX( i));
         }
@@ -379,7 +410,7 @@ pgresult_num_fields( VALUE self)
 {
     struct pgresult_data *r;
 
-    Data_Get_Struct( self, struct pgresult_data, r);
+    TypedData_Get_Struct( self, struct pgresult_data, &pgresult_data_data_type, r);
     return INT2FIX( PQnfields( r->res));
 }
 
@@ -400,8 +431,8 @@ pgresult_fieldname( VALUE self, VALUE index)
 {
     struct pgresult_data *r;
 
-    Data_Get_Struct( self, struct pgresult_data, r);
-    return pgconn_mkstring( r->conn, PQfname( r->res, NUM2INT( index)));
+    TypedData_Get_Struct( self, struct pgresult_data, &pgresult_data_data_type, r);
+    return pgconn_mkstring( get_pgconn( r->conn), PQfname( r->res, NUM2INT( index)));
 }
 
 /*
@@ -423,8 +454,8 @@ pgresult_fieldnum( VALUE self, VALUE name)
     int n;
 
     StringValue( name);
-    Data_Get_Struct( self, struct pgresult_data, r);
-    n = PQfnumber( r->res, pgconn_destring( r->conn, name, NULL));
+    TypedData_Get_Struct( self, struct pgresult_data, &pgresult_data_data_type, r);
+    n = PQfnumber( r->res, pgconn_destring( get_pgconn( r->conn), name, NULL));
     if (n == -1)
         rb_raise( rb_eArgError, "Unknown field: %s", RSTRING_PTR( name));
     return INT2FIX( n);
@@ -448,7 +479,7 @@ pgresult_each( VALUE self)
     struct pgresult_data *r;
     int m, j;
 
-    Data_Get_Struct( self, struct pgresult_data, r);
+    TypedData_Get_Struct( self, struct pgresult_data, &pgresult_data_data_type, r);
     for (j = 0, m = PQntuples( r->res); m; j++, m--)
         rb_yield( pg_fetchrow( r, j));
     return m ? INT2FIX( m) : Qnil;
@@ -472,7 +503,7 @@ pgresult_aref( int argc, VALUE *argv, VALUE self)
     VALUE aj, ai;
     int j, i;
 
-    Data_Get_Struct( self, struct pgresult_data, r);
+    TypedData_Get_Struct( self, struct pgresult_data, &pgresult_data_data_type, r);
     a = rb_scan_args( argc, argv, "11", &aj, &ai);
     j = NUM2INT( aj);
     if (j < PQntuples( r->res)) {
@@ -524,7 +555,7 @@ pg_fetchresult( struct pgresult_data *r, int row, int col)
         return Qnil;
 
     if (!translate_results)
-        return pgconn_mkstring( r->conn, string);
+        return pgconn_mkstring( get_pgconn( r->conn), string);
 
     typ = PQftype( r->res, col);
     cls = Qnil;
@@ -575,7 +606,7 @@ pg_fetchresult( struct pgresult_data *r, int row, int col)
         break;
     }
     if (NIL_P( ret)) {
-        ret = pgconn_mkstring( r->conn, string);
+        ret = pgconn_mkstring( get_pgconn( r->conn), string);
         if (RTEST( cls))
             ret = rb_funcall( cls, id_parse, 1, ret);
     }
@@ -595,7 +626,7 @@ pgresult_num_tuples( VALUE self)
 {
     struct pgresult_data *r;
 
-    Data_Get_Struct( self, struct pgresult_data, r);
+    TypedData_Get_Struct( self, struct pgresult_data, &pgresult_data_data_type, r);
     return INT2FIX( PQntuples( r->res));
 }
 
@@ -617,7 +648,7 @@ pgresult_type( VALUE self, VALUE index)
     struct pgresult_data *r;
     int n;
 
-    Data_Get_Struct( self, struct pgresult_data, r);
+    TypedData_Get_Struct( self, struct pgresult_data, &pgresult_data_data_type, r);
     n = PQftype( r->res, NUM2INT( index));
     return n ? INT2FIX( n) : Qnil;
 }
@@ -639,7 +670,7 @@ pgresult_size( VALUE self, VALUE index)
     struct pgresult_data *r;
     int n;
 
-    Data_Get_Struct( self, struct pgresult_data, r);
+    TypedData_Get_Struct( self, struct pgresult_data, &pgresult_data_data_type, r);
     n = PQfsize( r->res, NUM2INT( index));
     return n ? INT2FIX( n) : Qnil;
 }
@@ -659,7 +690,7 @@ pgresult_getvalue( VALUE self, VALUE row, VALUE col)
 {
     struct pgresult_data *r;
 
-    Data_Get_Struct( self, struct pgresult_data, r);
+    TypedData_Get_Struct( self, struct pgresult_data, &pgresult_data_data_type, r);
     return pg_fetchresult( r, NUM2INT( row), NUM2INT( col));
 }
 
@@ -678,7 +709,7 @@ pgresult_getlength( VALUE self, VALUE row, VALUE col)
 {
     struct pgresult_data *r;
 
-    Data_Get_Struct( self, struct pgresult_data, r);
+    TypedData_Get_Struct( self, struct pgresult_data, &pgresult_data_data_type, r);
     return INT2FIX( PQgetlength( r->res, NUM2INT( row), NUM2INT( col)));
 }
 
@@ -696,7 +727,7 @@ pgresult_getisnull( VALUE self, VALUE row, VALUE col)
 {
     struct pgresult_data *r;
 
-    Data_Get_Struct( self, struct pgresult_data, r);
+    TypedData_Get_Struct( self, struct pgresult_data, &pgresult_data_data_type, r);
     return PQgetisnull( r->res, NUM2INT( row), NUM2INT( col)) ? Qtrue : Qfalse;
 }
 
@@ -739,7 +770,7 @@ pgresult_cmdtuples( VALUE self)
     struct pgresult_data *r;
     char *n;
 
-    Data_Get_Struct( self, struct pgresult_data, r);
+    TypedData_Get_Struct( self, struct pgresult_data, &pgresult_data_data_type, r);
     n = PQcmdTuples( r->res);
     return *n ? rb_cstr_to_inum( n, 10, 0) : Qnil;
 }
@@ -756,9 +787,9 @@ pgresult_cmdstatus( VALUE self)
     struct pgresult_data *r;
     char *n;
 
-    Data_Get_Struct( self, struct pgresult_data, r);
+    TypedData_Get_Struct( self, struct pgresult_data, &pgresult_data_data_type, r);
     n = PQcmdStatus( r->res);
-    return n ? pgconn_mkstring( r->conn, n) : Qnil;
+    return n ? pgconn_mkstring( get_pgconn( r->conn), n) : Qnil;
 }
 
 /*
@@ -773,7 +804,7 @@ pgresult_oid( VALUE self)
     struct pgresult_data *r;
     Oid n;
 
-    Data_Get_Struct( self, struct pgresult_data, r);
+    TypedData_Get_Struct( self, struct pgresult_data, &pgresult_data_data_type, r);
     n = PQoidValue( r->res);
     return n == InvalidOid ? Qnil : INT2FIX( n);
 }
@@ -836,7 +867,7 @@ Init_pgsql_result( void)
 
     rb_define_singleton_method( rb_cPgResult, "translate_results=", pgresult_s_translate_results_set, 1);
 
-    rb_undef_method( CLASS_OF( rb_cPgResult), "new");
+    rb_define_alloc_func( rb_cPgResult, pgresult_alloc);
     rb_define_method( rb_cPgResult, "clear", &pgresult_clear, 0);
     rb_define_alias( rb_cPgResult, "close", "clear");
 

data/lib/result.h

@@ -10,15 +10,18 @@
 
 
 struct pgresult_data {
-    PGresult           *res;
-    struct pgconn_data *conn;
-    VALUE               fields;
-    VALUE               indices;
+    PGresult *res;
+    VALUE     conn;
+    VALUE     fields;
+    VALUE     indices;
 };
 
 
 
-extern VALUE pgresult_new( PGresult *result, struct pgconn_data *conn, VALUE cmd, VALUE par);
+extern const rb_data_type_t pgresult_data_data_type;
+
+
+extern VALUE pgresult_new( PGresult *result, VALUE conn, VALUE cmd, VALUE par);
 extern VALUE pgresult_clear( VALUE self);
 extern VALUE pgresult_each( VALUE self);
 extern VALUE pg_fetchrow( struct pgresult_data *r, int num);

data/lib/undef.h

@@ -8,4 +8,4 @@
 #undef PACKAGE_TARNAME
 #undef PACKAGE_VERSION
 #undef _
-
+#undef restrict

metadata

@@ -1,43 +1,56 @@
 --- !ruby/object:Gem::Specification
 name: pgsql
 version: !ruby/object:Gem::Version
-  version: 1.9.2
+  version: '1.10'
 platform: ruby
 authors:
 - Bertram Scharpf
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-08 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autorake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
 description: |
-  This is not the official PostgreSQL library that was originally written by Guy
-  Decoux. As the project wasn't maintained a long time after Guy's decease, I
-  decided to fork my own project.
+  This is not the official PostgreSQL library that was originally written by
+  Guy Decoux. As the project wasn't maintained a long time after Guy's
+  decease, I decided to create my own project.
 email: "<software@bertram-scharpf.de>"
 executables: []
 extensions:
 - lib/mkrf_conf
 extra_rdoc_files:
-- README
 - LICENSE
+- README.md
 files:
 - LICENSE
-- README
+- README.md
 - lib/Rakefile
 - lib/conn.c
 - lib/conn.h
@@ -51,11 +64,10 @@ files:
 - lib/result.c
 - lib/result.h
 - lib/undef.h
-homepage: http://www.bertram-scharpf.de/software/pgsql
+homepage: https://github.com/BertramScharpf/ruby-pgsql.git
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message:
 rdoc_options:
 - "--main"
 - README
@@ -65,7 +77,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -73,8 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - PostgreSQL
-rubygems_version: 3.4.17
-signing_key:
+rubygems_version: 3.7.1
 specification_version: 4
 summary: PostgreSQL-API for Ruby
 test_files: []

data/README

@@ -1,48 +0,0 @@
-= pgsql Ruby Gem
-
-A PostgreSQL library that was carefully designed.
-
-
-== Author
-
-Bertram Scharpf <software@bertram-scharpf.de>
-
-
-== Features
-
-* Connection parameters from hash
-* Query parameters
-* Asynchronous queries
-* Quick query of single lines or values
-* Full PostgreSQL quoting support
-* Built-in transactions and savepoints by Ruby blocks
-
-
-== Example
-
-Write something like this:
-
-    require "pgsql"
-
-    Pg::Conn.open :dbname => "test1", :user => "jdoe" do |conn|
-      conn.exec "SELECT * FROM mytable;" do |result|
-        result.each { |row|
-            l = row.join ", "
-                ...
-        }
-      end
-      cmd = <<-ENDSQL
-        SELECT * FROM mytable WHERE num=$1::INTEGER;
-      ENDSQL
-      conn.query cmd, 42 do |row|
-        l = row.join ", "
-            ...
-      end
-      ...
-    end
-
-
-== Thanks
-
-In the remembrance of Guy Decoux.
-