pg 0.18.4 → 1.2.3

data/Rakefile

@@ -1,4 +1,4 @@
-#!/usr/bin/env rake
+# -*- rake -*-
 
 require 'rbconfig'
 require 'pathname'
@@ -35,6 +35,8 @@ TEST_DIRECTORY = BASEDIR + "tmp_test_specs"
 
 CLOBBER.include( TEST_DIRECTORY.to_s )
 CLEAN.include( PKGDIR.to_s, TMPDIR.to_s )
+CLEAN.include "lib/*/libpq.dll"
+CLEAN.include "lib/pg_ext.*"
 
 # Set up Hoe plugins
 Hoe.plugin :mercurial
@@ -55,22 +57,21 @@ $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-2-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 'rake-compiler-dock', '~> 0.3', :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', ['~> 1.0'], :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.9.3' )
+	self.require_ruby_version( '>= 2.2' )
 
 	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= )
@@ -81,7 +82,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
@@ -97,7 +98,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
 
@@ -106,8 +107,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'
@@ -116,7 +115,7 @@ Rake::ExtensionTask.new do |ext|
 	ext.lib_dir        = 'lib'
 	ext.source_pattern = "*.{c,h}"
 	ext.cross_compile  = true
-	ext.cross_platform = CrossLibraries.map &:for_platform
+	ext.cross_platform = CrossLibraries.map(&:for_platform)
 
 	ext.cross_config_options += CrossLibraries.map do |lib|
 		{
@@ -132,8 +131,7 @@ 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/#{spec.platform}/libpq.dll"
 	end
 end
 
@@ -157,6 +155,7 @@ 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..."
@@ -187,13 +186,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_12_0"
 
 	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
 
@@ -207,12 +204,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

@@ -1,4 +1,4 @@
-#!/usr/bin/env rake
+# -*- rake -*-
 
 require 'uri'
 require 'tempfile'
@@ -29,15 +29,15 @@ class CrossLibrary < OpenStruct
 		self.host_platform              = toolchain
 
 		# Cross-compilation constants
-		self.openssl_version            = ENV['OPENSSL_VERSION'] || '1.0.2d'
-		self.postgresql_version         = ENV['POSTGRESQL_VERSION'] || '9.4.4'
+		self.openssl_version            = ENV['OPENSSL_VERSION'] || '1.1.1d'
+		self.postgresql_version         = ENV['POSTGRESQL_VERSION'] || '12.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
+		rescue NotImplementedError, SystemCallError
 			# Symlinks don't work -> use home directory instead
 			self.compile_home               = Pathname( "~/.ruby-pg-build" ).expand_path
 		else
@@ -45,6 +45,8 @@ class CrossLibrary < OpenStruct
 		end
 		self.static_sourcesdir          = compile_home + 'sources'
 		self.static_builddir            = compile_home + 'builds' + for_platform
+		CLOBBER.include( static_sourcesdir )
+		CLEAN.include( static_builddir )
 
 		# Static OpenSSL build vars
 		self.static_openssl_builddir    = static_builddir + "openssl-#{openssl_version}"
@@ -54,8 +56,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 ]
 
@@ -81,19 +83,6 @@ class CrossLibrary < OpenStruct
 		# 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}"
-			FileUtils.mv part, save_to
-		end
-
-		def run(*args)
-			sh *args
-		end
-
 		#####################################################################
 		### C R O S S - C O M P I L A T I O N - T A S K S
 		#####################################################################
@@ -126,11 +115,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,9 +132,9 @@ class CrossLibrary < OpenStruct
 		end
 
 		desc "compile static openssl libraries"
-		task :openssl_libs => [ libssleay32, libeay32 ]
+		task "openssl_libs:#{for_platform}" => [ libssl, libcrypto ]
 
-		task :compile_static_openssl => openssl_makefile do |t|
+		task "compile_static_openssl:#{for_platform}" => openssl_makefile do |t|
 			chdir( static_openssl_builddir ) do
 				cmd = cmd_prelude.dup
 				cmd << 'make' << "-j#{NUM_CPUS}" << 'build_libs'
@@ -156,14 +143,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:#{for_platform}" 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:#{for_platform}" do |t|
+			rm t.name.gsub(/\.a$/, ".dll.a")
 		end
 
 
@@ -193,7 +180,7 @@ class CrossLibrary < OpenStruct
 		end
 
 		# generate the makefile in a clean build location
-		file postgresql_global_makefile => [ static_postgresql_builddir, :openssl_libs ] do |t|
+		file postgresql_global_makefile => [ static_postgresql_builddir, "openssl_libs:#{for_platform}" ] do |t|
 			options = [
 				"--target=#{host_platform}",
 				"--host=#{host_platform}",
@@ -207,7 +194,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 )
@@ -221,18 +208,21 @@ class CrossLibrary < OpenStruct
 			chdir( static_postgresql_srcdir + "common" ) do
 				sh 'make', "-j#{NUM_CPUS}"
 			end
+			chdir( static_postgresql_srcdir + "port" ) 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
 
 
 		#desc 'compile libpg.a'
-		task :libpq => postgresql_lib
+		task "native:#{for_platform}" => postgresql_lib
 
 		# copy libpq.dll to lib dir
 		dest_libpq = "lib/#{for_platform}/#{postgresql_lib.basename}"
@@ -247,22 +237,27 @@ class CrossLibrary < OpenStruct
 			cp postgresql_lib, stage_libpq
 		end
 	end
-end
 
-if File.exist?(File.expand_path("~/.rake-compiler/config.yml"))
-	CrossLibraries = [
-		['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
+	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}"
+		FileUtils.mv part, save_to
+	end
+
+	def run(*args)
+		sh(*args)
 	end
-else
-	$stderr.puts "Cross-compilation disabled -- rake-compiler not properly installed"
-	CrossLibraries = []
+end
+
+CrossLibraries = [
+	['x86-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
 
 desc 'cross compile pg for win32'
-task :cross => [ :mingw32, :libpq ]
+task :cross => [ :mingw32 ]
 
 task :mingw32 do
 	# Use Rake::ExtensionCompiler helpers to find the proper host
@@ -273,29 +268,32 @@ task :mingw32 do
 	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
+task 'gem:windows:prepare' do
+	require 'io/console'
+	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"
+	begin
+		OpenSSL::PKey.read(File.read(File.expand_path("~/.gem/gem-private_key.pem")), ENV["GEM_PRIVATE_KEY_PASSPHRASE"] || "")
+	rescue OpenSSL::PKey::PKeyError
+		ENV["GEM_PRIVATE_KEY_PASSPHRASE"] = STDIN.getpass("Enter passphrase of gem signature key: ")
+		retry
+	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
+CrossLibraries.each do |xlib|
+	platform = xlib.for_platform
+	desc "Build fat binary gem for platform #{platform}"
+	task "gem:windows:#{platform}" => ['ChangeLog', 'gem:windows:prepare', xlib.openssl_tarball, xlib.postgresql_tarball] do
+		RakeCompilerDock.sh <<-EOT, platform: platform
+			(cp build/gem/gem-*.pem ~/.gem/ || true) &&
+			bundle install --local &&
+			rake native:#{platform} pkg/#{$hoespec.spec.full_name}-#{platform}.gem MAKE="make -j`nproc`"
+		EOT
+	end
+	desc "Build the windows binary gems"
+	multitask 'gem:windows' => "gem:windows:#{platform}"
 end

data/ext/errorcodes.def

@@ -186,6 +186,10 @@
   VALUE klass = define_error_class( "InvalidParameterValue", "22" );
   register_error_class( "22023", klass );
 }
+{
+  VALUE klass = define_error_class( "InvalidPrecedingOrFollowingSize", "22" );
+  register_error_class( "22013", klass );
+}
 {
   VALUE klass = define_error_class( "InvalidRegularExpression", "22" );
   register_error_class( "2201B", klass );
@@ -198,6 +202,14 @@
   VALUE klass = define_error_class( "InvalidRowCountInResultOffsetClause", "22" );
   register_error_class( "2201X", klass );
 }
+{
+  VALUE klass = define_error_class( "InvalidTablesampleArgument", "22" );
+  register_error_class( "2202H", klass );
+}
+{
+  VALUE klass = define_error_class( "InvalidTablesampleRepeat", "22" );
+  register_error_class( "2202G", klass );
+}
 {
   VALUE klass = define_error_class( "InvalidTimeZoneDisplacementValue", "22" );
   register_error_class( "22009", klass );
@@ -222,6 +234,10 @@
   VALUE klass = define_error_class( "NumericValueOutOfRange", "22" );
   register_error_class( "22003", klass );
 }
+{
+  VALUE klass = define_error_class( "SequenceGeneratorLimitExceeded", "22" );
+  register_error_class( "2200H", klass );
+}
 {
   VALUE klass = define_error_class( "StringDataLengthMismatch", "22" );
   register_error_class( "22026", klass );
@@ -286,6 +302,66 @@
   VALUE klass = define_error_class( "InvalidXmlProcessingInstruction", "22" );
   register_error_class( "2200T", klass );
 }
+{
+  VALUE klass = define_error_class( "DuplicateJsonObjectKeyValue", "22" );
+  register_error_class( "22030", klass );
+}
+{
+  VALUE klass = define_error_class( "InvalidJsonText", "22" );
+  register_error_class( "22032", klass );
+}
+{
+  VALUE klass = define_error_class( "InvalidSqlJsonSubscript", "22" );
+  register_error_class( "22033", klass );
+}
+{
+  VALUE klass = define_error_class( "MoreThanOneSqlJsonItem", "22" );
+  register_error_class( "22034", klass );
+}
+{
+  VALUE klass = define_error_class( "NoSqlJsonItem", "22" );
+  register_error_class( "22035", klass );
+}
+{
+  VALUE klass = define_error_class( "NonNumericSqlJsonItem", "22" );
+  register_error_class( "22036", klass );
+}
+{
+  VALUE klass = define_error_class( "NonUniqueKeysInAJsonObject", "22" );
+  register_error_class( "22037", klass );
+}
+{
+  VALUE klass = define_error_class( "SingletonSqlJsonItemRequired", "22" );
+  register_error_class( "22038", klass );
+}
+{
+  VALUE klass = define_error_class( "SqlJsonArrayNotFound", "22" );
+  register_error_class( "22039", klass );
+}
+{
+  VALUE klass = define_error_class( "SqlJsonMemberNotFound", "22" );
+  register_error_class( "2203A", klass );
+}
+{
+  VALUE klass = define_error_class( "SqlJsonNumberNotFound", "22" );
+  register_error_class( "2203B", klass );
+}
+{
+  VALUE klass = define_error_class( "SqlJsonObjectNotFound", "22" );
+  register_error_class( "2203C", klass );
+}
+{
+  VALUE klass = define_error_class( "TooManyJsonArrayElements", "22" );
+  register_error_class( "2203D", klass );
+}
+{
+  VALUE klass = define_error_class( "TooManyJsonObjectMembers", "22" );
+  register_error_class( "2203E", klass );
+}
+{
+  VALUE klass = define_error_class( "SqlJsonScalarRequired", "22" );
+  register_error_class( "2203F", klass );
+}
 {
   VALUE klass = define_error_class( "IntegrityConstraintViolation", NULL );
   register_error_class( "23000", klass );
@@ -365,6 +441,10 @@
   VALUE klass = define_error_class( "InFailedSqlTransaction", "25" );
   register_error_class( "25P02", klass );
 }
+{
+  VALUE klass = define_error_class( "IdleInTransactionSessionTimeout", "25" );
+  register_error_class( "25P03", klass );
+}
 {
   VALUE klass = define_error_class( "InvalidSqlStatementName", NULL );
   register_error_class( "26000", klass );
@@ -466,6 +546,10 @@
   VALUE klass = define_error_class( "ERIESrfProtocolViolated", "39" );
   register_error_class( "39P02", klass );
 }
+{
+  VALUE klass = define_error_class( "ERIEEventTriggerProtocolViolated", "39" );
+  register_error_class( "39P03", klass );
+}
 {
   VALUE klass = define_error_class( "SavepointException", NULL );
   register_error_class( "3B000", klass );
@@ -571,6 +655,10 @@
   VALUE klass = define_error_class( "WrongObjectType", "42" );
   register_error_class( "42809", klass );
 }
+{
+  VALUE klass = define_error_class( "GeneratedAlways", "42" );
+  register_error_class( "428C9", klass );
+}
 {
   VALUE klass = define_error_class( "UndefinedColumn", "42" );
   register_error_class( "42703", klass );
@@ -739,6 +827,10 @@
   VALUE klass = define_error_class( "LockNotAvailable", "55" );
   register_error_class( "55P03", klass );
 }
+{
+  VALUE klass = define_error_class( "UnsafeNewEnumValueUsage", "55" );
+  register_error_class( "55P04", klass );
+}
 {
   VALUE klass = define_error_class( "OperatorIntervention", NULL );
   register_error_class( "57000", klass );
@@ -781,6 +873,11 @@
   VALUE klass = define_error_class( "DuplicateFile", "58" );
   register_error_class( "58P02", klass );
 }
+{
+  VALUE klass = define_error_class( "SnapshotTooOld", NULL );
+  register_error_class( "72000", klass );
+  register_error_class( "72", klass );
+}
 {
   VALUE klass = define_error_class( "ConfigFileError", NULL );
   register_error_class( "F0000", klass );
@@ -916,6 +1013,10 @@
   VALUE klass = define_error_class( "TooManyRows", "P0" );
   register_error_class( "P0003", klass );
 }
+{
+  VALUE klass = define_error_class( "AssertFailure", "P0" );
+  register_error_class( "P0004", klass );
+}
 {
   VALUE klass = define_error_class( "InternalError", NULL );
   register_error_class( "XX000", klass );