pg 1.4.0 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de283e26d9b321e332b3a0cfb7528a169c85c6842b45eed15a11dceafff0c51c
-  data.tar.gz: 32969355bf10d56fcc23611b5906c93315acd90dc718c13db77adb5358e8a2c6
+  metadata.gz: 4978742f10cf7b28bae9bb25698563f13a116bbf2aebd503063dd28f2b3e128b
+  data.tar.gz: '076801209c5d5e3f49e7bebe46a2bf86c806d8150313a0248649942b81b932bc'
 SHA512:
-  metadata.gz: 9c85938f84751d4720b1419cf17cc089804f6ae64af363078267e784a04a99b04e8c5448d5ac349afb833254e8991f619fe2b3eb2492e2b91fdd446c2f42797a
-  data.tar.gz: 96777364ae066e8a06b0c0d589752f4f328fd17066b7888663f45798207a6737c68fef01fa10cba6ae7f210a7f6dd8c55210039cbd4d9b71b91a709b3a052fdd
+  metadata.gz: c9e28051c8929433b47b41aaf1fbabf2b708f28044307b66d133da0f6fc2192582a7dda52e4b23ffc9cf2d22bec0a5c7456265331ba1a885828eac99496e0d6d
+  data.tar.gz: e5a99bb04b80c6dc2628c72f79b6ce07aa1f15b10dc53ab71f1a5d667bf349171e31611c6217075f3475d611e905db4103f3f5553f2b9bf9a576d857b346f1f2

checksums.yaml.gz.sig

@@ -1,2 +1,3 @@
-��aD���ns�ScĬ�0h�,�Ë;�&[\*��h�U6�����†J�'�F��\j
�yP����~�"��6Ǝ�����B\H,���LP!>ݢ��=�����/y��f+��k�4�M]�`�AEa����yH�22yˎ�p���I�Gz�A�KѻT���z��u@�
-��j�+>\��!I�jh灀����'�c{���?V߇o�Z#eKj�v�����	����;)�
+?��	hSẃ�5r��'p�*�\V�����c�4^��f
�<����u��S��b��*\�Ԟ�$l��sC��l$ĬD9�.M듹����*�d���Mf��D�	�������k��p=�FM�
+���
��曏A�U^Л�9'��N�@}x�Jv
+=2C�W7�sG�@���4�X�{��BQ��6-��b�-Q�V� y�P�������k�[�<!���'�͢�6e;b��6�R�G�y+�\�}�
���x�>_
�_�
�>�J	��z�僕�[ц]��R���fW&Z%s���#��%:@�X'�!k��[$�z.�,8��FB50U	y���w�+T-)ۑ�곛q*%�q0AS�{�\p���b*�

data/History.rdoc

@@ -1,4 +1,26 @@
-== v1.4.0 [YYYY-MM-DD] Lars Kanis <lars@greiz-reinsdorf.de>
+== v1.4.3 [2022-08-09] Lars Kanis <lars@greiz-reinsdorf.de>
+
+- Avoid memory bloat possible in put_copy_data in pg-1.4.0 to 1.4.2. #473
+- Use Encoding::BINARY for JOHAB, removing some useless code. #472
+
+
+== v1.4.2 [2022-07-27] Lars Kanis <lars@greiz-reinsdorf.de>
+
+Bugfixes:
+
+- Properly handle empty host parameter when connecting. #471
+- Update Windows fat binary gem to OpenSSL-1.1.1q.
+
+
+== v1.4.1 [2022-06-24] Lars Kanis <lars@greiz-reinsdorf.de>
+
+Bugfixes:
+
+- Fix another ruby-2.7 keyword warning. #465
+- Allow PG::Error to be created without arguments. #466
+
+
+== v1.4.0 [2022-06-20] Lars Kanis <lars@greiz-reinsdorf.de>
 
 Added:
 

data/Rakefile.cross

@@ -31,7 +31,7 @@ class CrossLibrary < OpenStruct
 		self.host_platform              = toolchain
 
 		# Cross-compilation constants
-		self.openssl_version            = ENV['OPENSSL_VERSION'] || '1.1.1o'
+		self.openssl_version            = ENV['OPENSSL_VERSION'] || '1.1.1q'
 		self.postgresql_version         = ENV['POSTGRESQL_VERSION'] || '14.4'
 
 		# Check if symlinks work in the current working directory.

data/ext/pg.c

@@ -127,26 +127,6 @@ const char * const (pg_enc_pg2ruby_mapping[][2]) = {
 static struct st_table *enc_pg2ruby;
 
 
-/*
- * Look up the JOHAB encoding, creating it as a dummy encoding if it's not
- * already defined.
- */
-static rb_encoding *
-pg_find_or_create_johab(void)
-{
-	static const char * const aliases[] = { "JOHAB", "Windows-1361", "CP1361" };
-	int enc_index;
-	size_t i;
-
-	for (i = 0; i < sizeof(aliases)/sizeof(aliases[0]); ++i) {
-		enc_index = rb_enc_find_index(aliases[i]);
-		if (enc_index > 0) return rb_enc_from_index(enc_index);
-	}
-
-	enc_index = rb_define_dummy_encoding(aliases[0]);
-	return rb_enc_from_index(enc_index);
-}
-
 /*
  * Return the given PostgreSQL encoding ID as an rb_encoding.
  *
@@ -187,10 +167,6 @@ pg_get_pg_encname_as_rb_encoding( const char *pg_encname )
 			return rb_enc_find( pg_enc_pg2ruby_mapping[i][1] );
 	}
 
-	/* JOHAB isn't a builtin encoding, so make up a dummy encoding if it's seen */
-	if ( strncmp(pg_encname, "JOHAB", 5) == 0 )
-		return pg_find_or_create_johab();
-
 	/* Fallthrough to ASCII-8BIT */
 	return rb_ascii8bit_encoding();
 }

data/ext/pg_connection.c

@@ -266,6 +266,7 @@ pgconn_s_allocate( VALUE klass )
 	this->encoder_for_put_copy_data = Qnil;
 	this->decoder_for_get_copy_data = Qnil;
 	this->trace_stream = Qnil;
+	rb_ivar_set(self, rb_intern("@calls_to_put_copy_data"), INT2FIX(0));
 
 	return self;
 }

data/ext/pg_result.c

@@ -1476,10 +1476,10 @@ pgresult_stream_any(VALUE self, void (*yielder)(VALUE, int, int, void*), void* d
 
 		pgresult = gvl_PQgetResult(pgconn);
 		if( pgresult == NULL )
-			rb_raise( rb_eNoResultError, "no result received - possibly an intersection with another result retrieval");
+			rb_raise( rb_eNoResultError, "no result received - possibly an intersection with another query");
 
 		if( nfields != PQnfields(pgresult) )
-			rb_raise( rb_eInvalidChangeOfResultFields, "number of fields must not change in single row mode");
+			rb_raise( rb_eInvalidChangeOfResultFields, "number of fields changed in single row mode from %d to %d - this is a sign for intersection with another query", nfields, PQnfields(pgresult));
 
 		this->pgresult = pgresult;
 	}

data/lib/pg/connection.rb

@@ -408,7 +408,17 @@ class PG::Connection
 	# See also #copy_data.
 	#
 	def put_copy_data(buffer, encoder=nil)
+		# sync_put_copy_data does a non-blocking attept to flush data.
 		until res=sync_put_copy_data(buffer, encoder)
+			# It didn't flush immediately and allocation of more buffering memory failed.
+			# Wait for all data sent by doing a blocking flush.
+			res = flush
+		end
+
+		# And do a blocking flush every 100 calls.
+		# This is to avoid memory bloat, when sending the data is slower than calls to put_copy_data happen.
+		if (@calls_to_put_copy_data += 1) > 100
+			@calls_to_put_copy_data = 0
 			res = flush
 		end
 		res
@@ -431,6 +441,7 @@ class PG::Connection
 		until sync_put_copy_end(*args)
 			flush
 		end
+		@calls_to_put_copy_data = 0
 		flush
 	end
 	alias async_put_copy_end put_copy_end
@@ -657,8 +668,8 @@ class PG::Connection
 		# connection will have its +client_encoding+ set accordingly.
 		#
 		# Raises a PG::Error if the connection fails.
-		def new(*args, **kwargs)
-			conn = connect_to_hosts(*args, **kwargs)
+		def new(*args)
+			conn = connect_to_hosts(*args)
 
 			if block_given?
 				begin
@@ -699,7 +710,7 @@ class PG::Connection
 					c = connect_internal(oopts, errors)
 					return c if c
 				end
-			elsif iopts[:host]
+			elsif iopts[:host] && !iopts[:host].empty?
 				# Resolve DNS in Ruby to avoid blocking state while connecting, when it ...
 				ihosts = iopts[:host].split(",", -1)
 

data/lib/pg/exceptions.rb

@@ -7,7 +7,7 @@ require 'pg' unless defined?( PG )
 module PG
 
 	class Error < StandardError
-		def initialize(msg, connection: nil, result: nil)
+		def initialize(msg=nil, connection: nil, result: nil)
 			@connection = connection
 			@result = result
 			super(msg)

data/lib/pg/version.rb

@@ -1,4 +1,4 @@
 module PG
 	# Library version
-	VERSION = '1.4.0'
+	VERSION = '1.4.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.3
 platform: ruby
 authors:
 - Michael Granger
@@ -36,7 +36,7 @@ cert_chain:
   oL1mUdzB8KrZL4/WbG5YNX6UTtJbIOu9qEFbBAy4/jtIkJX+dlNoFwd4GXQW1YNO
   nA==
   -----END CERTIFICATE-----
-date: 2022-06-20 00:00:00.000000000 Z
+date: 2022-08-09 00:00:00.000000000 Z
 dependencies: []
 description: Pg is the Ruby interface to the PostgreSQL RDBMS. It works with PostgreSQL
   9.3 and later.