pg 1.5.1-x86-mingw32 → 1.5.3-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c884cb55bb3ee143766be845e73f83cf962af2fd6cbc27749ad82d29c363eda4
-  data.tar.gz: 2a65aeab6ab428e1fe3a8707ed0cd740b4785eabc2336440a33a8981403dc6ef
+  metadata.gz: f158ca8346766cf576b77ad85303fae42b28909dc7e364faa4767612687602cf
+  data.tar.gz: b9acd008aaa88709da3843a20b1938fccee0abd3774f56760173f5ebb72f5d95
 SHA512:
-  metadata.gz: 830eeea6b50c753afcb5846ea723748da58da0483100d440cc2c5077f8eb0c616a395284edbce7aa76387efa14a991bc82e3ea34de14274b614d8a5eec0cd36a
-  data.tar.gz: 06fd5578e70fdb5c6c95433b9f2afcd12aa17a521b220208014bdf63acd5c2b035e46dee2adcd994d1481b700cd7817b3637be59708da04e771fc63ef93b6a92
+  metadata.gz: 88eb37c1fc6c977fd43bbf84e0b92d9e622a19fb1ec4fe8aa150928de7b5d7f6a892a9eaf230b5ee5c5d9dbf1d5d2ae94936b6091751f82a81cf064ff29e407f
+  data.tar.gz: e9b52e6a49b60f744ce45ab125f9c986e673720992f6247390d2761641cd3d06bd2a5d130f43056b8916ecaa6a32a8e6ec7b0e28a6cefe24358dbb8232b02d01

data/History.md

@@ -1,3 +1,14 @@
+## v1.5.3 [2023-04-28] Lars Kanis <lars@greiz-reinsdorf.de>
+
+- Fix possible segfault when creating a new PG::Result with type map. [#530](https://github.com/ged/ruby-pg/pull/530)
+- Add category to deprecation warnings of Coder.new, so that they are suppressed for most users. [#528](https://github.com/ged/ruby-pg/pull/528)
+
+
+## v1.5.2 [2023-04-26] Lars Kanis <lars@greiz-reinsdorf.de>
+
+- Fix regression in copy_data regarding binary format when using no coder. [#527](https://github.com/ged/ruby-pg/pull/527)
+
+
 ## v1.5.1 [2023-04-24] Lars Kanis <lars@greiz-reinsdorf.de>
 
 - Don't overwrite flags of timestamp coders. [#524](https://github.com/ged/ruby-pg/pull/524)

data/ext/pg_result.c

@@ -208,12 +208,16 @@ pg_new_result2(PGresult *result, VALUE rb_pgconn)
 
 	this = (t_pg_result *)xmalloc(sizeof(*this) +  sizeof(*this->fnames) * nfields);
 	this->pgresult = result;
+	/* Initialize connection and typemap prior to any object allocations,
+	 * to make sure valid objects are marked. */
+	this->connection = rb_pgconn;
+	this->typemap = pg_typemap_all_strings;
+	this->p_typemap = RTYPEDDATA_DATA( this->typemap );
 	this->nfields = -1;
 	this->tuple_hash = Qnil;
 	this->field_map = Qnil;
 	this->flags = 0;
 	self = TypedData_Wrap_Struct(rb_cPGresult, &pgresult_type, this);
-	RB_OBJ_WRITE(self, &this->connection, rb_pgconn);
 
 	if( result ){
 		t_pg_connection *p_conn = pg_get_connection(rb_pgconn);
@@ -227,8 +231,6 @@ pg_new_result2(PGresult *result, VALUE rb_pgconn)
 		this->p_typemap = RTYPEDDATA_DATA( this->typemap );
 		this->flags = p_conn->flags;
 	} else {
-		RB_OBJ_WRITE(self, &this->typemap, pg_typemap_all_strings);
-		this->p_typemap = RTYPEDDATA_DATA( this->typemap );
 		this->enc_idx = rb_locale_encindex();
 	}
 
@@ -391,7 +393,7 @@ pg_result_clear(VALUE self)
  *
  */
 VALUE
-pg_result_freeze(VALUE self)
+static pg_result_freeze(VALUE self)
 {
 	t_pg_result *this = pgresult_get_this(self);
 
@@ -405,7 +407,7 @@ pg_result_freeze(VALUE self)
  *
  * Returns +true+ if the backend result memory has been freed.
  */
-VALUE
+static VALUE
 pgresult_cleared_p( VALUE self )
 {
 	t_pg_result *this = pgresult_get_this(self);
@@ -422,7 +424,7 @@ pgresult_cleared_p( VALUE self )
  * All other Result objects are automatically cleared by the GC when the object is no longer in use or manually by PG::Result#clear .
  *
  */
-VALUE
+static VALUE
 pgresult_autoclear_p( VALUE self )
 {
 	t_pg_result *this = pgresult_get_this(self);
@@ -1422,8 +1424,9 @@ pgresult_type_map_set(VALUE self, VALUE typemap)
 	/* Check type of method param */
 	TypedData_Get_Struct(typemap, t_typemap, &pg_typemap_type, p_typemap);
 
-	RB_OBJ_WRITE(self, &this->typemap, p_typemap->funcs.fit_to_result( typemap, self ));
-	this->p_typemap = RTYPEDDATA_DATA( this->typemap );
+	typemap = p_typemap->funcs.fit_to_result( typemap, self );
+	RB_OBJ_WRITE(self, &this->typemap, typemap);
+	this->p_typemap = RTYPEDDATA_DATA( typemap );
 
 	return typemap;
 }

data/ext/pg_type_map_by_column.c

@@ -287,9 +287,7 @@ pg_tmbc_init(VALUE self, VALUE conv_ary)
 			t_pg_coder *p_coder;
 			/* Check argument type and store the coder pointer */
 			TypedData_Get_Struct(obj, t_pg_coder, &pg_coder_type, p_coder);
-			if( p_coder ){
-				RB_OBJ_WRITTEN(self, Qnil, p_coder->coder_obj);
-			}
+			RB_OBJ_WRITTEN(self, Qnil, p_coder->coder_obj);
 			this->convs[i].cconv = p_coder;
 		}
 	}

data/lib/pg/binary_decoder/timestamp.rb

@@ -6,19 +6,19 @@ module PG
 		# Convenience classes for timezone options
 		class TimestampUtc < Timestamp
 			def initialize(hash={}, **kwargs)
-				warn "PG::Coder.new(hash) is deprecated. Please use keyword arguments instead! Called from #{caller.first}" unless hash.empty?
+				warn("PG::Coder.new(hash) is deprecated. Please use keyword arguments instead! Called from #{caller.first}", category: :deprecated) unless hash.empty?
 				super(**hash, **kwargs, flags: PG::Coder::TIMESTAMP_DB_UTC | PG::Coder::TIMESTAMP_APP_UTC)
 			end
 		end
 		class TimestampUtcToLocal < Timestamp
 			def initialize(hash={}, **kwargs)
-				warn "PG::Coder.new(hash) is deprecated. Please use keyword arguments instead! Called from #{caller.first}" unless hash.empty?
+				warn("PG::Coder.new(hash) is deprecated. Please use keyword arguments instead! Called from #{caller.first}", category: :deprecated) unless hash.empty?
 				super(**hash, **kwargs, flags: PG::Coder::TIMESTAMP_DB_UTC | PG::Coder::TIMESTAMP_APP_LOCAL)
 			end
 		end
 		class TimestampLocal < Timestamp
 			def initialize(hash={}, **kwargs)
-				warn "PG::Coder.new(hash) is deprecated. Please use keyword arguments instead! Called from #{caller.first}" unless hash.empty?
+				warn("PG::Coder.new(hash) is deprecated. Please use keyword arguments instead! Called from #{caller.first}", category: :deprecated) unless hash.empty?
 				super(**hash, **kwargs, flags: PG::Coder::TIMESTAMP_DB_LOCAL | PG::Coder::TIMESTAMP_APP_LOCAL)
 			end
 		end

data/lib/pg/binary_encoder/timestamp.rb

@@ -6,13 +6,13 @@ module PG
 		# Convenience classes for timezone options
 		class TimestampUtc < Timestamp
 			def initialize(hash={}, **kwargs)
-				warn "PG::Coder.new(hash) is deprecated. Please use keyword arguments instead! Called from #{caller.first}" unless hash.empty?
+				warn("PG::Coder.new(hash) is deprecated. Please use keyword arguments instead! Called from #{caller.first}", category: :deprecated) unless hash.empty?
 				super(**hash, **kwargs, flags: PG::Coder::TIMESTAMP_DB_UTC)
 			end
 		end
 		class TimestampLocal < Timestamp
 			def initialize(hash={}, **kwargs)
-				warn "PG::Coder.new(hash) is deprecated. Please use keyword arguments instead! Called from #{caller.first}" unless hash.empty?
+				warn("PG::Coder.new(hash) is deprecated. Please use keyword arguments instead! Called from #{caller.first}", category: :deprecated) unless hash.empty?
 				super(**hash, **kwargs, flags: PG::Coder::TIMESTAMP_DB_LOCAL)
 			end
 		end

data/lib/pg/coder.rb

@@ -7,7 +7,7 @@ module PG
 
 		module BinaryFormatting
 			def initialize(hash={}, **kwargs)
-				warn "PG::Coder.new(hash) is deprecated. Please use keyword arguments instead! Called from #{caller.first}" unless hash.empty?
+				warn("PG::Coder.new(hash) is deprecated. Please use keyword arguments instead! Called from #{caller.first}", category: :deprecated) unless hash.empty?
 				super(format: 1, **hash, **kwargs)
 			end
 		end
@@ -15,7 +15,7 @@ module PG
 
 		# Create a new coder object based on the attribute Hash.
 		def initialize(hash=nil, **kwargs)
-			warn "PG::Coder.new(hash) is deprecated. Please use keyword arguments instead! Called from #{caller.first}" if hash
+			warn("PG::Coder.new(hash) is deprecated. Please use keyword arguments instead! Called from #{caller.first}", category: :deprecated) if hash
 
 			(hash || kwargs).each do |key, val|
 				send("#{key}=", val)

data/lib/pg/connection.rb

@@ -166,6 +166,14 @@ class PG::Connection
 	#     conn.put_copy_data ['more', 'data', 'to', 'copy']
 	#   end
 	#
+	# Also PG::BinaryEncoder::CopyRow can be used to send data in binary format to the server.
+	# In this case copy_data generates the header and trailer data automatically:
+	#   enco = PG::BinaryEncoder::CopyRow.new
+	#   conn.copy_data "COPY my_table FROM STDIN (FORMAT binary)", enco do
+	#     conn.put_copy_data ['some', 'data', 'to', 'copy']
+	#     conn.put_copy_data ['more', 'data', 'to', 'copy']
+	#   end
+	#
 	# Example with CSV output format:
 	#   conn.copy_data "COPY my_table TO STDOUT CSV" do
 	#     while row=conn.get_copy_data
@@ -187,6 +195,18 @@ class PG::Connection
 	# This receives all rows of +my_table+ as ruby array:
 	#   ["some", "data", "to", "copy"]
 	#   ["more", "data", "to", "copy"]
+	#
+	# Also PG::BinaryDecoder::CopyRow can be used to retrieve data in binary format from the server.
+	# In this case the header and trailer data is processed by the decoder and the remaining +nil+ from get_copy_data is processed by copy_data, so that binary data can be processed equally to text data:
+	#   deco = PG::BinaryDecoder::CopyRow.new
+	#   conn.copy_data "COPY my_table TO STDOUT (FORMAT binary)", deco do
+	#     while row=conn.get_copy_data
+	#       p row
+	#     end
+	#   end
+	# This receives all rows of +my_table+ as ruby array:
+	#   ["some", "data", "to", "copy"]
+	#   ["more", "data", "to", "copy"]
 
 	def copy_data( sql, coder=nil )
 		raise PG::NotInBlockingMode.new("copy_data can not be used in nonblocking mode", connection: self) if nonblocking?
@@ -195,7 +215,7 @@ class PG::Connection
 		case res.result_status
 		when PGRES_COPY_IN
 			begin
-				if res.binary_tuples == 1
+				if coder && res.binary_tuples == 1
 					# Binary file header (11 byte signature, 32 bit flags and 32 bit extension length)
 					put_copy_data(BinarySignature + ("\x00" * 8))
 				end
@@ -219,7 +239,7 @@ class PG::Connection
 				begin
 					self.encoder_for_put_copy_data = old_coder if coder
 
-					if res.binary_tuples == 1
+					if coder && res.binary_tuples == 1
 						put_copy_data("\xFF\xFF") # Binary file trailer 16 bit "-1"
 					end
 
@@ -244,8 +264,9 @@ class PG::Connection
 				discard_results
 				raise
 			else
-				if res.binary_tuples == 1
-					# there are two end markers in binary mode: file trailer and the final nil
+				if coder && res.binary_tuples == 1
+					# There are two end markers in binary mode: file trailer and the final nil.
+					# The file trailer is expected to be processed by BinaryDecoder::CopyRow and already returns nil, so that the remaining NULL from PQgetCopyData is retrieved here:
 					if get_copy_data
 						discard_results
 						raise PG::NotAllCopyDataRetrieved.new("Not all binary COPY data retrieved", connection: self)

data/lib/pg/text_decoder/timestamp.rb

@@ -6,19 +6,19 @@ module PG
 		# Convenience classes for timezone options
 		class TimestampUtc < Timestamp
 			def initialize(hash={}, **kwargs)
-				warn "PG::Coder.new(hash) is deprecated. Please use keyword arguments instead! Called from #{caller.first}" unless hash.empty?
+				warn("PG::Coder.new(hash) is deprecated. Please use keyword arguments instead! Called from #{caller.first}", category: :deprecated) unless hash.empty?
 				super(**hash, **kwargs, flags: PG::Coder::TIMESTAMP_DB_UTC | PG::Coder::TIMESTAMP_APP_UTC)
 			end
 		end
 		class TimestampUtcToLocal < Timestamp
 			def initialize(hash={}, **kwargs)
-				warn "PG::Coder.new(hash) is deprecated. Please use keyword arguments instead! Called from #{caller.first}" unless hash.empty?
+				warn("PG::Coder.new(hash) is deprecated. Please use keyword arguments instead! Called from #{caller.first}", category: :deprecated) unless hash.empty?
 				super(**hash, **kwargs, flags: PG::Coder::TIMESTAMP_DB_UTC | PG::Coder::TIMESTAMP_APP_LOCAL)
 			end
 		end
 		class TimestampLocal < Timestamp
 			def initialize(hash={}, **kwargs)
-				warn "PG::Coder.new(hash) is deprecated. Please use keyword arguments instead! Called from #{caller.first}" unless hash.empty?
+				warn("PG::Coder.new(hash) is deprecated. Please use keyword arguments instead! Called from #{caller.first}", category: :deprecated) unless hash.empty?
 				super(**hash, **kwargs, flags: PG::Coder::TIMESTAMP_DB_LOCAL | PG::Coder::TIMESTAMP_APP_LOCAL)
 			end
 		end

data/lib/pg/version.rb

@@ -1,4 +1,4 @@
 module PG
 	# Library version
-	VERSION = '1.5.1'
+	VERSION = '1.5.3'
 end

data/lib/pg.rb

@@ -115,4 +115,15 @@ module PG
 	require 'pg/tuple'
 	autoload :VERSION, 'pg/version'
 
+
+	# Avoid "uninitialized constant Truffle::WarningOperations" on Truffleruby up to 22.3.1
+	if RUBY_ENGINE=="truffleruby" && !defined?(Truffle::WarningOperations)
+		module TruffleFixWarn
+			def warn(str, category=nil)
+				super(str)
+			end
+		end
+		Warning.extend(TruffleFixWarn)
+	end
+
 end # module PG

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.3
 platform: x86-mingw32
 authors:
 - Michael Granger
@@ -34,7 +34,7 @@ cert_chain:
   Dzx/gFSOrRoCt2mXNgrmcAfr386AfaMvCh7cXqdxZwmVo7ILZCYXck0pajvubsDd
   NUIIFkVXvd1odFyK9LF1RFAtxn/iAmpx
   -----END CERTIFICATE-----
-date: 2023-04-24 00:00:00.000000000 Z
+date: 2023-04-28 00:00:00.000000000 Z
 dependencies: []
 description: Pg is the Ruby interface to the PostgreSQL RDBMS. It works with PostgreSQL
   9.3 and later.