pg 0.18.1 → 0.18.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2a71f6279b6ff4b259ae30cb251f13841886614
-  data.tar.gz: 5e371bd632ff3e95e1ba4f1de1439c3582e52909
+  metadata.gz: c8807e5610f416a9fe9a4bcc597986c25a5c35b9
+  data.tar.gz: a98032311306661db24f48a69d847a1896a277fb
 SHA512:
-  metadata.gz: f46963607a119a3d9c247e4128ba99dfc6ee53994c138c69ee2582a8c0448553ec3cc9a2cfbd91a40f535e3c259ae1d1fbc84cea5fe263a402c07c16e0188dab
-  data.tar.gz: aa4714f8a7126960060582fb96e1550a77909ff0751f0b73e848abc2d51c75578ff8483951d3a236d7f26474e70128c86f29106caddb458b8027cf9028d6e1e8
+  metadata.gz: 882d2bda71c4946f3a0b72ffb8a8e31528411019dd531d472537c310f2e79c36e4bccd17280d359cf31f00e07b613b818ffb3e1f1d3df3c4a0d599c05d0d400e
+  data.tar.gz: 76e9118ba0e1f7e0577c1f86d5bb0c0a509000df3b8bf0fd4b1e169e34050f3849267e41066c4cd3e2f1d4d221e4a089a5466bc131debfafb675ff22c87525e2

data/ChangeLog

@@ -1,9 +1,176 @@
+2015-05-14  Michael Granger  <ged@FaerieMUD.org>
+
+	* .rvmrc:
+	Bump default rvm Ruby to 2.2
+	[128b075d5800] [tip]
+
+2015-03-13  Lars Kanis  <lars@greiz-reinsdorf.de>
+
+	* ext/pg_text_encoder.c, ext/util.c, ext/util.h:
+	Avoid possible symbol name clash when linking againt static libpq.
+
+	This should fix issue #209 .
+	[b859963462b2]
+
+2015-02-11  Lars Kanis  <lars@greiz-reinsdorf.de>
+
+	* ext/pg.c, spec/pg/connection_spec.rb:
+	Merge from git branch.
+	[b60c89ee93c8]
+
+	* ext/pg.h, ext/pg_text_decoder.c:
+	Merge branch 'non-c99-compiler'
+	[b111c84b8445]
+
+2015-02-06  Lars Kanis  <lars@greiz-reinsdorf.de>
+
+	* ext/extconf.rb, ext/pg.h, ext/pg_result.c, ext/pg_text_decoder.c,
+	ext/pg_type_map_by_mri_type.c:
+	Use fixed size arrays in case the compiler doesn't support C99
+	variable length arrays.
+
+	This is notably the MSVC compiler.
+
+	Note: The MSVC build environment is currently not tested on a
+	regular base, so is not fully supported.
+	[1269b8ad77b8]
+
+2015-02-11  Lars Kanis  <lars@greiz-reinsdorf.de>
+
+	* ext/pg_connection.c:
+	Replace quote_ident implementation with that of
+	PG::TextEncoder::Identifier .
+
+	This allowes quoation of array of strings in addition to plain
+	strings and removes duplicated code.
+
+	It also removes the 63 byte limitation and therefore obsolets pull
+	request #21 https://bitbucket.org/ged/ruby-pg/pull-request/21
+	[714601d05fba]
+
+	* ext/pg.c, ext/pg.h, ext/pg_text_decoder.c, ext/pg_text_encoder.c,
+	spec/pg/connection_spec.rb, spec/pg/type_spec.rb:
+	Derive PG::TextDecoder::Identifier from PG::SimpleDecoder instead of
+	CompositeDecoder
+
+	.. and equally for Encoder.
+
+	Identifiers are strings, so there is no good reason to compose it
+	from other element types. This change allows a faster quoting
+	implementation.
+	[df67241d1a4f]
+
+2015-02-03  Michael Granger  <ged@FaerieMUD.org>
+
+	* README.rdoc, ext/pg.c:
+	Update copyright notices
+	[447962e0dcba] [github/master]
+
+	* spec/pg/connection_spec.rb:
+	Whitespace fixes
+	[f4a85f78807d]
+
+2014-08-22  Chris Bandy  <bandy.chris@gmail.com>
+
+	* lib/pg/connection.rb, spec/pg/connection_spec.rb:
+	Allow URI connection string
+
+	(Imported from https://github.com/ged/ruby-pg/pull/3)
+	[d4579ef9eae4]
+
+2015-01-27  Lars Kanis  <lars@greiz-reinsdorf.de>
+
+	* lib/pg/text_decoder.rb, spec/pg/type_spec.rb:
+	Fix decoding of fractional timezones like "-00:25:21".
+	[766aa353b392]
+
+2015-01-27  Lars Kanis  <kanis@comcard.de>
+
+	* History.rdoc, lib/pg/text_decoder.rb, spec/pg/type_spec.rb:
+	Fix decoding of fractional timezones like "04:30".
+
+	This fixes https://bitbucket.org/ged/ruby-pg/issue/203 .
+	[33225805259c]
+
+2015-01-16  Lars Kanis  <kanis@comcard.de>
+
+	* History.rdoc, ext/extconf.rb, ext/pg_connection.c,
+	spec/pg/connection_spec.rb:
+	Revert "Add PG::Connection#hostaddr. This is new in PostgreSQL-9.4."
+
+	PQhostaddr was removed from final PostgreSQL-9.4.0.
+
+	This fixes issue #202 :https://bitbucket.org/ged/ruby-pg/issue/202
+
+	This reverts commit 03deab7aa63f9a00984014ce59617d552b4eac34.
+	[b51d736bca77]
+
+	* History.rdoc:
+	Add a missing enhancement for pg-0.18.0
+	[a7635c3425f3]
+
+	* .travis.yml:
+	Update ruby and postgresql versions for travic-ci
+	[b67b92f7db97]
+
+2015-01-06  Lars Kanis  <kanis@comcard.de>
+
+	* Merge from git.
+	[625e9359ac47]
+
+2015-01-05  Lars Kanis  <kanis@comcard.de>
+
+	* ext/pg_type_map_in_ruby.c:
+	Use a simpler fix for https://bitbucket.org/ged/ruby-
+	pg/commits/a38cf53a96f
+	[3d89d3aae4fd]
+
+2015-01-05  Michael Granger  <ged@FaerieMUD.org>
+
+	* .hgtags:
+	Added tag v0.18.1 for changeset f97dd6cb4f34
+	[f8122014065a]
+
+	* .hgsigs:
+	Added signature for changeset ba5aff64b5cb
+	[f97dd6cb4f34] [v0.18.1]
+
+	* History.rdoc, lib/pg.rb:
+	Bump the patch version, update history
+	[ba5aff64b5cb]
+
+	* Rakefile:
+	Fix the minimum Ruby version (closes #199)
+	[69422cc8dc45]
+
+2015-01-03  Michael Granger  <ged@FaerieMUD.org>
+
+	* .hgtags:
+	Added tag v0.18.0 for changeset cfb2bfc0f661
+	[8aff3973f2d2]
+
+	* .hgsigs:
+	Added signature for changeset c519766e3ec9
+	[cfb2bfc0f661] [v0.18.0]
+
+	* History.rdoc:
+	Update the History
+	[c519766e3ec9]
+
+	* Manifest.txt:
+	Keep the manifest sorted so it can be diffed.
+	[d7cdbfd1b516]
+
+	* Rakefile:
+	Add a Rake task for generating the gemspec
+	[ec6d6ce61a15]
+
 2014-12-26  Lars Kanis  <lars@greiz-reinsdorf.de>
 
 	* lib/pg/basic_type_mapping.rb:
 	Add a warning about Type OIDs without decoder in
 	PG::BasicTypeMapForResults.
-	[592e29cdf2e9] [tip]
+	[592e29cdf2e9]
 
 2014-12-13  Lars Kanis  <lars@greiz-reinsdorf.de>
 
@@ -285,7 +452,7 @@
 
 	* ext/pg_text_encoder.c, spec/pg/type_spec.rb:
 	Allow non Array values as input for TextEncoder::Array.
-	[a4725dfca9e4] [github/master]
+	[a4725dfca9e4]
 
 	* ext/pg_coder.c, spec/pg/type_spec.rb:
 	Clarify handling of nil/NULL values by PG::Coders.

data/History.rdoc

@@ -1,3 +1,18 @@
+== v0.18.2 [2015-05-14] Michael Granger <ged@FaerieMUD.org>
+
+Enhancements:
+
+- Allow URI connection string (thanks to Chris Bandy)
+
+Bugfixes:
+
+- Speedups and fixes for PG::TextDecoder::Identifier and quoting behavior
+- Revert addition of PG::Connection#hostaddr [#202].
+- Fix decoding of fractional timezones and timestamps [#203]
+- Fixes for non-C99 compilers
+- Avoid possible symbol name clash when linking againt static libpq.
+
+
 == v0.18.1 [2015-01-05] Michael Granger <ged@FaerieMUD.org>
 
 Correct the minimum compatible Ruby version to 1.9.3. #199
@@ -19,6 +34,7 @@ Enhancements:
 - Add Enumerator variant to PG::Result#each and #each_row.
 - Add PG::Connection#conninfo and #hostaddr.
 - Add PG.init_openssl and PG.init_ssl methods.
+- Add PG::Result.inspect
 - Force zero termination for all text strings that are given to libpq.
   It raises an ArgumentError if the string contains a null byte.
 - Update Windows cross build to PostgreSQL 9.3.

data/README.rdoc

@@ -130,7 +130,7 @@ Lars Kanis <lars@greiz-reinsdorf.de>.
 
 == Copying
 
-Copyright (c) 1997-2013 by the authors.
+Copyright (c) 1997-2015 by the authors.
 
 * Jeff Davis <ruby-pg@j-davis.com>
 * Guy Decoux (ts) <decoux@moulon.inra.fr>

data/ext/extconf.rb

@@ -73,7 +73,6 @@ have_func 'PQlibVersion'
 have_func 'PQping'
 have_func 'PQsetSingleRowMode'
 have_func 'PQconninfo'
-have_func 'PQhostaddr'
 
 have_func 'rb_encdb_alias'
 have_func 'rb_enc_alias'
@@ -95,6 +94,10 @@ $defs.push( "-DHAVE_ST_NOTIFY_EXTRA" ) if
 have_header 'unistd.h'
 have_header 'ruby/st.h' or have_header 'st.h' or abort "pg currently requires the ruby/st.h header"
 
+checking_for "C99 variable length arrays" do
+	$defs.push( "-DHAVE_VARIABLE_LENGTH_ARRAYS" ) if try_compile('void test_vla(int l){ int vla[l]; }')
+end
+
 create_header()
 create_makefile( "pg_ext" )
 

data/ext/pg.c

@@ -1,6 +1,6 @@
 /*
  * pg.c - Toplevel extension
- * $Id: pg.c,v a9724aef9116 2014/12/12 21:03:27 lars $
+ * $Id: pg.c,v b60c89ee93c8 2015/02/11 20:59:36 lars $
  *
  * Author/s:
  *
@@ -15,7 +15,7 @@
  * See Contributors.rdoc for the many additional fine people that have contributed
  * to this library over the years.
  *
- * Copyright (c) 1997-2012 by the authors.
+ * Copyright (c) 1997-2015 by the authors.
  *
  * You may redistribute this software under the same terms as Ruby itself; see
  * http://www.ruby-lang.org/en/LICENSE.txt or the LICENSE file in the source
@@ -252,7 +252,7 @@ pg_get_rb_encoding_as_pg_encoding( rb_encoding *enc )
  *   char *current_out, *end_capa;
  *   PG_RB_STR_NEW( string, current_out, end_capa );
  *   while( data_is_going_to_be_processed ){
- *     PG_RB_STR_ENSURE_CAPA( string, 2 current_out, end_capa );
+ *     PG_RB_STR_ENSURE_CAPA( string, 2, current_out, end_capa );
  *     *current_out++ = databyte1;
  *     *current_out++ = databyte2;
  *   }

data/ext/pg.h

@@ -133,6 +133,15 @@
 typedef long suseconds_t;
 #endif
 
+#if defined(HAVE_VARIABLE_LENGTH_ARRAYS)
+	#define PG_VARIABLE_LENGTH_ARRAY(type, name, len, maxlen) type name[(len)];
+#else
+	#define PG_VARIABLE_LENGTH_ARRAY(type, name, len, maxlen) \
+		type name[(maxlen)] = {(len)>(maxlen) ? (rb_raise(rb_eArgError, "Number of " #name " (%d) exceeds allowed maximum of " #maxlen, (len) ), (type)1) : (type)0};
+
+	#define PG_MAX_COLUMNS 4000
+#endif
+
 /* The data behind each PG::Connection object */
 typedef struct {
 	PGconn *pgconn;
@@ -313,6 +322,7 @@ VALUE lookup_error_class                               _(( const char * ));
 VALUE pg_bin_dec_bytea                                 _(( t_pg_coder*, char *, int, int, int, int ));
 VALUE pg_text_dec_string                               _(( t_pg_coder*, char *, int, int, int, int ));
 int pg_coder_enc_to_s                                  _(( t_pg_coder*, VALUE, char *, VALUE *));
+int pg_text_enc_identifier                             _(( t_pg_coder*, VALUE, char *, VALUE *));
 t_pg_coder_enc_func pg_coder_enc_func                  _(( t_pg_coder* ));
 t_pg_coder_dec_func pg_coder_dec_func                  _(( t_pg_coder*, int ));
 void pg_define_coder                                   _(( const char *, void *, VALUE, VALUE ));

data/ext/pg_connection.c

@@ -1,6 +1,6 @@
 /*
  * pg_connection.c - PG::Connection class extension
- * $Id: pg_connection.c,v a7befacdef4e 2014/12/12 20:57:14 lars $
+ * $Id: pg_connection.c,v 714601d05fba 2015/02/11 20:45:04 lars $
  *
  */
 
@@ -627,22 +627,6 @@ pgconn_host(VALUE self)
 	return rb_tainted_str_new2(host);
 }
 
-#ifdef HAVE_PQHOSTADDR
-/*
- * call-seq:
- *    conn.hostaddr()
- *
- * Returns the server numeric IP address of the connection.
- */
-static VALUE
-pgconn_hostaddr(VALUE self)
-{
-	char *hostaddr = PQhostaddr(pg_get_pgconn(self));
-	if (!hostaddr) return Qnil;
-	return rb_tainted_str_new2(hostaddr);
-}
-#endif
-
 /*
  * call-seq:
  *    conn.port()
@@ -3013,7 +2997,9 @@ pgconn_transaction(VALUE self)
 /*
  * call-seq:
  *    PG::Connection.quote_ident( str ) -> String
+ *    PG::Connection.quote_ident( array ) -> String
  *    conn.quote_ident( str ) -> String
+ *    conn.quote_ident( array ) -> String
  *
  * Returns a string that is safe for inclusion in a SQL query as an
  * identifier. Note: this is not a quote function for values, but for
@@ -3030,31 +3016,20 @@ pgconn_transaction(VALUE self)
  * Similarly, this function also protects against special characters,
  * and other things that might allow SQL injection if the identifier
  * comes from an untrusted source.
+ *
+ * If the parameter is an Array, then all it's values are separately quoted
+ * and then joined by a "." character. This can be used for identifiers in
+ * the form "schema"."table"."column" .
+ *
+ * This method is functional identical to the encoder PG::TextEncoder::Identifier .
+ *
  */
 static VALUE
 pgconn_s_quote_ident(VALUE self, VALUE in_str)
 {
 	VALUE ret;
-	char *str = StringValuePtr(in_str);
-	/* result size at most NAMEDATALEN*2 plus surrounding
-	 * double-quotes. */
-	char buffer[NAMEDATALEN*2+2];
-	unsigned int i=0,j=0;
-	unsigned int str_len = RSTRING_LENINT(in_str);
-
-	if(str_len >= NAMEDATALEN) {
-		rb_raise(rb_eArgError,
-			"Input string is longer than NAMEDATALEN-1 (%d)",
-			NAMEDATALEN-1);
-	}
-	buffer[j++] = '"';
-	for(i = 0; i < str_len && str[i]; i++) {
-		if(str[i] == '"')
-			buffer[j++] = '"';
-		buffer[j++] = str[i];
-	}
-	buffer[j++] = '"';
-	ret = rb_str_new(buffer,j);
+	pg_text_enc_identifier(NULL, in_str, NULL, &ret);
+
 	OBJ_INFECT(ret, in_str);
 	PG_ENCODING_SET_NOCHECK(ret, ENCODING_GET( rb_obj_class(self) == rb_cPGconn ? self : in_str ));
 
@@ -3835,9 +3810,6 @@ init_pg_connection()
 	rb_define_method(rb_cPGconn, "user", pgconn_user, 0);
 	rb_define_method(rb_cPGconn, "pass", pgconn_pass, 0);
 	rb_define_method(rb_cPGconn, "host", pgconn_host, 0);
-#ifdef HAVE_PQHOSTADDR
-	rb_define_method(rb_cPGconn, "hostaddr", pgconn_hostaddr, 0);
-#endif
 	rb_define_method(rb_cPGconn, "port", pgconn_port, 0);
 	rb_define_method(rb_cPGconn, "tty", pgconn_tty, 0);
 #ifdef HAVE_PQCONNINFO

data/ext/pg_result.c

@@ -1,6 +1,6 @@
 /*
  * pg_result.c - PG::Result class extension
- * $Id: pg_result.c,v f23dd01bcb52 2014/11/17 10:47:53 kanis $
+ * $Id: pg_result.c,v 1269b8ad77b8 2015/02/06 16:38:23 lars $
  *
  */
 
@@ -863,7 +863,7 @@ pgresult_each_row(VALUE self)
 	num_fields = PQnfields(this->pgresult);
 
 	for ( row = 0; row < num_rows; row++ ) {
-		VALUE row_values[num_fields];
+		PG_VARIABLE_LENGTH_ARRAY(VALUE, row_values, num_fields, PG_MAX_COLUMNS)
 
 		/* populate the row */
 		for ( field = 0; field < num_fields; field++ ) {
@@ -892,7 +892,7 @@ pgresult_values(VALUE self)
 	VALUE results = rb_ary_new2( num_rows );
 
 	for ( row = 0; row < num_rows; row++ ) {
-		VALUE row_values[num_fields];
+		PG_VARIABLE_LENGTH_ARRAY(VALUE, row_values, num_fields, PG_MAX_COLUMNS)
 
 		/* populate the row */
 		for ( field = 0; field < num_fields; field++ ) {
@@ -1176,7 +1176,7 @@ pgresult_stream_each_row(VALUE self)
 		}
 
 		for ( row = 0; row < ntuples; row++ ) {
-			VALUE row_values[nfields];
+			PG_VARIABLE_LENGTH_ARRAY(VALUE, row_values, nfields, PG_MAX_COLUMNS)
 			int field;
 
 			/* populate the row */

data/ext/pg_text_decoder.c

@@ -1,6 +1,6 @@
 /*
  * pg_text_decoder.c - PG::TextDecoder module
- * $Id: pg_text_decoder.c,v b7f9daeeba29 2014/11/21 19:53:47 lars $
+ * $Id: pg_text_decoder.c,v b111c84b8445 2015/02/11 20:54:03 lars $
  *
  */
 
@@ -293,7 +293,7 @@ pg_text_dec_array(t_pg_coder *conv, char *val, int len, int tuple, int field, in
 }
 
 /*
- * Document-class: PG::TextDecoder::Identifier < PG::CompositeDecoder
+ * Document-class: PG::TextDecoder::Identifier < PG::SimpleDecoder
  *
  * This is the decoder class for PostgreSQL identifiers.
  *
@@ -305,16 +305,13 @@ pg_text_dec_array(t_pg_coder *conv, char *val, int len, int tuple, int field, in
 static VALUE
 pg_text_dec_identifier(t_pg_coder *conv, char *val, int len, int tuple, int field, int enc_idx)
 {
-	t_pg_composite_coder *this = (t_pg_composite_coder *)conv;
-	t_pg_coder_dec_func dec_func = pg_coder_dec_func(this->elem, 0);
-
 	/* Return value: array */
 	VALUE array;
 	VALUE elem;
 	int word_index = 0;
 	int index;
 	/* Use a buffer of the same length, as that will be the worst case */
-	char word[len + 1];
+	PG_VARIABLE_LENGTH_ARRAY(char, word, len + 1, NAMEDATALEN)
 
 	/* The current character in the input string. */
 	char c;
@@ -331,7 +328,7 @@ pg_text_dec_identifier(t_pg_coder *conv, char *val, int len, int tuple, int fiel
 		if(c == '.' && openQuote < 2 ) {
 			word[word_index] = 0;
 
-			elem = dec_func(conv, word, word_index, tuple, field, enc_idx);
+			elem = pg_text_dec_string(conv, word, word_index, tuple, field, enc_idx);
 			rb_ary_push(array, elem);
 
 			openQuote = 0;
@@ -353,7 +350,7 @@ pg_text_dec_identifier(t_pg_coder *conv, char *val, int len, int tuple, int fiel
 	}
 
 	word[word_index] = 0;
-	elem = dec_func(conv, word, word_index, tuple, field, enc_idx);
+	elem = pg_text_dec_string(conv, word, word_index, tuple, field, enc_idx);
 	rb_ary_push(array, elem);
 
 	return array;
@@ -412,11 +409,11 @@ init_pg_text_decoder()
 	pg_define_coder( "String", pg_text_dec_string, rb_cPG_SimpleDecoder, rb_mPG_TextDecoder );
 	/* dummy = rb_define_class_under( rb_mPG_TextDecoder, "Bytea", rb_cPG_SimpleDecoder ); */
 	pg_define_coder( "Bytea", pg_text_dec_bytea, rb_cPG_SimpleDecoder, rb_mPG_TextDecoder );
+	/* dummy = rb_define_class_under( rb_mPG_TextDecoder, "Identifier", rb_cPG_SimpleDecoder ); */
+	pg_define_coder( "Identifier", pg_text_dec_identifier, rb_cPG_SimpleDecoder, rb_mPG_TextDecoder );
 
 	/* dummy = rb_define_class_under( rb_mPG_TextDecoder, "Array", rb_cPG_CompositeDecoder ); */
 	pg_define_coder( "Array", pg_text_dec_array, rb_cPG_CompositeDecoder, rb_mPG_TextDecoder );
-	/* dummy = rb_define_class_under( rb_mPG_TextDecoder, "Identifier", rb_cPG_CompositeDecoder ); */
-	pg_define_coder( "Identifier", pg_text_dec_identifier, rb_cPG_CompositeDecoder, rb_mPG_TextDecoder );
 	/* dummy = rb_define_class_under( rb_mPG_TextDecoder, "FromBase64", rb_cPG_CompositeDecoder ); */
 	pg_define_coder( "FromBase64", pg_text_dec_from_base64, rb_cPG_CompositeDecoder, rb_mPG_TextDecoder );
 }