pgsql 1.4 → 1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd9c6d654678f0a738b6607d7f9fb8edc562d7634a099c5d246105d24bd8c5ee
-  data.tar.gz: d6430b794796c7d6fd068b40084d01dac66469149a5c54ac3b5b8477daaaafa3
+  metadata.gz: aa864a9b8413673f784d9ac667c8204642f3b3efc213afe2f40260f567db2aab
+  data.tar.gz: aff2d0ffa8a8db8bbf8880ef62dae6b0389a7329c3f2e0cb55153c0f9f00e60f
 SHA512:
-  metadata.gz: 92df57a64ecd2bf7a09f28f2de2f0403b215d19883f259cf0c275fd2f8df9aa7fbdd853ef63b11ee658fd960a475b5c9352f93ab8a9a29fc4b600d84619b41d3
-  data.tar.gz: 987b07b360cd45b8e112f12a4240b6269554758904cb2076a9574afb03448311a44da6deffd0177b18202b6f1ce2135a4ecac08ac529accbd7435ca352a37243
+  metadata.gz: 640b0dc2721468bd7734d21d4dcfb696719450f484d3be61a9c2aa190074487b3fd32d56a821320ef047a358287f1de272bb87507180dd38625f6ff90ecee690
+  data.tar.gz: 0f40813ca8581653da842afe6beb8da87f486005b22b3719af5324440504b40c4b3bfee3deace4ac55145d612835ce9966cae596c7be2170ec6bd79a4bbd672d

data/LICENSE

@@ -1,12 +1,6 @@
-                         _ 
-   _ __   __ _ ___  __ _| |
-  | '_ \ / _` / __|/ _` | |
-  | |_) | (_| \__ \ (_| | |
-  | .__/ \__, |___/\__, |_|
-  |_|    |___/        |_|  
+= pgsql Ruby Gem
 
-
-Copyright (C) 2011-2019, 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/conn.c

@@ -200,7 +200,7 @@ pgconn_alloc( VALUE cls)
 }
 
 /*
- * Document-method: connect
+ * Document-method: Pg::Conn.connect
  *
  * call-seq:
  *     Pg::Conn.connect( hash)        ->  conn
@@ -241,7 +241,7 @@ pgconn_s_parse( VALUE cls, VALUE str)
 
 
 /*
- * Document-method: new
+ * Document-method: Pg::Conn.new
  *
  * call-seq:
  *     Pg::Conn.new( hash)        ->   conn
@@ -775,14 +775,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)
@@ -814,23 +814,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.
@@ -839,7 +836,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.
@@ -848,10 +845,6 @@ notice_receiver( void *self, const PGresult *result)
 void
 Init_pgsql_conn( void)
 {
-#ifdef RDOC_NEEDS_THIS
-    rb_mPg = rb_define_module( "Pg");
-#endif
-
     rb_cPgConn = rb_define_class_under( rb_mPg, "Conn", rb_cObject);
 
     rb_ePgConnFailed  = rb_define_class_under( rb_cPgConn, "Failed",  rb_ePgError);

data/lib/conn_exec.c

@@ -207,7 +207,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
@@ -474,7 +474,7 @@ yield_transaction( VALUE self)
 VALUE
 rollback_transaction( VALUE self)
 {
-    pgresult_clear( pg_statement_exec( self, rb_str_new2( "rollback;"), Qnil));
+    pgresult_clear( pg_statement_exec( self, rb_str_new2( "ROLLBACK;"), Qnil));
     rb_exc_raise( RB_ERRINFO);
     return Qnil;
 }
@@ -486,7 +486,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;
 }
 
@@ -595,7 +595,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
@@ -700,7 +700,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 +821,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 +833,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.

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);
 
@@ -37,30 +37,58 @@ 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 (id_currency && NIL_P( rb_cCurrency)) {
-        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
@@ -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)) {
@@ -496,7 +524,7 @@ VALUE pgconn_quote( VALUE self, VALUE obj)
                 } 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);
@@ -628,7 +656,7 @@ Init_pgsql_conn_quote( void)
     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);
@@ -662,7 +690,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/module.c

@@ -8,15 +8,14 @@
 #include "result.h"
 
 
-#define PGSQL_VERSION "1.4"
+#define PGSQL_VERSION "1.5"
 
 
 VALUE rb_mPg;
 VALUE rb_ePgError;
 
 
-/********************************************************************
- *
+/*
  * Document-module: Pg
  *
  * The module to enclose everything.
@@ -25,8 +24,7 @@ VALUE rb_ePgError;
  * connection.
  */
 
-/********************************************************************
- *
+/*
  * Document-class: Pg::Error
  *
  * Generic PostgreSQL error.

data/lib/result.c

@@ -57,8 +57,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;
 
@@ -525,7 +523,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 +536,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;
 }
 
 /*
@@ -804,7 +811,6 @@ 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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pgsql
 version: !ruby/object:Gem::Version
-  version: '1.4'
+  version: '1.5'
 platform: ruby
 authors:
 - Bertram Scharpf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-31 00:00:00.000000000 Z
+date: 2020-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autorake
@@ -57,8 +57,6 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- "--charset"
-- utf-8
 - "--main"
 - README
 require_paths: