pg 0.19.0.pre20170115074000 → 0.19.0

data/History.rdoc

@@ -1,19 +1,3 @@
-== v0.19.1 [YYYY-MM-DD] Michael Granger <ged@FaerieMUD.org>
-
-Enhancements:
-- Update error codes to PostgreSQL-9.6
-- Update Windows binary gems to Ruby-2.4, PostgreSQL 9.6.1 and
-  OpenSSL 1.0.2j.
-
-Bugfixes:
-- Use secure JSON methods for JSON (de)serialisation. #248
-- Fix Result#inspect on a cleared result.
-- Fix test case that failed on Ruby-2.4. #255
-
-Documentation fixes:
-- Talk about Integer instead of Fixnum.
-- Fix method signature of Coder#encode.
-
 == v0.19.0 [2016-09-21] Michael Granger <ged@FaerieMUD.org>
 
 - Deprecate Ruby 1.9

data/Rakefile

@@ -60,8 +60,8 @@ $hoespec = Hoe.spec 'pg' do
 	self.developer 'Michael Granger', 'ged@FaerieMUD.org'
 	self.developer 'Lars Kanis', 'lars@greiz-reinsdorf.de'
 
-	self.dependency 'rake-compiler', '~> 1.0.3', :developer
-	self.dependency 'rake-compiler-dock', '~> 0.6.0', :developer
+	self.dependency 'rake-compiler', '~> 0.9', :developer
+	self.dependency 'rake-compiler-dock', '~> 0.5', :developer
 	self.dependency 'hoe', '~> 3.12', :developer
 	self.dependency 'hoe-deveiate', '~> 0.6', :developer
 	self.dependency 'hoe-bundler', '~> 1.0', :developer
@@ -185,7 +185,7 @@ end
 
 desc "Update list of server error codes"
 task :update_error_codes do
-	URL_ERRORCODES_TXT = "http://git.postgresql.org/gitweb/?p=postgresql.git;a=blob_plain;f=src/backend/utils/errcodes.txt;hb=refs/tags/REL9_6_1"
+	URL_ERRORCODES_TXT = "http://git.postgresql.org/gitweb/?p=postgresql.git;a=blob_plain;f=src/backend/utils/errcodes.txt;hb=HEAD"
 
 	ERRORCODES_TXT = "ext/errorcodes.txt"
 	sh "wget #{URL_ERRORCODES_TXT.inspect} -O #{ERRORCODES_TXT.inspect} || curl #{URL_ERRORCODES_TXT.inspect} -o #{ERRORCODES_TXT.inspect}"

data/Rakefile.cross

@@ -29,8 +29,8 @@ class CrossLibrary < OpenStruct
 		self.host_platform              = toolchain
 
 		# Cross-compilation constants
-		self.openssl_version            = ENV['OPENSSL_VERSION'] || '1.0.2j'
-		self.postgresql_version         = ENV['POSTGRESQL_VERSION'] || '9.6.1'
+		self.openssl_version            = ENV['OPENSSL_VERSION'] || '1.0.2h'
+		self.postgresql_version         = ENV['POSTGRESQL_VERSION'] || '9.5.4'
 
 		# Check if symlinks work in the current working directory.
 		# This fails, if rake-compiler-dock is running on a Windows box.
@@ -291,12 +291,11 @@ task 'gem:windows' => ['ChangeLog'] do
   # Copy gem signing key and certs to be accessable from the docker container
   mkdir_p 'build/gem'
   sh "cp ~/.gem/gem-*.pem build/gem/ || true"
-  sh "bundle package"
 
   RakeCompilerDock.sh <<-EOT
     mkdir ~/.gem &&
     (cp build/gem/gem-*.pem ~/.gem/ || true) &&
-    bundle install --local &&
-    rake cross native gem RUBY_CC_VERSION=2.4.0:2.3.0:2.2.2:2.1.6:2.0.0
+    bundle install &&
+    rake cross native gem RUBY_CC_VERSION=2.3.0:2.2.2:2.1.6:2.0.0:1.9.3
   EOT
 end

data/ext/errorcodes.def

@@ -373,10 +373,6 @@
   VALUE klass = define_error_class( "InFailedSqlTransaction", "25" );
   register_error_class( "25P02", klass );
 }
-{
-  VALUE klass = define_error_class( "IdleInTransactionSessionTimeout", "25" );
-  register_error_class( "25P03", klass );
-}
 {
   VALUE klass = define_error_class( "InvalidSqlStatementName", NULL );
   register_error_class( "26000", klass );
@@ -797,11 +793,6 @@
   VALUE klass = define_error_class( "DuplicateFile", "58" );
   register_error_class( "58P02", klass );
 }
-{
-  VALUE klass = define_error_class( "SnapshotTooOld", NULL );
-  register_error_class( "72000", klass );
-  register_error_class( "72", klass );
-}
 {
   VALUE klass = define_error_class( "ConfigFileError", NULL );
   register_error_class( "F0000", klass );

data/ext/errorcodes.txt

@@ -15,9 +15,6 @@
 #   src/pl/plpgsql/src/plerrcodes.h
 #      a list of PL/pgSQL condition names and their SQLSTATE codes
 #
-#   src/pl/tcl/pltclerrcodes.h
-#      the same, for PL/Tcl
-#
 #   doc/src/sgml/errcodes-list.sgml
 #      a SGML table of error codes for inclusion in the documentation
 #
@@ -232,7 +229,6 @@ Section: Class 25 - Invalid Transaction State
 25007    E    ERRCODE_SCHEMA_AND_DATA_STATEMENT_MIXING_NOT_SUPPORTED         schema_and_data_statement_mixing_not_supported
 25P01    E    ERRCODE_NO_ACTIVE_SQL_TRANSACTION                              no_active_sql_transaction
 25P02    E    ERRCODE_IN_FAILED_SQL_TRANSACTION                              in_failed_sql_transaction
-25P03    E    ERRCODE_IDLE_IN_TRANSACTION_SESSION_TIMEOUT                    idle_in_transaction_session_timeout
 
 Section: Class 26 - Invalid SQL Statement Name
 
@@ -417,10 +413,6 @@ Section: Class 58 - System Error (errors external to PostgreSQL itself)
 58P01    E    ERRCODE_UNDEFINED_FILE                                         undefined_file
 58P02    E    ERRCODE_DUPLICATE_FILE                                         duplicate_file
 
-Section: Class 72 - Snapshot Failure
-# (class borrowed from Oracle)
-72000    E    ERRCODE_SNAPSHOT_TOO_OLD                                       snapshot_too_old
-
 Section: Class F0 - Configuration File Error
 
 # (PostgreSQL-specific error class)

data/ext/pg.c

@@ -1,6 +1,6 @@
 /*
  * pg.c - Toplevel extension
- * $Id$
+ * $Id: pg.c,v c77d0997b4e4 2016/08/20 17:30:03 ged $
  *
  * Author/s:
  *

data/ext/pg_binary_decoder.c

@@ -1,6 +1,6 @@
 /*
  * pg_column_map.c - PG::ColumnMap class extension
- * $Id$
+ * $Id: pg_binary_decoder.c,v fcf731d3dff7 2015/09/08 12:25:06 jfali $
  *
  */
 

data/ext/pg_binary_encoder.c

@@ -1,6 +1,6 @@
 /*
  * pg_column_map.c - PG::ColumnMap class extension
- * $Id$
+ * $Id: pg_binary_encoder.c,v e61a06f1f5ed 2015/12/25 21:14:21 lars $
  *
  */
 

data/ext/pg_coder.c

@@ -105,7 +105,7 @@ pg_composite_decoder_allocate( VALUE klass )
 
 /*
  * call-seq:
- *    coder.encode( value [, encoding] )
+ *    coder.encode( value )
  *
  * Encodes the given Ruby object into string representation, without
  * sending data to/from the database server.

data/ext/pg_connection.c

@@ -1,6 +1,6 @@
 /*
  * pg_connection.c - PG::Connection class extension
- * $Id$
+ * $Id: pg_connection.c,v 4d9c4ee44d11 2016/09/04 17:32:03 lars $
  *
  */
 
@@ -352,9 +352,9 @@ pgconn_s_connect_start( int argc, VALUE *argv, VALUE klass )
 #ifdef HAVE_PQPING
 /*
  * call-seq:
- *    PG::Connection.ping(connection_hash)       -> Integer
- *    PG::Connection.ping(connection_string)     -> Integer
- *    PG::Connection.ping(host, port, options, tty, dbname, login, password) ->  Integer
+ *    PG::Connection.ping(connection_hash)       -> Fixnum
+ *    PG::Connection.ping(connection_string)     -> Fixnum
+ *    PG::Connection.ping(host, port, options, tty, dbname, login, password) ->  Fixnum
  *
  * Check server status.
  *
@@ -457,7 +457,7 @@ pgconn_s_encrypt_password(VALUE self, VALUE password, VALUE username)
 
 /*
  * call-seq:
- *    conn.connect_poll() -> Integer
+ *    conn.connect_poll() -> Fixnum
  *
  * Returns one of:
  * [+PGRES_POLLING_READING+]
@@ -566,7 +566,7 @@ pgconn_reset_start(VALUE self)
 
 /*
  * call-seq:
- *    conn.reset_poll -> Integer
+ *    conn.reset_poll -> Fixnum
  *
  * Checks the status of a connection reset operation.
  * See #connect_start and #connect_poll for
@@ -805,7 +805,7 @@ pgconn_error_message(VALUE self)
 
 /*
  * call-seq:
- *    conn.socket() -> Integer
+ *    conn.socket() -> Fixnum
  *
  * Returns the socket's file descriptor for this connection.
  * <tt>IO.for_fd()</tt> can be used to build a proper IO object to the socket.
@@ -880,7 +880,7 @@ pgconn_socket_io(VALUE self)
 
 /*
  * call-seq:
- *    conn.backend_pid() -> Integer
+ *    conn.backend_pid() -> Fixnum
  *
  * Returns the process ID of the backend server
  * process for this connection.
@@ -1234,8 +1234,8 @@ pgconn_query_assign_typemap( VALUE self, struct query_params_data *paramsData )
  * Each element of the +params+ array may be either:
  *   a hash of the form:
  *     {:value  => String (value of bind parameter)
- *      :type   => Integer (oid of type of bind parameter)
- *      :format => Integer (0 for text, 1 for binary)
+ *      :type   => Fixnum (oid of type of bind parameter)
+ *      :format => Fixnum (0 for text, 1 for binary)
  *     }
  *   or, it may be a String. If it is a string, that is equivalent to the hash:
  *     { :value => <string value>, :type => 0, :format => 0 }
@@ -1377,7 +1377,7 @@ pgconn_prepare(int argc, VALUE *argv, VALUE self)
  * SQL query. Each element of the +params+ array may be either:
  *   a hash of the form:
  *     {:value  => String (value of bind parameter)
- *      :format => Integer (0 for text, 1 for binary)
+ *      :format => Fixnum (0 for text, 1 for binary)
  *     }
  *   or, it may be a String. If it is a string, that is equivalent to the hash:
  *     { :value => <string value>, :format => 0 }
@@ -1793,8 +1793,8 @@ pgconn_set_single_row_mode(VALUE self)
  * Each element of the +params+ array may be either:
  *   a hash of the form:
  *     {:value  => String (value of bind parameter)
- *      :type   => Integer (oid of type of bind parameter)
- *      :format => Integer (0 for text, 1 for binary)
+ *      :type   => Fixnum (oid of type of bind parameter)
+ *      :format => Fixnum (0 for text, 1 for binary)
  *     }
  *   or, it may be a String. If it is a string, that is equivalent to the hash:
  *     { :value => <string value>, :type => 0, :format => 0 }
@@ -1940,7 +1940,7 @@ pgconn_send_prepare(int argc, VALUE *argv, VALUE self)
  * SQL query. Each element of the +params+ array may be either:
  *   a hash of the form:
  *     {:value  => String (value of bind parameter)
- *      :format => Integer (0 for text, 1 for binary)
+ *      :format => Fixnum (0 for text, 1 for binary)
  *     }
  *   or, it may be a String. If it is a string, that is equivalent to the hash:
  *     { :value => <string value>, :format => 0 }
@@ -2724,7 +2724,7 @@ pgconn_get_copy_data(int argc, VALUE *argv, VALUE self )
 
 /*
  * call-seq:
- *    conn.set_error_verbosity( verbosity ) -> Integer
+ *    conn.set_error_verbosity( verbosity ) -> Fixnum
  *
  * Sets connection's verbosity to _verbosity_ and returns
  * the previous setting. Available settings are:
@@ -3280,7 +3280,7 @@ pgconn_ssl_attribute_names(VALUE self)
 
 /*
  * call-seq:
- *    conn.lo_creat( [mode] ) -> Integer
+ *    conn.lo_creat( [mode] ) -> Fixnum
  *
  * Creates a large object with mode _mode_. Returns a large object Oid.
  * On failure, it raises PG::Error.
@@ -3307,7 +3307,7 @@ pgconn_locreat(int argc, VALUE *argv, VALUE self)
 
 /*
  * call-seq:
- *    conn.lo_create( oid ) -> Integer
+ *    conn.lo_create( oid ) -> Fixnum
  *
  * Creates a large object with oid _oid_. Returns the large object Oid.
  * On failure, it raises PG::Error.
@@ -3328,7 +3328,7 @@ pgconn_locreate(VALUE self, VALUE in_lo_oid)
 
 /*
  * call-seq:
- *    conn.lo_import(file) -> Integer
+ *    conn.lo_import(file) -> Fixnum
  *
  * Import a file to a large object. Returns a large object Oid.
  *
@@ -3373,7 +3373,7 @@ pgconn_loexport(VALUE self, VALUE lo_oid, VALUE filename)
 
 /*
  * call-seq:
- *    conn.lo_open( oid, [mode] ) -> Integer
+ *    conn.lo_open( oid, [mode] ) -> Fixnum
  *
  * Open a large object of _oid_. Returns a large object descriptor
  * instance on success. The _mode_ argument specifies the mode for
@@ -3404,7 +3404,7 @@ pgconn_loopen(int argc, VALUE *argv, VALUE self)
 
 /*
  * call-seq:
- *    conn.lo_write( lo_desc, buffer ) -> Integer
+ *    conn.lo_write( lo_desc, buffer ) -> Fixnum
  *
  * Writes the string _buffer_ to the large object _lo_desc_.
  * Returns the number of bytes written.
@@ -3471,7 +3471,7 @@ pgconn_loread(VALUE self, VALUE in_lo_desc, VALUE in_len)
 
 /*
  * call-seq:
- *    conn.lo_lseek( lo_desc, offset, whence ) -> Integer
+ *    conn.lo_lseek( lo_desc, offset, whence ) -> Fixnum
  *
  * Move the large object pointer _lo_desc_ to offset _offset_.
  * Valid values for _whence_ are +SEEK_SET+, +SEEK_CUR+, and +SEEK_END+.
@@ -3493,7 +3493,7 @@ pgconn_lolseek(VALUE self, VALUE in_lo_desc, VALUE offset, VALUE whence)
 
 /*
  * call-seq:
- *    conn.lo_tell( lo_desc ) -> Integer
+ *    conn.lo_tell( lo_desc ) -> Fixnum
  *
  * Returns the current position of the large object _lo_desc_.
  */

data/ext/pg_result.c

@@ -1,6 +1,6 @@
 /*
  * pg_result.c - PG::Result class extension
- * $Id$
+ * $Id: pg_result.c,v 982082c0d77b 2016/01/31 19:28:55 ged $
  *
  */
 
@@ -302,7 +302,7 @@ static void pgresult_init_fnames(VALUE self)
 
 /*
  * call-seq:
- *    res.result_status() -> Integer
+ *    res.result_status() -> Fixnum
  *
  * Returns the status of the query. The status value is one of:
  * * +PGRES_EMPTY_QUERY+
@@ -414,7 +414,7 @@ pgresult_error_field(VALUE self, VALUE field)
 
 /*
  * call-seq:
- *    res.ntuples() -> Integer
+ *    res.ntuples() -> Fixnum
  *
  * Returns the number of tuples in the query result.
  */
@@ -466,7 +466,7 @@ pgresult_fname(VALUE self, VALUE index)
 
 /*
  * call-seq:
- *    res.fnumber( name ) -> Integer
+ *    res.fnumber( name ) -> Fixnum
  *
  * Returns the index of the field specified by the string +name+.
  * The given +name+ is treated like an identifier in an SQL command, that is,
@@ -527,7 +527,7 @@ pgresult_ftable(VALUE self, VALUE column_number)
 
 /*
  * call-seq:
- *    res.ftablecol( column_number ) -> Integer
+ *    res.ftablecol( column_number ) -> Fixnum
  *
  * Returns the column number (within its table) of the table from
  * which the column _column_number_ is made up.
@@ -552,7 +552,7 @@ pgresult_ftablecol(VALUE self, VALUE column_number)
 
 /*
  * call-seq:
- *    res.fformat( column_number ) -> Integer
+ *    res.fformat( column_number ) -> Fixnum
  *
  * Returns the format (0 for text, 1 for binary) of column
  * _column_number_.
@@ -696,7 +696,7 @@ pgresult_getisnull(VALUE self, VALUE tup_num, VALUE field_num)
 
 /*
  * call-seq:
- *    res.getlength( tup_num, field_num ) -> Integer
+ *    res.getlength( tup_num, field_num ) -> Fixnum
  *
  * Returns the (String) length of the field in bytes.
  *
@@ -721,7 +721,7 @@ pgresult_getlength(VALUE self, VALUE tup_num, VALUE field_num)
 
 /*
  * call-seq:
- *    res.nparams() -> Integer
+ *    res.nparams() -> Fixnum
  *
  * Returns the number of parameters of a prepared statement.
  * Only useful for the result returned by conn.describePrepared

data/ext/pg_text_decoder.c

@@ -1,6 +1,6 @@
 /*
  * pg_text_decoder.c - PG::TextDecoder module
- * $Id$
+ * $Id: pg_text_decoder.c,v fcf731d3dff7 2015/09/08 12:25:06 jfali $
  *
  */
 

data/ext/pg_text_encoder.c

@@ -1,6 +1,6 @@
 /*
  * pg_text_encoder.c - PG::TextEncoder module
- * $Id$
+ * $Id: pg_text_encoder.c,v e61a06f1f5ed 2015/12/25 21:14:21 lars $
  *
  */
 

data/ext/pg_type_map.c

@@ -1,6 +1,6 @@
 /*
  * pg_column_map.c - PG::ColumnMap class extension
- * $Id$
+ * $Id: pg_type_map.c,v fcf731d3dff7 2015/09/08 12:25:06 jfali $
  *
  */
 
@@ -11,53 +11,46 @@ VALUE rb_mDefaultTypeMappable;
 static ID s_id_fit_to_query;
 static ID s_id_fit_to_result;
 
-NORETURN( VALUE
-pg_typemap_fit_to_result( VALUE self, VALUE result ));
-NORETURN( VALUE
-pg_typemap_fit_to_query( VALUE self, VALUE params ));
-NORETURN( int
-pg_typemap_fit_to_copy_get( VALUE self ));
-NORETURN( VALUE
-pg_typemap_result_value( t_typemap *p_typemap, VALUE result, int tuple, int field ));
-NORETURN( t_pg_coder *
-pg_typemap_typecast_query_param( t_typemap *p_typemap, VALUE param_value, int field ));
-NORETURN( VALUE
-pg_typemap_typecast_copy_get( t_typemap *p_typemap, VALUE field_str, int fieldno, int format, int enc_idx ));
-
 VALUE
 pg_typemap_fit_to_result( VALUE self, VALUE result )
 {
 	rb_raise( rb_eNotImpError, "type map %s is not suitable to map result values", rb_obj_classname(self) );
+	return Qnil;
 }
 
 VALUE
 pg_typemap_fit_to_query( VALUE self, VALUE params )
 {
 	rb_raise( rb_eNotImpError, "type map %s is not suitable to map query params", rb_obj_classname(self) );
+	return Qnil;
 }
 
 int
 pg_typemap_fit_to_copy_get( VALUE self )
 {
 	rb_raise( rb_eNotImpError, "type map %s is not suitable to map get_copy_data results", rb_obj_classname(self) );
+	return Qnil;
 }
 
 VALUE
 pg_typemap_result_value( t_typemap *p_typemap, VALUE result, int tuple, int field )
 {
 	rb_raise( rb_eNotImpError, "type map is not suitable to map result values" );
+	return Qnil;
 }
 
 t_pg_coder *
 pg_typemap_typecast_query_param( t_typemap *p_typemap, VALUE param_value, int field )
 {
 	rb_raise( rb_eNotImpError, "type map is not suitable to map query params" );
+	return NULL;
 }
 
 VALUE
 pg_typemap_typecast_copy_get( t_typemap *p_typemap, VALUE field_str, int fieldno, int format, int enc_idx )
 {
 	rb_raise( rb_eNotImpError, "type map is not suitable to map get_copy_data results" );
+	return Qnil;
 }
 
 const struct pg_typemap_funcs pg_typemap_funcs = {