pg 1.5.1-x64-mingw32 → 1.5.3-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: efaa722b4b1eeac8cec2b19810a76b38e760410e1d035f7eb68e42e818b6c346
-  data.tar.gz: 1668007d3e4c7775f17d37228dd05b45439771631313ded0bf0c85653c9ed296
+  metadata.gz: 446a14cb9e82644f39143b72b3a8fe6c9df919835709b69139e972013f322ec5
+  data.tar.gz: 664d953714bb1be9c2903b97fbcda29a53994dc1b4aca43b87e1092f8d172352
 SHA512:
-  metadata.gz: 1a96e46a65198b64a52ca247027052c89d48c9cee2ecb7b01f3cf6372aaab991f69d7ed5ff8432929446c6578d02ae222ec5e59baf495ee6f5570180d8fad8fc
-  data.tar.gz: 5aac315aad74eda7a64ccf2e0c2757009b56ff1c64637bbbd07cb4496755b7a9a7585072d1aad12725ef2e3fa59157bc1e604486a14eaa87dca05bdb5ad0f0da
+  metadata.gz: 289df9bd183104621ea395b11e9bf6a763ce31f23b79a7c7487eb1d4892a35bf8c5874ec3f75a42264ab220941852fe58c98fc5c6a3d3e65efd21c8be1412b0d
+  data.tar.gz: 503810c481b089a40ad7db1636ebb8f5b0bda6e67ef4c31ed360b649b8412e53076d20ddc1cdce9470726e362b255c9aa280524ac58c94996905db334cd4c3f6

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: x64-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.

metadata.gz.sig

@@ -1,2 +1,4 @@
-0c,f)��^�V���`r���#ΰWZ�L�����9��VJě2#�h
-P>T6e�%@�|R�Qn�0I�e����uҶ��.u_���`1Jm�1]i��7�j�e([1t\��&pu
+'��9?������'�Uy�v��nS8*k?����5[�zZ[tC�?��׵�4g3��
+Q>d/���)9�j��,���q���%|v_�!�_g�;wn]���sAOW�A�"V�e�$
+����x^�-7��V���e�•�:a]�Q}��+�'xު.����Թ��jS��j�m^�Md��$F]�|����A�1t�nd����+T�z�
i`)��O���(�G)��H���\h5U�N����@$v1m=C��
�����i���v=4I�g��������:������\�nn,@�:�Ľj�~�GV
���:	�VN�DӾ��/G��x��>j���o���q#c�|��1��E�~��t
+:_���. 2���nR*΄L