pg 0.18.2-x86-mingw32 → 0.18.3-x86-mingw32

data/History.rdoc

@@ -1,3 +1,16 @@
+== v0.18.3 [2015-09-03] Michael Granger <ged@FaerieMUD.org>
+
+Enhancements:
+- Use rake-compiler-dock to build windows gems easily.
+- Add CI-tests on appveyor and fix test cases accordingly.
+
+Bugfixes:
+- Fix data type resulting in wrong base64 encoding.
+- Change instance_of checks to kind_of for subclassing. #220
+- TextDecoder::Date returns an actual Ruby Date instead of a Time
+  (thanks to Thomas Ramfjord)
+
+
 == v0.18.2 [2015-05-14] Michael Granger <ged@FaerieMUD.org>
 
 Enhancements:

data/README-Windows.rdoc

@@ -2,9 +2,9 @@
 
 In order to build this extension on MS Windows you will need a couple things.
 
-First, a compiler. For the one click installer this means you should either
-use VC++ 6.0 or the compiler that comes with cygwin or mingw if you're
-building on that platform.
+First, a compiler. For the one click installer this means you should use
+the DevKit or the compiler that comes with cygwin if you're building on that
+platform.
 
 If you've built Ruby yourself, you should use the same compiler to build
 this library that you used to build Ruby.
@@ -29,34 +29,23 @@ Adjust your path accordingly. BE SURE TO USE THE SHORT PATH NAMES! If you
 try to use a path with spaces in it, the nmake.exe program will choke.
 
 
-== Cross compiling for mswin32
+== Building binary 'pg' gems for MS Windows
 
-Using rake-compiler a cross compiled pg gem can be build on a Linux or MacOS X
-host for the win32 platform. The generated gem is statically linked against
-libpq and libssl. OpenSSL and PostgreSQL are downloaded and compiled from the
-sources. There are no runtime dependencies to any but the standard Windows
-DLLs.
+Binary gems for windows can be built on Linux, OS-X and even on Windows
+with the help of docker. This is how regular windows gems are built for
+rubygems.org .
 
-Install mingw32 using the instructions in rake-compiler's README.
-For Debian/Ubuntu it is <tt>apt-get install gcc-mingw32</tt> .
-Use ruby-1.8.7 for the following commands.
+To do this, install boot2docker [on Windows](https://github.com/boot2docker/windows-installer/releases)
+or [on OS X](https://github.com/boot2docker/osx-installer/releases) and make
+sure it is started. A native Docker installation is best on Linux.
 
-Download and cross compile ruby 1.8 and 1.9 for win32 with:
+Then run:
 
-	rake-compiler cross-ruby VERSION=1.8.7-p352
-	rake-compiler cross-ruby VERSION=1.9.2-p290
+	rake gem:windows
 
-Download and cross compile pg for win32:
-
-	rake cross native gem
-
-or with custom versions:
-
-	rake cross native gem RUBY_CC_VERSION=1.8.7:1.9.2 \
-	    OPENSSL_VERSION=1.0.0e POSTGRESQL_VERSION=9.1.1
-
-If everything works, there should be pg-VERSION-x86-mingw32.gem in the pkg
-directory.
+This will download a docker image suited for building windows gems, and it
+will download and build OpenSSL and PostgreSQL. Finally the gem is built
+containing binaries for all supported ruby versions.
 
 
 == Reporting Problems

data/README.rdoc

@@ -29,7 +29,8 @@ A small example usage:
 
 == Build Status
 
-{<img src="https://travis-ci.org/ged/ruby-pg.png?branch=master" alt="Build Status" />}[https://travis-ci.org/ged/ruby-pg]
+{<img src="https://travis-ci.org/ged/ruby-pg.png?branch=master" alt="Build Status Travis-CI" />}[https://travis-ci.org/ged/ruby-pg]
+{<img src="https://ci.appveyor.com/api/projects/status/at4g4swb2cd4xji7/branch/master?svg=true" alt="Build Status Appveyor" />}[https://ci.appveyor.com/api/projects/status/at4g4swb2cd4xji7/branch/master]
 
 
 == Requirements

data/Rakefile

@@ -61,6 +61,7 @@ $hoespec = Hoe.spec 'pg' do
 	self.developer 'Lars Kanis', 'lars@greiz-reinsdorf.de'
 
 	self.dependency 'rake-compiler', '~> 0.9', :developer
+	self.dependency 'rake-compiler-dock', '~> 0.3', :developer
 	self.dependency 'hoe', '~> 3.12', :developer
 	self.dependency 'hoe-deveiate', '~> 0.6', :developer
 	self.dependency 'hoe-bundler', '~> 1.0', :developer
@@ -150,6 +151,7 @@ file 'ChangeLog' do |task|
 	if File.exist?('.hg/branch')
 		$stderr.puts "Updating the changelog..."
 		begin
+			include Hoe::MercurialHelpers
 			content = make_changelog()
 		rescue NameError
 			abort "Packaging tasks require the hoe-mercurial plugin (gem install hoe-mercurial)"

data/Rakefile.cross

@@ -21,17 +21,28 @@ end
 class CrossLibrary < OpenStruct
 	include Rake::DSL
 
-	def initialize(for_platform, openssl_config)
+	def initialize(for_platform, openssl_config, toolchain)
 		super()
 
 		self.for_platform               = for_platform
 		self.openssl_config             = openssl_config
+		self.host_platform              = toolchain
 
 		# Cross-compilation constants
-		self.openssl_version            = ENV['OPENSSL_VERSION'] || '1.0.1i'
-		self.postgresql_version         = ENV['POSTGRESQL_VERSION'] || '9.3.5'
-
-		self.compile_home               = Pathname( "./build" ).expand_path
+		self.openssl_version            = ENV['OPENSSL_VERSION'] || '1.0.2d'
+		self.postgresql_version         = ENV['POSTGRESQL_VERSION'] || '9.4.4'
+
+		# Check if symlinks work in the current working directory.
+		# This fails, if rake-compiler-dock is running on a Windows box.
+		begin
+			FileUtils.rm_f '.test_symlink'
+			FileUtils.ln_s '/', '.test_symlink'
+		rescue SystemCallError
+			# Symlinks don't work -> use home directory instead
+			self.compile_home               = Pathname( "~/.ruby-pg-build" ).expand_path
+		else
+			self.compile_home               = Pathname( "./build" ).expand_path
+		end
 		self.static_sourcesdir          = compile_home + 'sources'
 		self.static_builddir            = compile_home + 'builds' + for_platform
 
@@ -67,17 +78,6 @@ class CrossLibrary < OpenStruct
 		self.postgresql_lib             = static_postgresql_libdir + 'libpq.dll'
 		self.postgresql_patches         = Rake::FileList[ (MISCDIR + "postgresql-#{postgresql_version}.*.patch").to_s ]
 
-		# Use rake-compilers config.yml to determine the toolchain that was used
-		# to build Ruby for this platform.
-		self.host_platform = begin
-			config_file = YAML.load_file(File.expand_path("~/.rake-compiler/config.yml"))
-			_, rbfile = config_file.find{|key, fname| key.start_with?("rbconfig-#{for_platform}-") }
-			IO.read(rbfile).match(/CONFIG\["CC"\] = "(.*)"/)[1].sub(/\-gcc/, '')
-		rescue
-			nil
-		end
-
-
 		# clean intermediate files and folders
 		CLEAN.include( static_builddir.to_s )
 
@@ -251,10 +251,10 @@ end
 
 if File.exist?(File.expand_path("~/.rake-compiler/config.yml"))
 	CrossLibraries = [
-		['i386-mingw32', 'mingw'],
-		['x64-mingw32', 'mingw64'],
-	].map do |platform, openssl_config|
-		CrossLibrary.new platform, openssl_config
+		['i386-mingw32', 'mingw', 'i686-w64-mingw32'],
+		['x64-mingw32', 'mingw64', 'x86_64-w64-mingw32'],
+	].map do |platform, openssl_config, toolchain|
+		CrossLibrary.new platform, openssl_config, toolchain
 	end
 else
 	$stderr.puts "Cross-compilation disabled -- rake-compiler not properly installed"
@@ -283,3 +283,19 @@ ENV['RUBY_CC_VERSION'].to_s.split(':').each do |ruby_version|
     sh "x86_64-w64-mingw32-strip -S tmp/x64-mingw32/stage/lib/#{ruby_version[/^\d+\.\d+/]}/pg_ext.so"
   end
 end
+
+desc "Build the windows binary gems"
+task 'gem:windows' => ['ChangeLog'] do
+  require 'rake_compiler_dock'
+
+  # Copy gem signing key and certs to be accessable from the docker container
+  mkdir_p 'build/gem'
+  sh "cp ~/.gem/gem-*.pem build/gem/"
+
+  RakeCompilerDock.sh <<-EOT
+    mkdir ~/.gem &&
+    cp build/gem/gem-*.pem ~/.gem/ &&
+    bundle install &&
+    rake cross native gem RUBYOPT=--disable-rubygems RUBY_CC_VERSION=1.9.3:2.0.0:2.1.6:2.2.2
+  EOT
+end

data/ext/pg.c

@@ -1,6 +1,6 @@
 /*
  * pg.c - Toplevel extension
- * $Id$
+ * $Id: pg.c,v b60c89ee93c8 2015/02/11 20:59:36 lars $
  *
  * Author/s:
  *

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 eb4d3c003bd6 2015/05/25 20:04:04 ged $
  *
  */
 
@@ -1534,7 +1534,7 @@ pgconn_s_escape(VALUE self, VALUE string)
 	Check_Type(string, T_STRING);
 
 	escaped = ALLOC_N(char, RSTRING_LEN(string) * 2 + 1);
-	if(rb_obj_class(self) == rb_cPGconn) {
+	if( rb_obj_is_kind_of(self, rb_cPGconn) ) {
 		size = PQescapeStringConn(pg_get_pgconn(self), escaped,
 			RSTRING_PTR(string), RSTRING_LEN(string), &error);
 		if(error) {
@@ -1547,7 +1547,7 @@ pgconn_s_escape(VALUE self, VALUE string)
 	result = rb_str_new(escaped, size);
 	xfree(escaped);
 	OBJ_INFECT(result, string);
-	PG_ENCODING_SET_NOCHECK(result, ENCODING_GET( rb_obj_class(self) == rb_cPGconn ? self : string ));
+	PG_ENCODING_SET_NOCHECK(result, ENCODING_GET( rb_obj_is_kind_of(self, rb_cPGconn) ? self : string ));
 
 	return result;
 }
@@ -1587,7 +1587,7 @@ pgconn_s_escape_bytea(VALUE self, VALUE str)
 	from      = (unsigned char*)RSTRING_PTR(str);
 	from_len  = RSTRING_LEN(str);
 
-	if(rb_obj_class(self) == rb_cPGconn) {
+	if ( rb_obj_is_kind_of(self, rb_cPGconn) ) {
 		to = PQescapeByteaConn(pg_get_pgconn(self), from, from_len, &to_len);
 	} else {
 		to = PQescapeBytea( from, from_len, &to_len);
@@ -3031,7 +3031,7 @@ pgconn_s_quote_ident(VALUE self, VALUE in_str)
 	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 ));
+	PG_ENCODING_SET_NOCHECK(ret, ENCODING_GET( rb_obj_is_kind_of(self, rb_cPGconn) ? self : in_str ));
 
 	return ret;
 }

data/ext/pg_result.c

@@ -1,6 +1,6 @@
 /*
  * pg_result.c - PG::Result class extension
- * $Id$
+ * $Id: pg_result.c,v 1269b8ad77b8 2015/02/06 16:38:23 lars $
  *
  */
 

data/ext/pg_text_decoder.c

@@ -1,6 +1,6 @@
 /*
  * pg_text_decoder.c - PG::TextDecoder module
- * $Id$
+ * $Id: pg_text_decoder.c,v b111c84b8445 2015/02/11 20:54:03 lars $
  *
  */
 

data/ext/pg_text_encoder.c

@@ -1,6 +1,6 @@
 /*
  * pg_text_encoder.c - PG::TextEncoder module
- * $Id$
+ * $Id: pg_text_encoder.c,v b859963462b2 2015/03/13 17:39:35 lars $
  *
  */
 

data/ext/pg_type_map.c

@@ -1,6 +1,6 @@
 /*
  * pg_column_map.c - PG::ColumnMap class extension
- * $Id$
+ * $Id: pg_type_map.c,v c99d26015e3c 2014/12/12 20:58:25 lars $
  *
  */
 

data/ext/pg_type_map_all_strings.c

@@ -1,6 +1,6 @@
 /*
  * pg_type_map_all_strings.c - PG::TypeMapAllStrings class extension
- * $Id$
+ * $Id: pg_type_map_all_strings.c,v c53f993a4254 2014/12/12 21:57:29 lars $
  *
  * This is the default typemap.
  *

data/ext/pg_type_map_by_class.c

@@ -1,6 +1,6 @@
 /*
  * pg_type_map_by_class.c - PG::TypeMapByClass class extension
- * $Id$
+ * $Id: pg_type_map_by_class.c,v eeb8a82c5328 2014/11/10 19:34:02 lars $
  *
  * This type map can be used to select value encoders based on the class
  * of the given value to be send.

data/ext/pg_type_map_by_column.c

@@ -1,6 +1,6 @@
 /*
  * pg_column_map.c - PG::ColumnMap class extension
- * $Id$
+ * $Id: pg_type_map_by_column.c,v d369d31e8fe3 2014/10/22 08:47:29 lars $
  *
  */
 

data/ext/pg_type_map_by_mri_type.c

@@ -1,6 +1,6 @@
 /*
  * pg_type_map_by_mri_type.c - PG::TypeMapByMriType class extension
- * $Id$
+ * $Id: pg_type_map_by_mri_type.c,v 1269b8ad77b8 2015/02/06 16:38:23 lars $
  *
  * This type map can be used to select value encoders based on the MRI-internal
  * value type code.

data/ext/pg_type_map_by_oid.c

@@ -1,6 +1,6 @@
 /*
  * pg_type_map_by_oid.c - PG::TypeMapByOid class extension
- * $Id$
+ * $Id: pg_type_map_by_oid.c,v c99d26015e3c 2014/12/12 20:58:25 lars $
  *
  */
 

data/ext/pg_type_map_in_ruby.c

@@ -1,6 +1,6 @@
 /*
  * pg_type_map_in_ruby.c - PG::TypeMapInRuby class extension
- * $Id$
+ * $Id: pg_type_map_in_ruby.c,v 3d89d3aae4fd 2015/01/05 16:19:41 kanis $
  *
  */
 

data/ext/util.c

@@ -1,6 +1,6 @@
 /*
  * util.c - Utils for ruby-pg
- * $Id$
+ * $Id: util.c,v 5fb9170f6a7d 2015/06/29 11:15:12 kanis $
  *
  */
 
@@ -17,7 +17,7 @@ static const char base64_encode_table[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijk
 void
 base64_encode( char *out, char *in, int len)
 {
-	char *in_ptr = in + len;
+	unsigned char *in_ptr = (unsigned char *)in + len;
 	char *out_ptr = out + BASE64_ENCODED_SIZE(len);
 	int part_len = len % 3;
 

data/lib/pg.rb

@@ -24,10 +24,10 @@ end
 module PG
 
 	# Library version
-	VERSION = '0.18.2'
+	VERSION = '0.18.3'
 
 	# VCS revision
-	REVISION = %q$Revision$
+	REVISION = %q$Revision: 3b49541c9f12 $
 
 	class NotAllCopyDataRetrieved < PG::Error
 	end

data/lib/pg/basic_type_mapping.rb

@@ -25,9 +25,9 @@ module PG::BasicTypeRegistry
 
 			# populate the enum types
 			_enums, leaves = leaves.partition { |row| row['typinput'] == 'enum_in' }
-	# 		enums.each do |row|
-	# 			coder_map[row['oid'].to_i] = OID::Enum.new
-	# 		end
+			# enums.each do |row|
+			#	coder_map[row['oid'].to_i] = OID::Enum.new
+			# end
 
 			# populate the base types
 			leaves.find_all { |row| coders_by_name.key?(row['typname']) }.each do |row|
@@ -41,9 +41,9 @@ module PG::BasicTypeRegistry
 			_records_by_oid = result.group_by { |row| row['oid'] }
 
 			# populate composite types
-	# 		nodes.each do |row|
-	# 			add_oid row, records_by_oid, coder_map
-	# 		end
+			# nodes.each do |row|
+			#	add_oid row, records_by_oid, coder_map
+			# end
 
 			if arraycoder
 				# populate array types
@@ -62,11 +62,11 @@ module PG::BasicTypeRegistry
 			end
 
 			# populate range types
-	# 		ranges.find_all { |row| coder_map.key? row['rngsubtype'].to_i }.each do |row|
-	# 			subcoder = coder_map[row['rngsubtype'].to_i]
-	# 			range = OID::Range.new subcoder
-	# 			coder_map[row['oid'].to_i] = range
-	# 		end
+			# ranges.find_all { |row| coder_map.key? row['rngsubtype'].to_i }.each do |row|
+			#	subcoder = coder_map[row['rngsubtype'].to_i]
+			#	range = OID::Range.new subcoder
+			#	coder_map[row['oid'].to_i] = range
+			# end
 
 			@coders = coder_map.values
 			@coders_by_name = @coders.inject({}){|h, t| h[t.name] = t; h }
@@ -154,46 +154,46 @@ module PG::BasicTypeRegistry
 	alias_type    0, 'int8', 'int2'
 	alias_type    0, 'oid',  'int2'
 
-# 	register_type 0, 'numeric', OID::Decimal.new
+	# register_type 0, 'numeric', OID::Decimal.new
 	register_type 0, 'text', PG::TextEncoder::String, PG::TextDecoder::String
 	alias_type 0, 'varchar', 'text'
 	alias_type 0, 'char', 'text'
 	alias_type 0, 'bpchar', 'text'
 	alias_type 0, 'xml', 'text'
 
-# 	# FIXME: why are we keeping these types as strings?
-# 	alias_type 'tsvector', 'text'
-# 	alias_type 'interval', 'text'
-# 	alias_type 'macaddr',  'text'
-# 	alias_type 'uuid',     'text'
-#
-# 	register_type 'money', OID::Money.new
+	# FIXME: why are we keeping these types as strings?
+	# alias_type 'tsvector', 'text'
+	# alias_type 'interval', 'text'
+	# alias_type 'macaddr',  'text'
+	# alias_type 'uuid',     'text'
+	#
+	# register_type 'money', OID::Money.new
 	# There is no PG::TextEncoder::Bytea, because it's simple and more efficient to send bytea-data
 	# in binary format, either with PG::BinaryEncoder::Bytea or in Hash param format.
 	register_type 0, 'bytea', nil, PG::TextDecoder::Bytea
 	register_type 0, 'bool', PG::TextEncoder::Boolean, PG::TextDecoder::Boolean
-# 	register_type 'bit', OID::Bit.new
-# 	register_type 'varbit', OID::Bit.new
-#
+	# register_type 'bit', OID::Bit.new
+	# register_type 'varbit', OID::Bit.new
+
 	register_type 0, 'float4', PG::TextEncoder::Float, PG::TextDecoder::Float
 	alias_type 0, 'float8', 'float4'
 
 	register_type 0, 'timestamp', PG::TextEncoder::TimestampWithoutTimeZone, PG::TextDecoder::TimestampWithoutTimeZone
 	register_type 0, 'timestamptz', PG::TextEncoder::TimestampWithTimeZone, PG::TextDecoder::TimestampWithTimeZone
 	register_type 0, 'date', PG::TextEncoder::Date, PG::TextDecoder::Date
-# 	register_type 'time', OID::Time.new
-#
-# 	register_type 'path', OID::Text.new
-# 	register_type 'point', OID::Point.new
-# 	register_type 'polygon', OID::Text.new
-# 	register_type 'circle', OID::Text.new
-# 	register_type 'hstore', OID::Hstore.new
-# 	register_type 'json', OID::Json.new
-# 	register_type 'citext', OID::Text.new
-# 	register_type 'ltree', OID::Text.new
-#
-# 	register_type 'cidr', OID::Cidr.new
-# 	alias_type 'inet', 'cidr'
+	# register_type 'time', OID::Time.new
+	#
+	# register_type 'path', OID::Text.new
+	# register_type 'point', OID::Point.new
+	# register_type 'polygon', OID::Text.new
+	# register_type 'circle', OID::Text.new
+	# register_type 'hstore', OID::Hstore.new
+	# register_type 'json', OID::Json.new
+	# register_type 'citext', OID::Text.new
+	# register_type 'ltree', OID::Text.new
+	#
+	# register_type 'cidr', OID::Cidr.new
+	# alias_type 'inet', 'cidr'