pg 0.17.1 → 0.18.4

data/History.rdoc

@@ -1,3 +1,71 @@
+== 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:
+- Fix OID to Integer mapping (it is unsigned now). #187
+- Fix possible segfault in conjunction with notice receiver. #185
+
+Enhancements:
+
+- Add an extensible type cast system.
+- A lot of performance improvements.
+- Return frozen String objects for result field names.
+- Add PG::Result#stream_each and #stream_each_row as fast helpers for
+  the single row mode.
+- 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.
+
+
+
 == v0.17.1 [2013-12-18] Michael Granger <ged@FaerieMUD.org>
 
 Bugfixes:

data/Manifest.txt

@@ -20,17 +20,37 @@ ext/gvl_wrappers.c
 ext/gvl_wrappers.h
 ext/pg.c
 ext/pg.h
+ext/pg_binary_decoder.c
+ext/pg_binary_encoder.c
+ext/pg_coder.c
 ext/pg_connection.c
+ext/pg_copy_coder.c
 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_in_ruby.c
+ext/util.c
+ext/util.h
 ext/vc/pg.sln
 ext/vc/pg_18/pg.vcproj
 ext/vc/pg_19/pg_19.vcproj
 lib/pg.rb
+lib/pg/basic_type_mapping.rb
+lib/pg/coder.rb
 lib/pg/connection.rb
 lib/pg/constants.rb
 lib/pg/exceptions.rb
 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
@@ -51,7 +71,15 @@ sample/wal_shipper.rb
 sample/warehouse_partitions.rb
 spec/data/expected_trace.out
 spec/data/random_binary_data
-spec/lib/helpers.rb
+spec/helpers.rb
+spec/pg/basic_type_mapping_spec.rb
 spec/pg/connection_spec.rb
 spec/pg/result_spec.rb
+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/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,6 +4,8 @@ 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
 
@@ -29,7 +31,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/project/ged/ruby-pg]
 
 
 == Requirements
@@ -64,6 +67,53 @@ There's also {a Google+ group}[http://goo.gl/TFy1U] and a
 want to chat about something.
 
 
+== Type Casts
+
+Pg can optionally type cast result values and query parameters in Ruby or
+native C code. This can speed up data transfers to and from the database,
+because String allocations are reduced and conversions in (slower) Ruby code
+can be omitted.
+
+Very basic type casting can be enabled by:
+
+    conn.type_map_for_results = PG::BasicTypeMapForResults.new conn
+    # ... this works for result value mapping:
+    conn.exec("select 1, now(), '{2,3}'::int[]").values
+        # => [[1, 2014-09-21 20:51:56 +0200, [2, 3]]]
+
+    conn.type_map_for_queries = PG::BasicTypeMapForQueries.new conn
+    # ... and this for param value mapping:
+    conn.exec_params("SELECT $1::text, $2::text, $3::text", [1, 1.23, [2,3]]).values
+        # => [["1", "1.2300000000000000E+00", "{2,3}"]]
+
+But Pg's type casting is highly customizable. That's why it's divided into
+2 layers:
+
+=== Encoders / Decoders (ext/pg_*coder.c, lib/pg/*coder.rb)
+
+This is the lower layer, containing encoding classes that convert Ruby
+objects for transmission to the DBMS and decoding classes to convert
+received data back to Ruby objects. The classes are namespaced according
+to their format and direction in PG::TextEncoder, PG::TextDecoder,
+PG::BinaryEncoder and PG::BinaryDecoder.
+
+It is possible to assign a type OID, format code (text or binary) and
+optionally a name to an encoder or decoder object. It's also possible
+to build composite types by assigning an element encoder/decoder.
+PG::Coder objects can be used to set up a PG::TypeMap or alternatively
+to convert single values to/from their string representation.
+
+=== PG::TypeMap and derivations (ext/pg_type_map*.c, lib/pg/type_map*.rb)
+
+A TypeMap defines which value will be converted by which encoder/decoder.
+There are different type map strategies, implemented by several derivations
+of this class. They can be chosen and configured according to the particular
+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.
+
+
 == Contributing
 
 To report bugs, suggest features, or check out the source with Mercurial,
@@ -83,7 +133,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/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 )
@@ -53,27 +55,25 @@ $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.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.5.1', :developer
-	self.dependency 'hoe-deveiate', '~> 0.2', :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
+	self.dependency 'rspec', '~> 3.0', :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( '>= 1.9.3' )
 
 	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
@@ -118,16 +118,38 @@ Rake::ExtensionTask.new do |ext|
 	ext.cross_compile  = true
 	ext.cross_platform = CrossLibraries.map &:for_platform
 
-  ext.cross_config_options += CrossLibraries.map do |lib|
-    {
-      lib.for_platform => [
-        "--with-pg-include=#{lib.static_postgresql_libdir}",
-        "--with-opt-include=#{lib.static_postgresql_incdir}",
-        "--with-pg-lib=#{lib.static_postgresql_libdir}",
-        "--with-opt-lib=#{lib.static_openssl_builddir}",
-      ]
-    }
-  end
+	ext.cross_config_options += CrossLibraries.map do |lib|
+		{
+			lib.for_platform => [
+				"--enable-windows-cross",
+				"--with-pg-include=#{lib.static_postgresql_incdir}",
+				"--with-pg-lib=#{lib.static_postgresql_libdir}",
+				# libpq-fe.h resides in src/interfaces/libpq/ before make install
+				"--with-opt-include=#{lib.static_postgresql_libdir}",
+			]
+		}
+	end
+
+	# 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"
+	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
 
 
@@ -139,6 +161,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)"
@@ -178,3 +201,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/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.1e'
-		self.postgresql_version         = ENV['POSTGRESQL_VERSION'] || '9.2.3'
-
-		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
 
@@ -64,25 +75,14 @@ class CrossLibrary < OpenStruct
 		self.postgresql_global_makefile = static_postgresql_srcdir + 'Makefile.global'
 		self.postgresql_shlib_makefile  = static_postgresql_srcdir + 'Makefile.shlib'
 		self.postgresql_shlib_mf_orig   = static_postgresql_srcdir + 'Makefile.shlib.orig'
-		self.postgresql_lib             = static_postgresql_libdir + 'libpq.a'
+		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.8.7:1.9.3:2.0.0'
+		ENV['RUBY_CC_VERSION'] ||= '1.9.3:2.0.0'
 
 		def download(url, save_to)
 			part = save_to+".part"
@@ -136,7 +136,7 @@ class CrossLibrary < OpenStruct
 
 		# generate the makefile in a clean build location
 		file openssl_makefile => static_openssl_builddir do |t|
-			Dir.chdir( static_openssl_builddir ) do
+			chdir( static_openssl_builddir ) do
 				cmd = cmd_prelude.dup
 				cmd << "./Configure" << openssl_config
 
@@ -148,7 +148,7 @@ class CrossLibrary < OpenStruct
 		task :openssl_libs => [ libssleay32, libeay32 ]
 
 		task :compile_static_openssl => openssl_makefile do |t|
-			Dir.chdir( static_openssl_builddir ) do
+			chdir( static_openssl_builddir ) do
 				cmd = cmd_prelude.dup
 				cmd << 'make' << "-j#{NUM_CPUS}" << 'build_libs'
 
@@ -184,7 +184,6 @@ class CrossLibrary < OpenStruct
 			puts "extracting %s to %s" % [ postgresql_tarball, static_postgresql_builddir.parent ]
 			static_postgresql_builddir.mkpath
 			run 'tar', '-xjf', postgresql_tarball.to_s, '-C', static_postgresql_builddir.parent.to_s
-			mv postgresql_shlib_makefile, postgresql_shlib_mf_orig
 
 			postgresql_patches.each do |patchfile|
 				puts "  applying patch #{patchfile}..."
@@ -200,10 +199,9 @@ class CrossLibrary < OpenStruct
 				"--host=#{host_platform}",
 				'--with-openssl',
 				'--without-zlib',
-				'--disable-shared',
 			]
 
-			Dir.chdir( static_postgresql_builddir ) do
+			chdir( static_postgresql_builddir ) do
 				configure_path = static_postgresql_builddir + 'configure'
 				cmd = [ configure_path.to_s, *options ]
 				cmd << "CFLAGS=-L#{static_openssl_builddir}"
@@ -217,40 +215,46 @@ class CrossLibrary < OpenStruct
 		end
 
 
-		# patch the Makefile.shlib -- depend on the build dir so it's only
-		# rewritten if the tarball is re-extracted.
-		file postgresql_shlib_makefile => postgresql_shlib_mf_orig do |t|
-			tf = Tempfile.new( postgresql_shlib_makefile.basename.to_s )
-			postgresql_shlib_mf_orig.open( File::RDONLY ) do |ifh|
-				ifh.each_line do |line|
-					tf.print( line.sub(/^(\s*haslibarule\s*=\s*yes)/, "# \\1 ") )
-				end
+		# 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
-			tf.close
 
-			FileUtils.mv( tf.path, t.name, :verbose => $puts )
+			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'
+			end
 		end
 
 
-		# make libpq.a
-		task postgresql_lib => [ postgresql_global_makefile, postgresql_shlib_makefile ] do |t|
-			Dir.chdir( postgresql_lib.dirname ) do
-				sh 'make', "-j#{NUM_CPUS}", postgresql_lib.basename.to_s, 'PORTNAME=win32'
-			end
-		end
+		#desc 'compile libpg.a'
+		task :libpq => postgresql_lib
 
+		# copy libpq.dll to lib dir
+		dest_libpq = "lib/#{for_platform}/#{postgresql_lib.basename}"
+		directory File.dirname(dest_libpq)
+		file dest_libpq => [postgresql_lib, File.dirname(dest_libpq)] do
+			cp postgresql_lib, dest_libpq
+		end
 
-		#desc 'compile static libpg.a'
-		task :static_libpq => postgresql_lib
+		stage_libpq = "tmp/#{for_platform}/stage/#{dest_libpq}"
+		directory File.dirname(stage_libpq)
+		file stage_libpq => [postgresql_lib, File.dirname(stage_libpq)] do |t|
+			cp postgresql_lib, stage_libpq
+		end
 	end
 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"
@@ -258,10 +262,7 @@ else
 end
 
 desc 'cross compile pg for win32'
-task :cross do
-	ENV['CROSS_COMPILING'] = 'yes'
-end
-task :cross => [ :mingw32, :static_libpq ]
+task :cross => [ :mingw32, :libpq ]
 
 task :mingw32 do
 	# Use Rake::ExtensionCompiler helpers to find the proper host
@@ -271,3 +272,30 @@ task :mingw32 do
 		fail
 	end
 end
+
+# To reduce the gem file size strip mingw32 dlls before packaging
+ENV['RUBY_CC_VERSION'].to_s.split(':').each do |ruby_version|
+  task "tmp/i386-mingw32/stage/lib/#{ruby_version[/^\d+\.\d+/]}/pg_ext.so" do |t|
+    sh "i686-w64-mingw32-strip -S tmp/i386-mingw32/stage/lib/#{ruby_version[/^\d+\.\d+/]}/pg_ext.so"
+  end
+
+  task "tmp/x64-mingw32/stage/lib/#{ruby_version[/^\d+\.\d+/]}/pg_ext.so" do |t|
+    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