pg 0.18.0 → 1.0.0

data/History.rdoc

@@ -1,3 +1,132 @@
+== v1.0.0 [2018-01-10] Michael Granger <ged@FaerieMUD.org>
+
+Deprecated:
+- Deprecate Ruby older than 2.2.
+- Deprecate Connection#socket in favor of #socket_io.
+
+Removed:
+- Remove compatibility code for Ruby < 2.0 and PostgreSQL < 9.2.
+- Remove partial compatibility with Rubinius.
+
+Enhancements:
+- Update error codes to PostgreSQL-10
+- Update Windows binary gems to Ruby-2.5, PostgreSQL 10.1 and
+  OpenSSL 1.1.0g.
+
+Bugfixes:
+- Fix URI detection for connection strings. #265 (thanks to jjoos)
+- MINGW: Workaround segfault due to GCC linker error in conjunction with MSVC.
+  This happens when linking to PostgreSQL-10.0-x64 from EnterpriseDB.
+
+Documentation fixes:
+- Add PostgreSQL version since when the given function is supported. #263
+- Better documentation to `encoder` and `decoder` arguments of COPY related methods.
+
+
+== v0.21.0 [2017-06-12] Michael Granger <ged@FaerieMUD.org>
+
+Enhancements:
+- Move add_dll_directory to the Runtime namespace for newest versions
+  of RubyInstaller.
+- Deprecate PGconn, PGresult, and PGError top-level constants; a warning
+  will be output the first time one of them is used. They will be
+  removed in the upcoming 1.0 release.
+
+Documentation fixes:
+- Update the docs for PG::Result#cmd_tuples
+
+New Samples:
+- Add an example of the nicer #copy_data way of doing `COPY`.
+
+
+== v0.20.0 [2017-03-10] Michael Granger <ged@FaerieMUD.org>
+
+Enhancements:
+- Update error codes to PostgreSQL-9.6
+- Update Windows binary gems to Ruby-2.4, PostgreSQL 9.6.1 and
+  OpenSSL 1.0.2j.
+- Add support for RubyInstaller2 to Windows binary gems.
+
+Bugfixes:
+- Use secure JSON methods for JSON (de)serialisation. #248
+- Fix Result#inspect on a cleared result.
+- Fix test case that failed on Ruby-2.4. #255
+
+Documentation fixes:
+- Talk about Integer instead of Fixnum.
+- Fix method signature of Coder#encode.
+
+
+== v0.19.0 [2016-09-21] Michael Granger <ged@FaerieMUD.org>
+
+- Deprecate Ruby 1.9
+
+Enhancements:
+- Respect and convert character encoding of all strings sent
+  to the server. #231
+- Add PostgreSQL-9.5 functions PQsslInUse(), PQsslAttribute()
+  and PQsslAttributeNames().
+- Various documentation fixes and improvements.
+- Add mechanism to build without pg_config:
+    gem install pg -- --with-pg-config=ignore
+- Update Windows binary gems to Ruby-2.3, PostgreSQL 9.5.4 and
+  OpenSSL 1.0.2f.
+- Add JSON coders and add them to BasicTypeMapForResults and
+  BasicTypeMapBasedOnResult
+- Allow build from git per bundler.
+
+Bugfixes:
+- Release GVL while calling PQsetClientEncoding(). #245
+- Add __EXTENSIONS__ to Solaris/SmartOS for Ruby >= 2.3.x. #236
+- Fix wrong exception when running SQL while in Connection#copy_data
+  block for output
+
+
+== v0.18.4 [2015-11-13] Michael Granger <ged@FaerieMUD.org>
+
+Enhancements:
+- Fixing compilation problems with Microsoft Visual Studio 2008. GH #10
+- Avoid name clash with xcode and jemalloc. PR#22, PR#23
+
+Bugfixes:
+- Avoid segfault, when quote_ident or TextEncoder::Identifier
+  is called with Array containing non-strings. #226
+
+
+== 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:
+
+- Allow URI connection string (thanks to Chris Bandy)
+- Allow Array type parameter to conn.quote_ident
+
+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
+
+
 == v0.18.0 [2015-01-01] Michael Granger <ged@FaerieMUD.org>
 
 Bugfixes:
@@ -14,6 +143,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/Manifest.txt

@@ -51,24 +51,6 @@ lib/pg/result.rb
 lib/pg/text_decoder.rb
 lib/pg/text_encoder.rb
 lib/pg/type_map_by_column.rb
-sample/array_insert.rb
-sample/async_api.rb
-sample/async_copyto.rb
-sample/async_mixed.rb
-sample/check_conn.rb
-sample/copyfrom.rb
-sample/copyto.rb
-sample/cursor.rb
-sample/disk_usage_report.rb
-sample/issue-119.rb
-sample/losample.rb
-sample/minimal-testcase.rb
-sample/notify_wait.rb
-sample/pg_statistics.rb
-sample/replication_monitor.rb
-sample/test_binary_values.rb
-sample/wal_shipper.rb
-sample/warehouse_partitions.rb
 spec/data/expected_trace.out
 spec/data/random_binary_data
 spec/helpers.rb

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

@@ -4,12 +4,14 @@ home :: https://bitbucket.org/ged/ruby-pg
 mirror :: https://github.com/ged/ruby-pg
 docs :: http://deveiate.org/code/pg
 
+{<img src="https://badges.gitter.im/Join%20Chat.svg" alt="Join the chat at https://gitter.im/ged/ruby-pg">}[https://gitter.im/ged/ruby-pg?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge]
+
 
 == Description
 
 Pg is the Ruby interface to the {PostgreSQL RDBMS}[http://www.postgresql.org/].
 
-It works with {PostgreSQL 8.4 and later}[http://www.postgresql.org/support/versioning/].
+It works with {PostgreSQL 9.2 and later}[http://www.postgresql.org/support/versioning/].
 
 A small example usage:
 
@@ -21,7 +23,7 @@ A small example usage:
   conn = PG.connect( dbname: 'sales' )
   conn.exec( "SELECT * FROM pg_stat_activity" ) do |result|
     puts "     PID | User             | Query"
-  result.each do |row|
+    result.each do |row|
       puts " %7d | %-16s | %s " %
         row.values_at('procpid', 'usename', 'current_query')
     end
@@ -29,15 +31,16 @@ 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.svg?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/project/ged/ruby-pg]
 
 
 == Requirements
 
-* Ruby 1.9.3-p392, or 2.0.0-p0.
-* PostgreSQL 8.4.x or later (with headers, -dev packages, etc).
+* Ruby 2.2 or newer
+* PostgreSQL 9.2.x or later (with headers, -dev packages, etc).
 
-It may work with earlier versions of Ruby/PostgreSQL as well, but those are
+It usually work with earlier versions of Ruby/PostgreSQL as well, but those are
 not regularly tested.
 
 
@@ -63,6 +66,10 @@ There's also {a Google+ group}[http://goo.gl/TFy1U] and a
 {mailing list}[http://groups.google.com/group/ruby-pg] if you get stuck, or just
 want to chat about something.
 
+If you want to install as a signed gem, the public certs of the gem signers
+can be found in {the `certs` directory}[https://bitbucket.org/ged/ruby-pg/src/tip/certs/]
+of the repository.
+
 
 == Type Casts
 
@@ -109,7 +116,7 @@ needs for type casting. The default type map is PG::TypeMapAllStrings.
 
 A type map can be assigned per connection or per query respectively per
 result set. Type maps can also be used for COPY in and out data streaming.
-
+See PG::Connection#copy_data .
 
 == Contributing
 
@@ -130,7 +137,7 @@ Lars Kanis <lars@greiz-reinsdorf.de>.
 
 == Copying
 
-Copyright (c) 1997-2013 by the authors.
+Copyright (c) 1997-2016 by the authors.
 
 * Jeff Davis <ruby-pg@j-davis.com>
 * Guy Decoux (ts) <decoux@moulon.inra.fr>
@@ -142,7 +149,7 @@ Copyright (c) 1997-2013 by the authors.
 * Noboru Saitou <noborus@netlab.jp>
 
 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
+https://www.ruby-lang.org/en/about/license.txt or the BSDL file in the source
 for details.
 
 Portions of the code are from the PostgreSQL project, and are distributed
@@ -158,4 +165,3 @@ to this library over the years.
 
 We are thankful to the people at the ruby-list and ruby-dev mailing lists.
 And to the people who developed PostgreSQL.
-

data/Rakefile

@@ -55,29 +55,24 @@ $hoespec = Hoe.spec 'pg' do
 	self.extra_rdoc_files = Rake::FileList[ '*.rdoc' ]
 	self.extra_rdoc_files.include( 'POSTGRES', 'LICENSE' )
 	self.extra_rdoc_files.include( 'ext/*.c' )
-	self.license :BSD
+	self.license 'BSD-3-Clause'
 
 	self.developer 'Michael Granger', 'ged@FaerieMUD.org'
 	self.developer 'Lars Kanis', 'lars@greiz-reinsdorf.de'
 
-	self.dependency 'rake-compiler', '~> 0.9', :developer
-	self.dependency 'hoe', '~> 3.12', :developer
-	self.dependency 'hoe-deveiate', '~> 0.6', :developer
+	self.dependency 'rake-compiler', '~> 1.0', :developer
+	self.dependency 'rake-compiler-dock', ['~> 0.6', '>= 0.6.2'], :developer
+	self.dependency 'hoe-deveiate', '~> 0.9', :developer
 	self.dependency 'hoe-bundler', '~> 1.0', :developer
-	self.dependency 'rspec', '~> 3.0', :developer
+	self.dependency 'rspec', '~> 3.5', :developer
+	self.dependency 'rdoc', '~> 5.1', :developer
 
-	self.spec_extras[:licenses] = ['BSD', 'Ruby', 'GPL']
 	self.spec_extras[:extensions] = [ 'ext/extconf.rb' ]
 
-	self.require_ruby_version( '>= 1.8.7' )
+	self.require_ruby_version( '>= 2.0.0' )
 
 	self.hg_sign_tags = true if self.respond_to?( :hg_sign_tags= )
 	self.check_history_on_release = true if self.respond_to?( :check_history_on_release= )
-	self.spec_extras[:rdoc_options] = [
-		'-f', 'fivefish',
-		'-t', 'pg: The Ruby Interface to PostgreSQL',
-		'-m', 'README.rdoc',
-	]
 
 	self.rdoc_locations << "deveiate:/usr/local/www/public/code/#{remote_rdoc_dir}"
 end
@@ -85,7 +80,7 @@ end
 ENV['VERSION'] ||= $hoespec.spec.version.to_s
 
 # Tests should pass before checking in
-task 'hg:precheckin' => [ :check_history, :check_manifest, :spec ]
+task 'hg:precheckin' => [ :check_history, :check_manifest, :spec, :gemspec ]
 
 # Support for 'rvm specs'
 task :specs => :spec
@@ -101,7 +96,7 @@ task :test do
 	# the installed gem dir. So we clear the task rake-compiler set up
 	# to break the dependency between :spec and :compile when running under
 	# rubygems-test, and then run :spec.
-	Rake::Task[ EXT.to_s ].clear
+	Rake::Task[ EXT.to_s ].clear if File.exist?(EXT.to_s)
 	Rake::Task[ :spec ].execute
 end
 
@@ -110,8 +105,6 @@ task :maint do
 	ENV['MAINTAINER_MODE'] = 'yes'
 end
 
-ENV['RUBY_CC_VERSION'] ||= '1.8.7:1.9.2:2.0.0'
-
 # Rake-compiler task
 Rake::ExtensionTask.new do |ext|
 	ext.name           = 'pg_ext'
@@ -136,8 +129,22 @@ Rake::ExtensionTask.new do |ext|
 
 	# Add libpq.dll to windows binary gemspec
 	ext.cross_compiling do |spec|
-		# mingw32-platform strings differ (RUBY_PLATFORM=i386-mingw32 vs. x86-mingw32 for rubygems)
-		spec.files << "lib/#{spec.platform.to_s.gsub(/^x86-/, "i386-")}/libpq.dll"
+		spec.files << "lib/libpq.dll"
+	end
+end
+
+
+# Use the fivefish formatter for docs generated from development checkout
+if File.directory?( '.hg' )
+	require 'rdoc/task'
+
+	Rake::Task[ 'docs' ].clear
+	RDoc::Task.new( 'docs' ) do |rdoc|
+		rdoc.main = "README.rdoc"
+		rdoc.rdoc_files.include( "*.rdoc", "ChangeLog", "lib/**/*.rb", 'ext/**/*.{c,h}' )
+		rdoc.generator = :fivefish
+		rdoc.title = "PG: The Ruby PostgreSQL Driver"
+		rdoc.rdoc_dir = 'doc'
 	end
 end
 
@@ -146,10 +153,12 @@ end
 file '.hg/branch' do
 	warn "WARNING: You need the Mercurial repo to update the ChangeLog"
 end
+Rake::Task["ChangeLog"].clear
 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)"
@@ -175,13 +184,11 @@ end
 
 desc "Update list of server error codes"
 task :update_error_codes do
-	URL_ERRORCODES_TXT = "http://git.postgresql.org/gitweb/?p=postgresql.git;a=blob_plain;f=src/backend/utils/errcodes.txt;hb=HEAD"
+	URL_ERRORCODES_TXT = "http://git.postgresql.org/gitweb/?p=postgresql.git;a=blob_plain;f=src/backend/utils/errcodes.txt;hb=refs/tags/REL_10_1"
 
 	ERRORCODES_TXT = "ext/errorcodes.txt"
 	sh "wget #{URL_ERRORCODES_TXT.inspect} -O #{ERRORCODES_TXT.inspect} || curl #{URL_ERRORCODES_TXT.inspect} -o #{ERRORCODES_TXT.inspect}"
-end
 
-file 'ext/errorcodes.def' => ['ext/errorcodes.rb', 'ext/errorcodes.txt'] do
 	ruby 'ext/errorcodes.rb', 'ext/errorcodes.txt', 'ext/errorcodes.def'
 end
 
@@ -195,12 +202,14 @@ 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")}"
+	spec.signing_key = nil
+	spec.version = "#{spec.version.bump}.0.pre#{Time.now.strftime("%Y%m%d%H%M%S")}"
+	spec.cert_chain = [ 'certs/ged.pem' ]
 	File.open( task.name, 'w' ) do |fh|
 		fh.write( spec.to_ruby )
 	end
 end
 
-CLOBBER.include( GEMSPEC.to_s )
+CLOBBER.include( '*.gemspec' )
 task :default => :gemspec
 

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.1.0g'
+		self.postgresql_version         = ENV['POSTGRESQL_VERSION'] || '10.1'
+
+		# 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
 
@@ -43,8 +54,8 @@ class CrossLibrary < OpenStruct
 		self.openssl_tarball            = static_sourcesdir + File.basename( openssl_source_uri.path )
 		self.openssl_makefile           = static_openssl_builddir + 'Makefile'
 
-		self.libssleay32                = static_openssl_builddir + 'libssleay32.a'
-		self.libeay32                   = static_openssl_builddir + 'libeay32.a'
+		self.libssl                     = static_openssl_builddir + 'libssl.a'
+		self.libcrypto                  = static_openssl_builddir + 'libcrypto.a'
 
 		self.openssl_patches            = Rake::FileList[ (MISCDIR + "openssl-#{openssl_version}.*.patch").to_s ]
 
@@ -67,23 +78,10 @@ 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 )
 
 
-		ENV['RUBY_CC_VERSION'] ||= '1.9.3:2.0.0'
-
 		def download(url, save_to)
 			part = save_to+".part"
 			sh "wget #{url.to_s.inspect} -O #{part.inspect} || curl #{url.to_s.inspect} -o #{part.inspect}"
@@ -126,11 +124,9 @@ class CrossLibrary < OpenStruct
 		end
 
 		self.cmd_prelude = [
-			'env',
-			"CC=#{host_platform}-gcc",
+			"env",
+			"CROSS_COMPILE=#{host_platform}-",
 			"CFLAGS=-DDSO_WIN32",
-			"AR=#{host_platform}-ar",
-			"RANLIB=#{host_platform}-ranlib"
 		]
 
 
@@ -145,7 +141,7 @@ class CrossLibrary < OpenStruct
 		end
 
 		desc "compile static openssl libraries"
-		task :openssl_libs => [ libssleay32, libeay32 ]
+		task :openssl_libs => [ libssl, libcrypto ]
 
 		task :compile_static_openssl => openssl_makefile do |t|
 			chdir( static_openssl_builddir ) do
@@ -156,14 +152,14 @@ class CrossLibrary < OpenStruct
 			end
 		end
 
-		desc "compile static #{libeay32}"
-		file libeay32 => :compile_static_openssl do |t|
-			FileUtils.cp( static_openssl_builddir + 'libcrypto.a', libeay32.to_s )
+		desc "compile static #{libssl}"
+		file libssl => :compile_static_openssl do |t|
+			rm t.name.gsub(/\.a$/, ".dll.a")
 		end
 
-		desc "compile static #{libssleay32}"
-		file libssleay32 => :compile_static_openssl do |t|
-			FileUtils.cp( static_openssl_builddir + 'libssl.a', libssleay32.to_s )
+		desc "compile static #{libcrypto}"
+		file libcrypto => :compile_static_openssl do |t|
+			rm t.name.gsub(/\.a$/, ".dll.a")
 		end
 
 
@@ -207,7 +203,7 @@ class CrossLibrary < OpenStruct
 				cmd << "CFLAGS=-L#{static_openssl_builddir}"
 				cmd << "LDFLAGS=-L#{static_openssl_builddir}"
 				cmd << "LDFLAGS_SL=-L#{static_openssl_builddir}"
-				cmd << "LIBS=-lwsock32 -lgdi32"
+				cmd << "LIBS=-lwsock32 -lgdi32 -lws2_32"
 				cmd << "CPPFLAGS=-I#{static_openssl_builddir}/include"
 
 				run( *cmd )
@@ -217,11 +213,16 @@ class CrossLibrary < OpenStruct
 
 		# make libpq.dll
 		task postgresql_lib => [ postgresql_global_makefile ] do |t|
+			# Work around missing dependency to libcommon in PostgreSQL-9.4.0
+			chdir( static_postgresql_srcdir + "common" ) do
+				sh 'make', "-j#{NUM_CPUS}"
+			end
+
 			chdir( postgresql_lib.dirname ) do
 				sh 'make',
 					"-j#{NUM_CPUS}",
 					postgresql_lib.basename.to_s,
-					'SHLIB_LINK=-lssleay32 -leay32 -lcrypt32 -lgdi32 -lsecur32 -lwsock32 -lws2_32'
+					'SHLIB_LINK=-lssl -lcrypto -lcrypt32 -lgdi32 -lsecur32 -lwsock32 -lws2_32'
 			end
 		end
 
@@ -230,7 +231,7 @@ class CrossLibrary < OpenStruct
 		task :libpq => postgresql_lib
 
 		# copy libpq.dll to lib dir
-		dest_libpq = "lib/#{for_platform}/#{postgresql_lib.basename}"
+		dest_libpq = "lib/#{postgresql_lib.basename}"
 		directory File.dirname(dest_libpq)
 		file dest_libpq => [postgresql_lib, File.dirname(dest_libpq)] do
 			cp postgresql_lib, dest_libpq
@@ -246,10 +247,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"
@@ -278,3 +279,20 @@ 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/ || true"
+  sh "bundle package"
+
+  RakeCompilerDock.sh <<-EOT
+    mkdir ~/.gem &&
+    (cp build/gem/gem-*.pem ~/.gem/ || true) &&
+    bundle install --local &&
+    rake cross native gem RUBY_CC_VERSION=2.5.0:2.4.0:2.3.0:2.2.2:2.1.6:2.0.0
+  EOT
+end