pgsql 1.3 → 1.7

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MTM2YjZhYjdkMzM5ZDdjYTAyZmJjOTMzYTM3NTFiY2M0Y2Y0ZWI1ZA==
-  data.tar.gz: !binary |-
-    YWVlZTViMjA4YmYwYzg2MjVlYWYwNjdjNTA1N2ExMmRlMDU5MTY3MA==
+SHA256:
+  metadata.gz: dc7ec22892e0bd75f3a0c63832471264c74e5bf758844f3fc87b9b5e2fb73b59
+  data.tar.gz: c1d31689274d2ccd7a97b4381b635f390886e419cbef1c44b7017839b8b520a9
 SHA512:
-  metadata.gz: !binary |-
-    OWY0NWYwYzA0ZjZkZWFjYjkwMGNhOGFiZmQ3M2U5ZWRmZjY3ODc4NjRkNzhl
-    MDg2YzdlMmVkZDAzZjZiY2RmOWFkNTgyZTFjNzQxMTM1ZjRhN2ExNmU4OWEx
-    MmQzZTAwOGI4NGNkZmNhNDQyMGNhM2Y3Yjg0ODNlNDQxODFmNTg=
-  data.tar.gz: !binary |-
-    YTc3ZWJkMDg0MWUwYjdhZDdkMGViMDM5MzE5YmU2MGVmZTBkYTNlMGIwNWZh
-    YzQwN2Y4ZjQ0ZjE2Yjk4OWI1OTFmMzY4NGVjNmY5NDk2MjIzYTIyMzc5MWI0
-    ODFiNTRjMjBkN2YxNDljN2FlYWJmOWUzMDQwMDE1ODAyYWQyZGY=
+  metadata.gz: 2c94ab8fc0eb95ed34e1ffb84d0f90dd34d7ac4858b693217d94e36e913d5b02f9a7653459864f002d9d84cf02219b07191ee64757a5a42899cae6b8f31aa512
+  data.tar.gz: 4a893e13d60d470e8bde739c7f33f3d6260cd20670c746d115ebd93aa74531af69059c32a9dd59419fc68dd6ddd7d7630b12b892c615c1beeb4600aa336d9c31

data/LICENSE

@@ -1,12 +1,6 @@
-                         _ 
-   _ __   __ _ ___  __ _| |
-  | '_ \ / _` / __|/ _` | |
-  | |_) | (_| \__ \ (_| | |
-  | .__/ \__, |___/\__, |_|
-  |_|    |___/        |_|  
+= pgsql Ruby Gem
 
-
-Copyright (c) 2011-2013, Bertram Scharpf <software@bertram-scharpf.de>.
+Copyright (C) 2011-2020, Bertram Scharpf <software@bertram-scharpf.de>.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/README

@@ -1,14 +1,13 @@
-                         _ 
-   _ __   __ _ ___  __ _| |
-  | '_ \ / _` / __|/ _` | |
-  | |_) | (_| \__ \ (_| | |
-  | .__/ \__, |___/\__, |_|
-  |_|    |___/        |_|  
-
-== Description
+= pgsql Ruby Gem
 
 A PostgreSQL library that was carefully designed.
 
+
+== Author
+
+Bertram Scharpf <software@bertram-scharpf.de>
+
+
 == Features
 
 * Connection parameters from hash
@@ -18,28 +17,30 @@ A PostgreSQL library that was carefully designed.
 * 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 ", "
-              ...
-      }
+    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
-    cmd = <<-ENDSQL
-      select * from mytable where num=$1::integer;
-    ENDSQL
-    conn.query cmd, 42 do |row|
-      l = row.join ", "
-          ...
-    end
-    ...
-  end
+
 
 == Thanks
 

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|
@@ -17,7 +17,7 @@ DLs = {
 }
 
 DLs.each { |k,v|
-  task k => v do |t|
+  file k => v do |t|
     l.cc t.name, t.prerequisites
   end
 }

data/lib/conn.c

@@ -5,6 +5,8 @@
 
 #include "conn.h"
 
+#include "conn_quote.h"
+#include "conn_exec.h"
 
 #if defined( HAVE_HEADER_ST_H)
     #include <st.h>
@@ -24,12 +26,12 @@ 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_s_parse( VALUE cls, VALUE str);
 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_sym_dbname( void);
+static VALUE connstr_sym_password( void);
+static void  connstr_passwd( VALUE self, VALUE orig_params, 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);
@@ -69,6 +71,9 @@ VALUE rb_cPgConn;
 static VALUE rb_ePgConnFailed;
 static VALUE rb_ePgConnInvalid;
 
+static VALUE sym_dbname   = Qundef;
+static VALUE sym_password = Qundef;
+
 
 
 void
@@ -198,7 +203,7 @@ pgconn_alloc( VALUE cls)
 }
 
 /*
- * Document-method: connect
+ * Document-method: Pg::Conn.connect
  *
  * call-seq:
  *     Pg::Conn.connect( hash)        ->  conn
@@ -219,27 +224,9 @@ pgconn_s_connect( int argc, VALUE *argv, VALUE cls)
         rb_ensure( rb_yield, pgconn, pgconn_close, pgconn) : pgconn;
 }
 
-/*
- * call-seq:
- *   Pg::Conn.parse( str)    -> hash
- *
- * Parse a connection string and return a hash with keys <code>:dbname</code>,
- * <code>:user</code>, <code>:host</code>, etc.
- *
- */
-VALUE
-pgconn_s_parse( VALUE cls, VALUE str)
-{
-    VALUE params;
-
-    params = rb_hash_new();
-    connstr_to_hash( params, str);
-    return params;
-}
-
 
 /*
- * Document-method: new
+ * Document-method: Pg::Conn.new
  *
  * call-seq:
  *     Pg::Conn.new( hash)        ->   conn
@@ -250,23 +237,39 @@ pgconn_s_parse( VALUE cls, VALUE str)
  *
  *   c = Pg::Conn.new :dbname => "movies", :host => "jupiter", ...
  *
- * The most common parameters may be given in a URL-like
- * connection string:
+ * If the +str+ argument is given but no further parameters,
+ * the PQconnectdb() (not PQconnectdbParams()) function will be called.
+ * If further arguments are present, the +str+ argument will be made into
+ * the "dbname" parameter, but without overwriting an existing one.
  *
- *   "user:password@host:port/dbname"
+ * The "dbname" parameter may be a +conninfo+ string as described in the
+ * PostgreSQL documentation:
  *
- * Any of these parts may be omitted.  If there is no slash, the part after the
- * @ sign will be read as database name.
+ *   c = Pg::Conn.new "postgresql://user:password@host:port/dbname"
+ *   c = Pg::Conn.new "postgres://user:password@host:port/dbname"
+ *   c = Pg::Conn.new "dbname=... host=... user=..."
+ *
+ * The password may be specified as an extra parameter:
+ *
+ *   c = Pg::Conn.new "postgresql://user@host/dbname", password: "verysecret"
  *
  * If the password is the empty string, and there is either an instance method
  * or a class method <code>password?</code>, that method will be asked. This
  * method may ask <code>yield :user</code> or <code>yield :dbname</code> and so
  * on to get the connection parameters.
  *
+ *   class Pg::Conn
+ *     def password?
+ *       "tercesyrev".reverse
+ *     end
+ *   end
+ *   c = Pg::Conn.new "postgresql://user@host/dbname", password: ""
+ *
  * See the PostgreSQL documentation for a full list:
  * [http://www.postgresql.org/docs/current/interactive/libpq-connect.html#LIBPQ-PQCONNECTDBPARAMS]
  *
  * On failure, a +Pg::Error+ exception will be raised.
+ *
  */
 VALUE
 pgconn_init( int argc, VALUE *argv, VALUE self)
@@ -278,32 +281,44 @@ pgconn_init( int argc, VALUE *argv, VALUE self)
     struct pgconn_data *c;
 
     if (rb_scan_args( argc, argv, "02", &str, &params) < 2)
-        if (TYPE( str) != T_STRING) {
+        if (TYPE( str) == T_HASH) {
             params = str;
             str = Qnil;
         }
-    if      (NIL_P( params))
-        params = rb_hash_new();
-    else if (TYPE( params) != T_HASH)
-        params = rb_convert_type( params, T_HASH, "Hash", "to_hash");
-    else
-        params = rb_obj_dup( params);
-    if (!NIL_P( str))
-        connstr_to_hash( params, str);
-    connstr_passwd( self, params);
 
     Data_Get_Struct( self, struct pgconn_data, c);
 
-    l = RHASH_SIZE( params) + 1;
-    keywords = (const char **) ALLOCA_N( char *, l);
-    values   = (const char **) ALLOCA_N( char *, l);
-    ptrs[ 0] = keywords;
-    ptrs[ 1] = values;
-    ptrs[ 2] = (const char **) c;
-    st_foreach( RHASH_TBL( params), &set_connect_params, (st_data_t) ptrs);
-    *(ptrs[ 0]) = *(ptrs[ 1]) = NULL;
-
-    c->conn = PQconnectdbParams( keywords, values, 1);
+    if (NIL_P( params)) {
+        StringValue( str);
+        c->conn = PQconnectdb( RSTRING_PTR( str));
+    } else {
+        int expand_dbname;
+        VALUE orig_params = params;
+
+        if (TYPE( params) != T_HASH)
+            params = rb_convert_type( params, T_HASH, "Hash", "to_hash");
+
+        if (!NIL_P( str) && NIL_P( rb_hash_aref( params, connstr_sym_dbname()))) {
+            if (params == orig_params)
+                params = rb_obj_dup( params);
+            rb_hash_aset( params, sym_dbname, str);
+            expand_dbname = 1;
+        } else
+            expand_dbname = 0;
+
+        connstr_passwd( self, orig_params, &params);
+
+        l = RHASH_SIZE( params) + 1;
+        keywords = (const char **) ALLOCA_N( char *, l);
+        values   = (const char **) ALLOCA_N( char *, l);
+        ptrs[ 0] = keywords;
+        ptrs[ 1] = values;
+        ptrs[ 2] = (const char **) c;
+        st_foreach( RHASH_TBL( params), &set_connect_params, (st_data_t) ptrs);
+        *(ptrs[ 0]) = *(ptrs[ 1]) = NULL;
+
+        c->conn = PQconnectdbParams( keywords, values, expand_dbname);
+    }
     if (PQstatus( c->conn) == CONNECTION_BAD)
         rb_exc_raise( pgconnfailederror_new( c, params));
 
@@ -329,50 +344,29 @@ set_connect_params( st_data_t key, st_data_t val, st_data_t args)
     return ST_CONTINUE;
 }
 
-static const char re_connstr[] =
-    "\\A"
-    "(?:(.*?)(?::(.*))?@)?"             /* user:passwd@     */
-    "(?:(.*?)(?::(\\d+))?/)?(?:(.+))?"  /* host:port/dbname */
-    "\\z"
-;
-
-#define KEY_USER     "user"
-#define KEY_PASSWORD "password"
-#define KEY_HOST     "host"
-#define KEY_PORT     "port"
-#define KEY_DBNAME   "dbname"
+VALUE
+connstr_sym_dbname( void)
+{
+    if (sym_dbname == Qundef)
+        sym_dbname = ID2SYM( rb_intern( "dbname"));
+    return sym_dbname;
+}
 
-void
-connstr_to_hash( VALUE params, VALUE str)
-{
-    VALUE re, match, k, m;
-
-    re = rb_reg_new( re_connstr, sizeof re_connstr - 1, 0);
-    if (RTEST( rb_reg_match( re, str))) {
-        match = rb_backref_get();
-#define ADD_TO_RES( key, n) \
-            k = ID2SYM( rb_intern( key)); m = rb_reg_nth_match( n, match); \
-            if (NIL_P( rb_hash_aref( params, k)) && !NIL_P(m)) \
-                rb_hash_aset( params, k, m)
-        ADD_TO_RES( KEY_USER,     1);
-        ADD_TO_RES( KEY_PASSWORD, 2);
-        ADD_TO_RES( KEY_HOST,     3);
-        ADD_TO_RES( KEY_PORT,     4);
-        ADD_TO_RES( KEY_DBNAME,   5);
-#undef ADD_TO_RES
-    } else
-        rb_raise( rb_eArgError, "Invalid connection: %s", RSTRING_PTR( str));
+VALUE
+connstr_sym_password( void)
+{
+    if (sym_password == Qundef)
+        sym_password = ID2SYM( rb_intern( "password"));
+    return sym_password;
 }
 
+
 void
-connstr_passwd( VALUE self, VALUE params)
+connstr_passwd( VALUE self, VALUE orig_params, VALUE *params)
 {
-    static VALUE sym_password = Qundef;
     VALUE pw;
 
-    if (sym_password == Qundef)
-        sym_password = ID2SYM( rb_intern( KEY_PASSWORD));
-    pw = rb_hash_aref( params, sym_password);
+    pw = rb_hash_aref( *params, connstr_sym_password());
     if (TYPE( pw) == T_STRING && RSTRING_LEN( pw) == 0) {
         static ID id_password_q = 0;
         VALUE pwobj;
@@ -384,14 +378,18 @@ connstr_passwd( VALUE self, VALUE params)
             pwobj = self;
         if (rb_respond_to( CLASS_OF( self), id_password_q))
             pwobj = CLASS_OF( self);
-        if (pwobj != Qundef)
-            rb_hash_aset( params, sym_password,
+        if (pwobj != Qundef) {
+            if (*params == orig_params)
+                *params = rb_obj_dup( *params);
+            rb_hash_aset( *params, sym_password,
                 rb_block_call( pwobj, id_password_q, 0, NULL,
-                                                &connstr_getparam, params));
+                                                &connstr_getparam, *params));
+        }
     }
 }
 
-VALUE connstr_getparam( VALUE yielded, VALUE params)
+VALUE
+connstr_getparam( RB_BLOCK_CALL_FUNC_ARGLIST( yielded, params))
 {
     return rb_hash_aref( params, yielded);
 }
@@ -454,7 +452,7 @@ pgconn_set_client_encoding( VALUE self, VALUE str)
 {
     StringValue( str);
     if ((PQsetClientEncoding( get_pgconn( self)->conn, RSTRING_PTR( str))) == -1)
-        rb_raise( rb_ePgError, "Invalid encoding name %s", str);
+        rb_raise( rb_ePgError, "Invalid encoding name %s", RSTRING_PTR( str));
     return Qnil;
 }
 
@@ -491,6 +489,8 @@ pgconn_set_externalenc( VALUE self, VALUE enc)
     e = NIL_P( enc) ? rb_to_encoding( enc) : rb_default_external_encoding();
     Data_Get_Struct( self, struct pgconn_data, c);
     c->external = rb_enc_from_encoding( e);
+
+    return Qnil;
 }
 
 /*
@@ -523,6 +523,8 @@ pgconn_set_internalenc( VALUE self, VALUE enc)
     e = NIL_P( enc) ? rb_to_encoding( enc) : rb_default_internal_encoding();
     Data_Get_Struct( self, struct pgconn_data, c);
     c->internal = rb_enc_from_encoding( e);
+
+    return Qnil;
 }
 
 #endif
@@ -769,14 +771,14 @@ pgconn_untrace( VALUE self)
  * == Example
  *
  *   conn.exec <<-EOT
- *     create or replace function noise() returns void as $$
- *     begin
- *       raise notice 'Hi!';
- *     end;
- *     $$ language plpgsql;
+ *     CREATE OR REPLACE FUNCTION noise() RETURNS VOID AS $$
+ *     BEGIN
+ *       RAISE NOTICE 'Hi!';
+ *     END;
+ *     $$ LANGUAGE plpgsql;
  *   EOT
  *   conn.on_notice { |e| puts e.inspect }
- *   conn.exec "select noise();"
+ *   conn.exec "SELECT noise();"
  */
 VALUE
 pgconn_on_notice( VALUE self)
@@ -808,23 +810,20 @@ notice_receiver( void *self, const PGresult *result)
 
 
 
-/********************************************************************
- *
+/*
  * Document-class: Pg::Conn::Failed
  *
  * Error while establishing a connection to the PostgreSQL server.
  */
 
-/********************************************************************
- *
+/*
  * Document-class: Pg::Conn::Invalid
  *
  * Invalid (closed) connection.
  */
 
 
-/********************************************************************
- *
+/*
  * Document-class: Pg::Conn
  *
  * The class to access a PostgreSQL database.
@@ -833,7 +832,7 @@ notice_receiver( void *self, const PGresult *result)
  *
  *    require "pgsql"
  *    conn = Pg::Conn.open :dbname => "test1"
- *    res = conn.exec "select * from mytable;"
+ *    res = conn.exec "SELECT * FROM mytable;"
  *
  * See the Pg::Result class for information on working with the results of a
  * query.
@@ -842,9 +841,14 @@ notice_receiver( void *self, const PGresult *result)
 void
 Init_pgsql_conn( void)
 {
-#ifdef RDOC_NEEDS_THIS
-    rb_mPg = rb_define_module( "Pg");
-#endif
+    {
+        ID id_require;
+
+        id_require = rb_intern( "require");
+        rb_funcall( Qnil, id_require, 1, rb_str_new2( "date"));
+        rb_funcall( Qnil, id_require, 1, rb_str_new2( "time"));
+        rb_funcall( Qnil, id_require, 1, rb_str_new2( "bigdecimal"));
+    }
 
     rb_cPgConn = rb_define_class_under( rb_mPg, "Conn", rb_cObject);
 
@@ -857,7 +861,6 @@ Init_pgsql_conn( void)
     rb_define_alloc_func( rb_cPgConn, pgconn_alloc);
     rb_define_singleton_method( rb_cPgConn, "connect", pgconn_s_connect, -1);
     rb_define_alias( rb_singleton_class( rb_cPgConn), "open", "connect");
-    rb_define_singleton_method( rb_cPgConn, "parse", pgconn_s_parse, 1);
     rb_define_method( rb_cPgConn, "initialize", &pgconn_init, -1);
     rb_define_method( rb_cPgConn, "close", &pgconn_close, 0);
     rb_define_alias( rb_cPgConn, "finish", "close");

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);
@@ -69,7 +62,7 @@ static ID id_to_a;
 void
 pg_raise_connexec( struct pgconn_data *c)
 {
-    rb_raise( rb_ePgConnExec, PQerrorMessage( c->conn));
+    rb_raise( rb_ePgConnExec, "%s", PQerrorMessage( c->conn));
 }
 
 
@@ -144,7 +137,7 @@ params_to_strings( VALUE conn, VALUE params, int *len)
 
             q = pgconn_destring( c, pgconn_stringize( conn, *ptr), &n);
             a = ALLOC_N( char, n + 1);
-            for (p = a; *p = n ? *q : '\0'; ++p, ++q, --n)
+            for (p = a; (*p = n ? *q : '\0'); ++p, ++q, --n)
                 ;
             *v = a;
         }
@@ -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)
@@ -207,7 +198,7 @@ pgconn_exec( int argc, VALUE *argv, VALUE self)
  * Use Pg::Conn#fetch to fetch the results after you waited for data.
  *
  *   Pg::Conn.connect do |conn|
- *     conn.send "select pg_sleep(3), * from t;" do
+ *     conn.send "SELECT pg_sleep(3), * FROM t;" do
  *       ins = [ conn.socket]
  *       loop do
  *         r = IO.select ins, nil, nil, 0.5
@@ -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);
+    pgresult_clear( pg_statement_exec( self, rb_str_new2( "ROLLBACK;"), Qnil));
+    rb_exc_raise( err);
     return Qnil;
 }
 
@@ -486,7 +473,7 @@ commit_transaction( VALUE self)
 
     Data_Get_Struct( self, struct pgconn_data, c);
     if (PQtransactionStatus( c->conn) > PQTRANS_IDLE)
-        pgresult_clear( pg_statement_exec( self, rb_str_new2( "commit;"), Qnil));
+        pgresult_clear( pg_statement_exec( self, rb_str_new2( "COMMIT;"), Qnil));
     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;
 }
 
@@ -595,7 +582,7 @@ pgconn_transaction_status( VALUE self)
  * Write lines into a +COPY+ command.  See +stringize_line+ for how to build
  * standard lines.
  *
- *   conn.copy_stdin "copy t from stdin;" do
+ *   conn.copy_stdin "COPY t FROM STDIN;" do
  *      ary = ...
  *      l = stringize_line ary
  *      conn.put l
@@ -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.
@@ -700,7 +687,7 @@ pgconn_putline( VALUE self, VALUE arg)
  * Read lines from a +COPY+ command.  The form of the lines depends
  * on the statement's parameters.
  *
- *   conn.copy_stdout "copy t to stdout;" do
+ *   conn.copy_stdout "COPY t TO STDOUT;" do
  *     l = conn.getline
  *     ary = l.split /\t/
  *     ary.map! { |x|
@@ -821,7 +808,7 @@ pgconn_backup( VALUE self, VALUE label)
 {
     VALUE cmd, arg;
 
-    cmd = rb_str_new2( "select pg_start_backup($1);");
+    cmd = rb_str_new2( "SELECT pg_start_backup($1);");
     arg = rb_ary_new3( 1, label);
     pgresult_clear( pg_statement_exec( self, cmd, arg));
     return rb_ensure( rb_yield, Qnil, backup_end, self);
@@ -833,31 +820,28 @@ backup_end( VALUE self)
 {
     VALUE cmd;
 
-    cmd = rb_str_new2( "select pg_stop_backup();");
+    cmd = rb_str_new2( "SELECT pg_stop_backup();");
     pgresult_clear( pg_statement_exec( self, cmd, Qnil));
     return Qnil;
 }
 
 
 
-/********************************************************************
- *
+/*
  * Document-class: Pg::Conn::ExecError
  *
  * Error while querying from a PostgreSQL connection.
  */
 
 
-/********************************************************************
- *
+/*
  * Document-class: Pg::Conn::TransactionError
  *
  * Nested transaction blocks.  Use savepoints.
  */
 
 
-/********************************************************************
- *
+/*
  * Document-class: Pg::Conn::CopyError
  *
  * Nested transaction blocks.  Use savepoints.
@@ -911,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

@@ -6,7 +6,7 @@
 #include "conn_quote.h"
 
 
-extern VALUE pg_currency_class( void);
+extern VALUE pg_monetary_class( void);
 
 static VALUE pgconn_format( VALUE self, VALUE obj);
 
@@ -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);
@@ -34,33 +35,60 @@ static void  quote_all( VALUE self, VALUE ary, VALUE res);
 static VALUE pgconn_quote_identifier( VALUE self, VALUE value);
 
 
-
 VALUE rb_cDate;
 VALUE rb_cDateTime;
-VALUE rb_cCurrency;
+
+static VALUE rb_cMoney;
 
 static ID id_format;
 static ID id_iso8601;
 static ID id_raw;
 static ID id_to_postgres;
 static ID id_gsub;
-static ID id_currency;
+
+static int lookup_monetary;
 
 static VALUE pg_string_null;
 static VALUE pg_string_bsl_N;
 static VALUE pg_escape_regex;
 
 
+static const char *monetary[] = { "Money", "Monetary", "Amount", "Currency"};
 
+/*
+ * Document-class: Pg::Money
+ *
+ * The class the PostgreSQL-builtin type +MONEY+ wil be mapped to.
+ * If not set, some global classes will be searched
+ * (+Money+, +Monetary+, +Amount+, +Currency+) and the constant will be
+ * set to that.
+ *
+ * Set this constant to your own class before you do the first query,
+ * or set it to +nil+ to inhibit the auto-detect.
+ *
+ * The resulting class must have a method +parse+ to build a new object
+ * from a string. It may respond to +raw+ which overwrites +to_s+.
+ *
+ */
 VALUE
-pg_currency_class( void)
+pg_monetary_class( void)
 {
-    if (NIL_P( rb_cCurrency) && id_currency) {
-        if (rb_const_defined( rb_cObject, id_currency))
-            rb_cCurrency = rb_const_get( rb_cObject, id_currency);
-        id_currency = 0;
+    if (lookup_monetary) {
+        ID id_MONEY = rb_intern( "Money");
+        if (rb_const_defined( rb_mPg, id_MONEY))
+            rb_cMoney = rb_const_get( rb_mPg, id_MONEY);
+        else {
+            int i;
+            for (i = 0; i < (sizeof monetary) / sizeof (char *) && NIL_P( rb_cMoney); i++) {
+                ID id = rb_intern( monetary[ i]);
+                if (rb_const_defined( rb_cObject, id))
+                    rb_cMoney = rb_const_get( rb_cObject, id);
+            }
+            rb_const_set( rb_mPg, id_MONEY, rb_cMoney);
+        }
+        lookup_monetary = 0;
     }
-    return rb_cCurrency;
+    return rb_cMoney;
 }
 
 
@@ -80,8 +108,8 @@ pg_currency_class( void)
  *   class MyConn < Pg::Conn
  *     def format obj
  *       case obj
- *         when Currency then obj.to_s_by_locale
- *         else               obj
+ *         when Money then obj.to_s_by_locale
+ *         else            obj
  *       end
  *     end
  *   end
@@ -121,7 +149,7 @@ VALUE
 pgconn_escape_bytea( VALUE self, VALUE str)
 {
     unsigned char *s;
-    int l;
+    size_t l;
     VALUE ret;
 
     if (NIL_P( str))
@@ -172,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);
@@ -264,7 +292,7 @@ pgconn_stringize( VALUE self, VALUE obj)
                     result = rb_obj_as_string( obj);
                 else if   (co == rb_cDateTime)
                     result = rb_obj_as_string( obj);
-                else if   (co == pg_currency_class() &&
+                else if   (co == pg_monetary_class() &&
                                     rb_respond_to( obj, id_raw))
                     result = rb_funcall( obj, id_raw, 0);
                 else if   (rb_respond_to( obj, id_to_postgres)) {
@@ -292,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))
@@ -384,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;
@@ -411,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;
 
@@ -453,7 +481,9 @@ gsub_escape_i( VALUE c, VALUE arg)
  * Call Pg::Conn#escape_bytea first if you want to tell your string is a byte
  * array and the quote that result.
  */
-VALUE pgconn_quote( VALUE self, VALUE obj) { VALUE o, res;
+VALUE pgconn_quote( VALUE self, VALUE obj)
+{
+    VALUE o, res;
 
     o = rb_funcall( self, id_format, 1, obj);
     if (!NIL_P( o))
@@ -494,7 +524,7 @@ VALUE pgconn_quote( VALUE self, VALUE obj) { VALUE o, res;
                 } else if (co == rb_cDateTime) {
                     res = rb_obj_as_string( obj);
                     type = "timestamptz";
-                } else if (co == pg_currency_class() &&
+                } else if (co == pg_monetary_class() &&
                                     rb_respond_to( obj, id_raw)) {
                     res = rb_funcall( obj, id_raw, 0);
                     StringValue( res);
@@ -555,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;
@@ -622,11 +652,9 @@ pgconn_quote_identifier( VALUE self, VALUE str)
 void
 Init_pgsql_conn_quote( void)
 {
-    rb_require( "date");
-    rb_require( "time");
     rb_cDate       = rb_const_get( rb_cObject, rb_intern( "Date"));
     rb_cDateTime   = rb_const_get( rb_cObject, rb_intern( "DateTime"));
-    rb_cCurrency   = Qnil;
+    rb_cMoney      = Qnil;
 
 #ifdef RDOC_NEEDS_THIS
     rb_cPgConn = rb_define_class_under( rb_mPg, "Conn", rb_cObject);
@@ -660,7 +688,7 @@ Init_pgsql_conn_quote( void)
     id_to_postgres = rb_intern( "to_postgres");
     id_gsub        = rb_intern( "gsub");
 
-    id_currency    = rb_intern( "Currency");
+    lookup_monetary = 1;
 
     pg_string_null  = rb_str_new2( "NULL");  rb_global_variable( &pg_string_null);   rb_str_freeze( pg_string_null);
     pg_string_bsl_N = rb_str_new2( "\\N");   rb_global_variable( &pg_string_bsl_N);  rb_str_freeze( pg_string_bsl_N);

data/lib/conn_quote.h

@@ -10,10 +10,9 @@
 
 extern VALUE rb_cDate;
 extern VALUE rb_cDateTime;
-extern VALUE rb_cCurrency;
 
 
-extern VALUE pg_currency_class( void);
+extern VALUE pg_monetary_class( void);
 
 
 extern VALUE pgconn_stringize( VALUE self, VALUE obj);

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

@@ -5,17 +5,17 @@
 #include "module.h"
 
 #include "conn.h"
+#include "result.h"
 
 
-#define PGSQL_VERSION "1.3"
+#define PGSQL_VERSION "1.7"
 
 
 VALUE rb_mPg;
 VALUE rb_ePgError;
 
 
-/********************************************************************
- *
+/*
  * Document-module: Pg
  *
  * The module to enclose everything.
@@ -24,8 +24,7 @@ VALUE rb_ePgError;
  * connection.
  */
 
-/********************************************************************
- *
+/*
  * Document-class: Pg::Error
  *
  * Generic PostgreSQL error.

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);
 
@@ -57,8 +53,6 @@ static VALUE pgresult_cmdstatus( VALUE self);
 static VALUE pgresult_oid( VALUE self);
 
 
-static VALUE rb_cBigDecimal;
-
 static VALUE rb_cPgResult;
 static VALUE rb_ePgResError;
 
@@ -216,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)
 {
@@ -280,8 +267,8 @@ pgresult_clear( VALUE self)
 
     Data_Get_Struct( self, struct pgresult_data, r);
     if (r->res != NULL) {
-      PQclear( r->res);
-      r->res = NULL;
+        PQclear( r->res);
+        r->res = NULL;
     }
     return Qnil;
 }
@@ -513,7 +500,7 @@ pg_fetchrow( struct pgresult_data *r, int num)
     n = PQnfields( r->res);
     if (num < PQntuples( r->res)) {
         row = rb_ary_new2( n);
-        for (i = 0, n; n; ++i, --n)
+        for (i = 0; n; ++i, --n)
             rb_ary_store( row, i, pg_fetchresult( r, num, i));
     } else
         row = Qnil;
@@ -525,7 +512,7 @@ pg_fetchresult( struct pgresult_data *r, int row, int col)
 {
     char *string;
     Oid typ;
-    VALUE ret;
+    VALUE cls, ret;
 
     if (PQgetisnull( r->res, row, col))
         return Qnil;
@@ -538,50 +525,59 @@ pg_fetchresult( struct pgresult_data *r, int row, int col)
         return pgconn_mkstring( r->conn, string);
 
     typ = PQftype( r->res, col);
+    cls = Qnil;
+    ret = Qnil;
     switch (typ) {
     case NUMERICOID:
         {
             int typmod;
 
             typmod = PQfmod( r->res, col);
-            if (typmod == -1 || (typmod - VARHDRSZ) & 0xffff)
+            if (typmod == -1 || (typmod - VARHDRSZ) & 0xffff) {
+                ret = rb_funcall( Qnil, rb_intern( "BigDecimal"), 1, rb_str_new2( string));
                 break;
+            }
         }
-        /* if scale == 0 fall through and return inum */
+        /* fall through if scale == 0 */
     case INT8OID:
     case INT4OID:
     case INT2OID:
     case OIDOID:
-        return rb_cstr_to_inum( string, 10, 0);
+        ret = rb_cstr_to_inum( string, 10, 0);
+        break;
     case FLOAT8OID:
     case FLOAT4OID:
-        return rb_float_new( rb_cstr_to_dbl( string, Qfalse));
+        ret = rb_float_new( rb_cstr_to_dbl( string, Qfalse));
+        break;
     case BOOLOID:
-        return *string == 't' ? Qtrue : Qfalse;
-        /* strchr( "tTyY", *string) != NULL */
+        ret = strchr( "tTyY", *string) != NULL ? Qtrue : Qfalse;
+        break;
     case BYTEAOID:
-        return rb_str_new2( string);
-    default:
+        ret = rb_str_new2( string);
         break;
-    }
-    ret = pgconn_mkstring( r->conn, string);
-    switch (typ) {
-    case NUMERICOID:
-        return rb_funcall( rb_cBigDecimal, id_new, 1, ret);
     case DATEOID:
-        return rb_funcall( rb_cDate, id_parse, 1, ret);
+        cls = rb_cDate;
+        break;
     case TIMEOID:
     case TIMETZOID:
-        return rb_funcall( rb_cTime, id_parse, 1, ret);
+        cls = rb_cTime;
+        break;
     case TIMESTAMPOID:
     case TIMESTAMPTZOID:
-        return rb_funcall( rb_cDateTime, id_parse, 1, ret);
+        cls = rb_cDateTime;
+        break;
     case CASHOID:
-        return RTEST( pg_currency_class()) ?
-                rb_funcall( rb_cCurrency, id_parse, 1, ret) : ret;
+        cls = pg_monetary_class();
+        break;
     default:
-        return ret;
+        break;
     }
+    if (NIL_P( ret)) {
+        ret = pgconn_mkstring( r->conn, string);
+        if (RTEST( cls))
+            ret = rb_funcall( cls, id_parse, 1, ret);
+    }
+    return ret;
 }
 
 /*
@@ -803,9 +799,6 @@ pgresult_oid( VALUE self)
 void
 Init_pgsql_result( void)
 {
-    rb_require( "bigdecimal");
-    rb_cBigDecimal = rb_const_get( rb_cObject, rb_intern( "BigDecimal"));
-
     rb_cPgResult = rb_define_class_under( rb_mPg, "Result", rb_cObject);
 
 

metadata

@@ -1,38 +1,34 @@
 --- !ruby/object:Gem::Specification
 name: pgsql
 version: !ruby/object:Gem::Version
-  version: '1.3'
+  version: '1.7'
 platform: ruby
 authors:
 - Bertram Scharpf
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-11-29 00:00:00.000000000 Z
+date: 2021-03-09 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'
-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
-
+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.
-
-'
-email: <software@bertram-scharpf.de>
+email: "<software@bertram-scharpf.de>"
 executables: []
 extensions:
 - lib/mkrf_conf
@@ -40,47 +36,45 @@ extra_rdoc_files:
 - README
 - LICENSE
 files:
+- LICENSE
+- README
 - lib/Rakefile
-- lib/mkrf_conf
-- lib/undef.h
-- lib/module.h
-- lib/module.c
-- lib/conn.h
 - lib/conn.c
-- lib/conn_quote.h
-- lib/conn_quote.c
-- lib/conn_exec.h
+- lib/conn.h
 - lib/conn_exec.c
-- lib/result.h
+- lib/conn_exec.h
+- lib/conn_quote.c
+- lib/conn_quote.h
+- lib/mkrf_conf
+- lib/module.c
+- lib/module.h
 - lib/result.c
-- README
-- LICENSE
+- lib/result.h
+- lib/undef.h
 homepage: http://www.bertram-scharpf.de/software/pgsql
-licenses: []
+licenses:
+- BSD-2-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
-- --charset
-- utf-8
-- --main
+- "--main"
 - README
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
 - PostgreSQL
-rubyforge_project: NONE
-rubygems_version: 2.1.11
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: PostgreSQL-API for Ruby
 test_files: []