pgsql 1.9.2 → 1.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09bfda9c735da18dfbd986a66e29ad0fb7d7a89257e47fe2696094e6deb6d012'
-  data.tar.gz: ffb57400fdf3a67e777a76f8070d85c785bd3a588679da9316e620c96460ff84
+  metadata.gz: cc0106f3924d41c61e9f64a26231d1cd464a1e989ee06b8282805387dc244fe0
+  data.tar.gz: 90c900d16b8b8d97c0357a04f1fc3ad6235932e626b591126c0d57b6f7b234b5
 SHA512:
-  metadata.gz: eda3796cb0d7604b3e2119d08f6cea4cee5d1a1455ceee2fa018fbbc5a9426f88d97ffd1714e9d01879fd6b5fadbafe2eb23b4b60b959f85d7a85c73aa9311e1
-  data.tar.gz: b9cd0c5e075530a708bca6956977dfd7482b3e478186fb1bc169633ce1d4fcbf8f02f88668a3dcca3552103c545f0c1a19d6d89190cfd5441ed7a7d4cbce51aa
+  metadata.gz: e20984f294736af96653d37a3fd855373b94b4911035e901d9ba97536fb600ae0fe99ede1c967e77c84ffb301b3a62f1a00643145cc4464567f0464f23fdee14
+  data.tar.gz: 6edd020112c1313e0a25f4a8c6186895193a609d91a0aee893a6828192a7c198c8368475fc2f001e8c04c79b545735272724728fb689b778cef9e62f8ff7f51c

data/lib/conn.c

@@ -16,8 +16,9 @@
 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);
+static void   pgconn_mark( void *ptr);
+static void   pgconn_free( void *ptr);
+static size_t pgconn_memsize( const void *ptr);
 extern struct pgconn_data *get_pgconn( VALUE obj);
 static VALUE pgconn_encode_in4out( struct pgconn_data *ptr, VALUE str);
 extern const char *pgconn_destring( struct pgconn_data *ptr, VALUE str, int *len);
@@ -76,6 +77,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 +106,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 +136,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 +205,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 +301,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 +419,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 +484,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 +501,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 +518,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 +535,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 +799,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

@@ -93,7 +93,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 +268,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 +430,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 +451,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 +476,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)
@@ -735,7 +735,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 +836,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/module.c

@@ -8,7 +8,7 @@
 #include "result.h"
 
 
-#define PGSQL_VERSION "1.9.2"
+#define PGSQL_VERSION "1.9.3"
 
 
 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,8 +21,11 @@ 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);
+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);
+extern VALUE pgresult_new( PGresult *result, VALUE conn, VALUE cmd, VALUE par);
 
 extern VALUE pgresult_clear( VALUE self);
 
@@ -64,6 +66,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 +81,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 +97,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 +130,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 +146,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 +163,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 +180,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 +198,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 +221,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 +304,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 +329,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 +350,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 +359,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 +384,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 +393,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 +416,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 +437,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 +460,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 +485,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 +509,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 +561,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 +612,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 +632,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 +654,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 +676,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 +696,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 +715,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 +733,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 +776,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 +793,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 +810,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 +873,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,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: pgsql
 version: !ruby/object:Gem::Version
-  version: 1.9.2
+  version: 1.9.3
 platform: ruby
 authors:
 - Bertram Scharpf
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-08 00:00:00.000000000 Z
+date: 2023-08-29 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
@@ -73,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - PostgreSQL
-rubygems_version: 3.4.17
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: PostgreSQL-API for Ruby