pg 0.18.0.pre20141117110243 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c38798c2c575b68ddd6cbcd8ffa69e48d4f68e8
-  data.tar.gz: 2bc57c9c2cb300fc235cbe8697df41c19df6b82b
+  metadata.gz: e975ac4cb7b86a878bbc8d5a92a106c2096e4edb
+  data.tar.gz: 9a4406e5063886d701248da53c759704b7c9f474
 SHA512:
-  metadata.gz: 6cef983c3e4713dcbf77e8231e958d8b908c608054bd4fad608ce60707c9141b66092038db1021bc55837519c502579a5eb5de37e97d8b6a72dd5fa2241dcbb2
-  data.tar.gz: bb84463d82747afaaf08d9a1bf63d1c53d4807278d6756261fd74109bea127a067ffa956187dee6b67d8ff9c2f1a58ccfeff8b0d308b2701185fec387fa26e51
+  metadata.gz: 642968ad5ff9e3b9cae890b553c78c8ca8bd068fa9398e4248b3dc3e93553fed92e21ee73dda6cae477a2531b129c87b45d41af61630b002b4d55c829bac493d
+  data.tar.gz: 379f3e798b2d974d115478bbb5cf1f2bc067f1361150055a107054332de4d0238de6f0027ee0071b378cb738835a22e4d6c44f92da4d7f00f8f5cfd28fc31850

data/ChangeLog

@@ -1,8 +1,93 @@
+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]
+
+2014-12-13  Lars Kanis  <lars@greiz-reinsdorf.de>
+
+	* ext/pg_type_map_in_ruby.c:
+	Fix TypeMapInRuby for Rubinius.
+	[a38cf53a96f1]
+
+2014-12-12  Lars Kanis  <lars@greiz-reinsdorf.de>
+
+	* ext/pg_type_map_all_strings.c:
+	Fix documentation to TypeMapAllStrings.
+	[c53f993a4254]
+
+	* Manifest.txt, ext/pg.c, ext/pg.h, ext/pg_type_map_in_ruby.c,
+	spec/pg/type_map_in_ruby_spec.rb:
+	Add TypeMapInRuby as a way to combine fast but static C-based type
+	maps with flexible ruby based type maps.
+	[a9724aef9116]
+
+	* ext/pg_type_map.c, ext/pg_type_map_by_oid.c,
+	lib/pg/basic_type_mapping.rb, spec/pg/basic_type_mapping_spec.rb,
+	spec/pg/type_map_by_oid_spec.rb, spec/pg/type_map_spec.rb:
+	Remove TypeMap#fit_to_result and #fit_to_query.
+
+	The only use case so far is building a TypeMapByColumn out of a
+	TypeMapByOid, which is now named more explicitly as
+	#build_column_map .
+	[c99d26015e3c]
+
+	* ext/pg_text_encoder.c:
+	Remove unused variable.
+	[1a13e7eafeb7]
+
+	* ext/pg_connection.c, ext/pg_copy_coder.c, lib/pg/connection.rb:
+	Several documentation fixes to COPY coders.
+	[a7befacdef4e]
+
+2014-11-26  Lars Kanis  <lars@greiz-reinsdorf.de>
+
+	* ext/pg_text_encoder.c, spec/pg/type_spec.rb:
+	PG::TextDecoder::Boolean: encode only true, false, 0 and 1 and pass
+	all other values as strings to the server.
+	[6b86a5543567]
+
+2014-11-24  Lars Kanis  <kanis@comcard.de>
+
+	* spec/pg/type_map_by_class_spec.rb:
+	Fix test case for rbx. The error message is somewhat different than
+	in MRI.
+	[99638547f8b4]
+
+2014-11-21  Lars Kanis  <lars@greiz-reinsdorf.de>
+
+	* ext/pg_text_decoder.c:
+	Stack memory can be used for Identifier decoding, since they are
+	limited in size.
+	[b7f9daeeba29]
+
+2014-11-17  Lars Kanis  <kanis@comcard.de>
+
+	* .travis.yml:
+	Revert "Remove Rubinius from the allowed failure list - failing
+	specs are now marked as pending."
+
+	This reverts commit 524c84ccd17f3caeed13a16084206f14225bbdd6 because
+	of ongoing issues with gem installation on rbx.
+	[b8debfea4331]
+
+	* ext/pg.h, ext/pg_errors.c, ext/pg_result.c, spec/pg/result_spec.rb:
+	Use dedicated error classes for stream exceptions.
+	[f23dd01bcb52]
+
+	* History.rdoc, ext/pg.c, spec/pg_spec.rb:
+	Add PG.init_openssl and PG.init_ssl methods.
+
+	This will hopefully help to solve issue #190:
+	https://bitbucket.org/ged/ruby-pg/issue/190
+	[45610159a246]
+
 2014-11-10  Lars Kanis  <lars@greiz-reinsdorf.de>
 
 	* ext/pg_type_map_by_class.c:
 	Fix typo.
-	[eeb8a82c5328] [tip]
+	[eeb8a82c5328]
 
 	* spec/pg/type_map_by_class_spec.rb:
 	TypeMapByClass: Add test for invlid coder object.
@@ -200,7 +285,7 @@
 
 	* ext/pg_text_encoder.c, spec/pg/type_spec.rb:
 	Allow non Array values as input for TextEncoder::Array.
-	[a4725dfca9e4]
+	[a4725dfca9e4] [github/master]
 
 	* ext/pg_coder.c, spec/pg/type_spec.rb:
 	Clarify handling of nil/NULL values by PG::Coders.
@@ -1655,12 +1740,6 @@
 	Merged with 4cc778c5ead7
 	[67bb0f34ca05]
 
-2014-08-20  Michael Granger  <ged@FaerieMUD.org>
-
-	* spec/helpers.rb, spec/pg/connection_spec.rb:
-	Check connection status with a matcher in specs
-	[b32840b98e4b]
-
 2014-10-09  Lars Kanis  <lars@greiz-reinsdorf.de>
 
 	* Rakefile, Rakefile.cross, ext/extconf.rb:
@@ -1736,6 +1815,10 @@
 
 2014-08-20  Michael Granger  <ged@FaerieMUD.org>
 
+	* spec/helpers.rb, spec/pg/connection_spec.rb:
+	Check connection status with a matcher in specs
+	[b32840b98e4b]
+
 	* ext/pg_connection.c, lib/pg/connection.rb,
 	spec/pg/connection_spec.rb:
 	Implement PG::Connection#conninfo and use it to test #188
@@ -1760,17 +1843,19 @@
 	* Merge with 6c2444dc63e1
 	[d7160a9fb5dc]
 
-	* .rvm.gems, Rakefile, spec/helpers.rb, spec/lib/helpers.rb,
-	spec/pg/connection_spec.rb, spec/pg/result_spec.rb, spec/pg_spec.rb:
-	Convert specs to expect syntax for RSpec 3
-	[c9108c846ab2]
-
 2013-12-30  Lars Kanis  <lars@greiz-reinsdorf.de>
 
 	* ext/pg_connection.c:
 	Fix typo in documentation.
 	[6c2444dc63e1]
 
+2014-06-05  Michael Granger  <ged@FaerieMUD.org>
+
+	* .rvm.gems, Rakefile, spec/helpers.rb, spec/lib/helpers.rb,
+	spec/pg/connection_spec.rb, spec/pg/result_spec.rb, spec/pg_spec.rb:
+	Convert specs to expect syntax for RSpec 3
+	[c9108c846ab2]
+
 2013-12-18  Michael Granger  <ged@FaerieMUD.org>
 
 	* .hgtags:
@@ -2505,13 +2590,13 @@
 	PQexecParams() itself.
 
 	Thanks to Aaron Patterson for the idea.
-	[7c313c2355b7]
+	[7c313c2355b7] [github/exec_params]
 
 2013-01-31  Michael Granger  <ged@FaerieMUD.org>
 
 	* ext/extconf.rb:
 	Add experimental -rpath to the LDFLAGS
-	[8496c624dffd]
+	[8496c624dffd] [github/rpath_ldflag]
 
 2013-01-30  Michael Granger  <ged@FaerieMUD.org>
 

data/History.rdoc

@@ -1,4 +1,4 @@
-== v0.18.0 [unreleased]
+== v0.18.0 [2015-01-01] Michael Granger <ged@FaerieMUD.org>
 
 Bugfixes:
 - Fix OID to Integer mapping (it is unsigned now). #187
@@ -19,6 +19,7 @@ Enhancements:
 - Update Windows cross build to PostgreSQL 9.3.
 
 
+
 == v0.17.1 [2013-12-18] Michael Granger <ged@FaerieMUD.org>
 
 Bugfixes:

data/Manifest.txt

@@ -29,12 +29,13 @@ ext/pg_errors.c
 ext/pg_result.c
 ext/pg_text_decoder.c
 ext/pg_text_encoder.c
+ext/pg_type_map.c
 ext/pg_type_map_all_strings.c
 ext/pg_type_map_by_class.c
 ext/pg_type_map_by_column.c
 ext/pg_type_map_by_mri_type.c
 ext/pg_type_map_by_oid.c
-ext/pg_type_map.c
+ext/pg_type_map_in_ruby.c
 ext/util.c
 ext/util.h
 ext/vc/pg.sln
@@ -78,6 +79,7 @@ spec/pg/type_map_by_class_spec.rb
 spec/pg/type_map_by_column_spec.rb
 spec/pg/type_map_by_mri_type_spec.rb
 spec/pg/type_map_by_oid_spec.rb
+spec/pg/type_map_in_ruby_spec.rb
 spec/pg/type_map_spec.rb
 spec/pg/type_spec.rb
 spec/pg_spec.rb

data/Rakefile

@@ -29,6 +29,8 @@ TMPDIR  = BASEDIR + 'tmp'
 DLEXT   = RbConfig::CONFIG['DLEXT']
 EXT     = LIBDIR + "pg_ext.#{DLEXT}"
 
+GEMSPEC = 'pg.gemspec'
+
 TEST_DIRECTORY = BASEDIR + "tmp_test_specs"
 
 CLOBBER.include( TEST_DIRECTORY.to_s )
@@ -187,3 +189,18 @@ file 'ext/pg_errors.c' => ['ext/errorcodes.def'] do
 	# trigger compilation of changed errorcodes.def
 	touch 'ext/pg_errors.c'
 end
+
+task :gemspec => GEMSPEC
+file GEMSPEC => __FILE__
+task GEMSPEC do |task|
+	spec = $hoespec.spec
+	spec.files.delete( '.gemtest' )
+	spec.version = "#{spec.version}.pre#{Time.now.strftime("%Y%m%d%H%M%S")}"
+	File.open( task.name, 'w' ) do |fh|
+		fh.write( spec.to_ruby )
+	end
+end
+
+CLOBBER.include( GEMSPEC.to_s )
+task :default => :gemspec
+

data/ext/pg.c

@@ -1,6 +1,6 @@
 /*
  * pg.c - Toplevel extension
- * $Id$
+ * $Id: pg.c,v a9724aef9116 2014/12/12 21:03:27 lars $
  *
  * Author/s:
  *
@@ -655,6 +655,7 @@ Init_pg_ext()
 	init_pg_type_map_by_column();
 	init_pg_type_map_by_mri_type();
 	init_pg_type_map_by_oid();
+	init_pg_type_map_in_ruby();
 	init_pg_coder();
 	init_pg_text_encoder();
 	init_pg_text_decoder();

data/ext/pg.h

@@ -302,6 +302,7 @@ void init_pg_type_map_by_class                         _(( void ));
 void init_pg_type_map_by_column                        _(( void ));
 void init_pg_type_map_by_mri_type                      _(( void ));
 void init_pg_type_map_by_oid                           _(( void ));
+void init_pg_type_map_in_ruby                          _(( void ));
 void init_pg_coder                                     _(( void ));
 void init_pg_copycoder                                 _(( void ));
 void init_pg_text_encoder                              _(( void ));

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 185638b52684 2014/11/08 20:43:53 lars $
  *
  */
 

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 ac23631c96d9 2014/10/14 11:50:21 lars $
  *
  */
 

data/ext/pg_connection.c

@@ -1,6 +1,6 @@
 /*
  * pg_connection.c - PG::Connection class extension
- * $Id$
+ * $Id: pg_connection.c,v a7befacdef4e 2014/12/12 20:57:14 lars $
  *
  */
 
@@ -2542,10 +2542,10 @@ pgconn_wait_for_notify(int argc, VALUE *argv, VALUE self)
  * not sent (false is only possible if the connection
  * is in nonblocking mode, and this command would block).
  *
- * encoder can be a PG::Coder derivation (typically PG::TestEncoder::CopyRow).
+ * encoder can be a PG::Coder derivation (typically PG::TextEncoder::CopyRow).
  * This encodes the received data fields from an Array of Strings. Optionally
  * the encoder can type cast the fields form various Ruby types in one step,
- * if PG::TestEncoder::CopyRow#type_map is set accordingly.
+ * if PG::TextEncoder::CopyRow#type_map is set accordingly.
  *
  * Raises an exception if an error occurs.
  *
@@ -2654,10 +2654,10 @@ pgconn_put_copy_end(int argc, VALUE *argv, VALUE self)
  * if the copy is done, or +false+ if the call would
  * block (only possible if _async_ is true).
  *
- * decoder can be a PG::Coder derivation (typically PG::TestDecoder::CopyRow).
+ * decoder can be a PG::Coder derivation (typically PG::TextDecoder::CopyRow).
  * This decodes the received data fields as Array of Strings. Optionally
  * the decoder can type cast the fields to various Ruby types in one step,
- * if PG::TestDecoder::CopyRow#type_map is set accordingly.
+ * if PG::TextDecoder::CopyRow#type_map is set accordingly.
  *
  * See also #copy_data.
  *

data/ext/pg_copy_coder.c

@@ -153,12 +153,20 @@ pg_copycoder_type_map_get(VALUE self)
  * See the {COPY command}[http://www.postgresql.org/docs/current/static/sql-copy.html]
  * for description of the format.
  *
- * It is intended to be used in conjunction with PG::Connection#copy_data .
+ * It is intended to be used in conjunction with PG::Connection#put_copy_data .
  *
  * The columns are expected as Array of values. The single values are encoded as defined
  * in the assigned #type_map. If no type_map was assigned, all values are converted to
- * Strings by PG::TextEncoder::String.
+ * strings by PG::TextEncoder::String.
  *
+ * Example with default type map ( TypeMapAllStrings ):
+ *   conn.exec "create table my_table (a text,b int,c bool)"
+ *   enco = PG::TextEncoder::CopyRow.new
+ *   conn.copy_data "COPY my_table FROM STDIN", enco do
+ *     conn.put_copy_data ["astring", 7, false]
+ *     conn.put_copy_data ["string2", 42, true]
+ *   end
+ * This creates +my_table+ and inserts two rows.
  */
 static int
 pg_text_enc_copy_row(t_pg_coder *conv, VALUE value, char *out, VALUE *intermediate)
@@ -286,12 +294,22 @@ GetDecimalFromHex(char hex)
  * See the {COPY command}[http://www.postgresql.org/docs/current/static/sql-copy.html]
  * for description of the format.
  *
- * It is intended to be used in conjunction with PG::Connection#copy_data .
+ * It is intended to be used in conjunction with PG::Connection#get_copy_data .
  *
  * The columns are retrieved as Array of values. The single values are decoded as defined
  * in the assigned #type_map. If no type_map was assigned, all values are converted to
- * Strings by PG::TextDecoder::String.
+ * strings by PG::TextDecoder::String.
  *
+ * Example with default type map ( TypeMapAllStrings ):
+ *   deco = PG::TextDecoder::CopyRow.new
+ *   conn.copy_data "COPY my_table TO STDOUT", deco do
+ *     while row=conn.get_copy_data
+ *       p row
+ *     end
+ *   end
+ * This prints all rows of +my_table+ to stdout:
+ *   ["astring", "7", "f"]
+ *   ["string2", "42", "t"]
  */
 /*
  * Parse the current line into separate attributes (fields),
@@ -534,8 +552,10 @@ init_pg_copycoder()
 	rb_define_alloc_func( rb_cPG_CopyDecoder, pg_copycoder_decoder_allocate );
 
 	/* Make RDoc aware of the encoder classes... */
+	/* rb_mPG_TextEncoder = rb_define_module_under( rb_mPG, "TextEncoder" ); */
 	/* dummy = rb_define_class_under( rb_mPG_TextEncoder, "CopyRow", rb_cPG_CopyEncoder ); */
 	pg_define_coder( "CopyRow", pg_text_enc_copy_row, rb_cPG_CopyEncoder, rb_mPG_TextEncoder );
+	/* rb_mPG_TextDecoder = rb_define_module_under( rb_mPG, "TextDecoder" ); */
 	/* dummy = rb_define_class_under( rb_mPG_TextDecoder, "CopyRow", rb_cPG_CopyDecoder ); */
 	pg_define_coder( "CopyRow", pg_text_dec_copy_row, rb_cPG_CopyDecoder, rb_mPG_TextDecoder );
 }

data/ext/pg_result.c

@@ -1,6 +1,6 @@
 /*
  * pg_result.c - PG::Result class extension
- * $Id$
+ * $Id: pg_result.c,v f23dd01bcb52 2014/11/17 10:47:53 kanis $
  *
  */
 

data/ext/pg_text_decoder.c

@@ -1,6 +1,6 @@
 /*
  * pg_text_decoder.c - PG::TextDecoder module
- * $Id$
+ * $Id: pg_text_decoder.c,v b7f9daeeba29 2014/11/21 19:53:47 lars $
  *
  */
 
@@ -313,8 +313,8 @@ pg_text_dec_identifier(t_pg_coder *conv, char *val, int len, int tuple, int fiel
 	VALUE elem;
 	int word_index = 0;
 	int index;
-	/* create a buffer of the same length, as that will be the worst case */
-	char *word = xmalloc(len + 1);
+	/* Use a buffer of the same length, as that will be the worst case */
+	char word[len + 1];
 
 	/* The current character in the input string. */
 	char c;
@@ -356,8 +356,6 @@ pg_text_dec_identifier(t_pg_coder *conv, char *val, int len, int tuple, int fiel
 	elem = dec_func(conv, word, word_index, tuple, field, enc_idx);
 	rb_ary_push(array, elem);
 
-	free(word);
-
 	return array;
 }
 

data/ext/pg_text_encoder.c

@@ -1,6 +1,6 @@
 /*
  * pg_text_encoder.c - PG::TextEncoder module
- * $Id$
+ * $Id: pg_text_encoder.c,v 1a13e7eafeb7 2014/12/12 20:57:39 lars $
  *
  */
 
@@ -47,8 +47,8 @@
 VALUE rb_mPG_TextEncoder;
 static ID s_id_encode;
 static ID s_id_to_i;
-static VALUE hash_false_values;
 
+static int pg_text_enc_integer(t_pg_coder *this, VALUE value, char *out, VALUE *intermediate);
 
 VALUE
 pg_obj_to_i( VALUE value )
@@ -68,38 +68,37 @@ pg_obj_to_i( VALUE value )
  *
  * This is the encoder class for the PostgreSQL bool type.
  *
- * Ruby values false, 0, '0', 'f', 'F', 'false', 'FALSE', 'off' and 'OFF'
- * are encoded as SQL +FALSE+ value. nil is sent as SQL +NULL+.
- * Any other values are encoded as SQL +TRUE+ .
+ * Ruby value false is encoded as SQL +FALSE+ value.
+ * Ruby value true is encoded as SQL +TRUE+ value.
+ * Any other value is sent as it's string representation.
  *
  */
 static int
-pg_text_enc_boolean(t_pg_coder *conv, VALUE value, char *out, VALUE *intermediate)
+pg_text_enc_boolean(t_pg_coder *this, VALUE value, char *out, VALUE *intermediate)
 {
-	if(out){
-		switch( TYPE(value) ){
-			case T_FALSE:
-				*out = 'f';
-				break;
-			case T_FIXNUM:
-			case T_BIGNUM:
-				if( NUM2LONG(value) == 0 ){
-					*out = 'f';
-				} else {
-					*out = 't';
-				}
-				break;
-			case T_STRING:
-				if( rb_hash_lookup(hash_false_values, value) == Qtrue ){
-					*out = 'f';
-					break;
-				}
-				/* fall through */
-			default:
-				*out = 't';
-		}
+	switch( TYPE(value) ){
+		case T_FALSE:
+			if(out) *out = 'f';
+			return 1;
+		case T_TRUE:
+			if(out) *out = 't';
+			return 1;
+		case T_FIXNUM:
+		case T_BIGNUM:
+			if( NUM2LONG(value) == 0 ){
+				if(out) *out = '0';
+				return 1;
+			} else if( NUM2LONG(value) == 1 ){
+				if(out) *out = '1';
+				return 1;
+			} else {
+				return pg_text_enc_integer(this, value, out, intermediate);
+			}
+		default:
+			return pg_coder_enc_to_s(this, value, out, intermediate);
 	}
-	return 1;
+	/* never reached */
+	return 0;
 }
 
 
@@ -638,16 +637,6 @@ init_pg_text_encoder()
 	s_id_encode = rb_intern("encode");
 	s_id_to_i = rb_intern("to_i");
 
-	hash_false_values = rb_hash_new();
-	rb_gc_register_address( &hash_false_values );
-	rb_hash_aset( hash_false_values, rb_str_new2( "0" ), Qtrue );
-	rb_hash_aset( hash_false_values, rb_str_new2( "f" ), Qtrue );
-	rb_hash_aset( hash_false_values, rb_str_new2( "F" ), Qtrue );
-	rb_hash_aset( hash_false_values, rb_str_new2( "false" ), Qtrue );
-	rb_hash_aset( hash_false_values, rb_str_new2( "FALSE" ), Qtrue );
-	rb_hash_aset( hash_false_values, rb_str_new2( "off" ), Qtrue );
-	rb_hash_aset( hash_false_values, rb_str_new2( "OFF" ), Qtrue );
-
 	/* This module encapsulates all encoder classes with text output format */
 	rb_mPG_TextEncoder = rb_define_module_under( rb_mPG, "TextEncoder" );