pg 0.18.1-x86-mingw32 → 0.18.2-x86-mingw32

data/lib/pg.rb

@@ -24,7 +24,7 @@ end
 module PG
 
 	# Library version
-	VERSION = '0.18.1'
+	VERSION = '0.18.2'
 
 	# VCS revision
 	REVISION = %q$Revision$

data/lib/pg/connection.rb

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'pg' unless defined?( PG )
+require 'uri'
 
 # The PostgreSQL connection class. The interface for this class is based on
 # {libpq}[http://www.postgresql.org/docs/9.2/interactive/libpq.html], the C
@@ -34,46 +35,55 @@ class PG::Connection
 	def self::parse_connect_args( *args )
 		return '' if args.empty?
 
-		# This will be swapped soon for code that makes options like those required for
-		# PQconnectdbParams()/PQconnectStartParams(). For now, stick to an options string for
-		# PQconnectdb()/PQconnectStart().
+		hash_arg = args.last.is_a?( Hash ) ? args.pop : {}
+		option_string = ''
+		options = {}
 
 		# Parameter 'fallback_application_name' was introduced in PostgreSQL 9.0
 		# together with PQescapeLiteral().
-		if PG::Connection.instance_methods.find{|m| m.to_sym == :escape_literal }
-			appname = $0.sub(/^(.{30}).{4,}(.{30})$/){ $1+"..."+$2 }
-			appname = PG::Connection.quote_connstr( appname )
-			connopts = ["fallback_application_name=#{appname}"]
-		else
-			connopts = []
+		if PG::Connection.instance_methods.find {|m| m.to_sym == :escape_literal }
+			options[:fallback_application_name] = $0.sub( /^(.{30}).{4,}(.{30})$/ ){ $1+"..."+$2 }
 		end
 
-		# Handle an options hash first
-		if args.last.is_a?( Hash )
-			opthash = args.pop
-			opthash.each do |key, val|
-				connopts.push( "%s=%s" % [key, PG::Connection.quote_connstr(val)] )
+		if args.length == 1
+			case args.first
+			when URI, URI.regexp
+				uri = URI(args.first)
+				options.merge!( Hash[URI.decode_www_form( uri.query )] ) if uri.query
+			when /=/
+				# Option string style
+				option_string = args.first.to_s
+			else
+				# Positional parameters
+				options[CONNECT_ARGUMENT_ORDER.first.to_sym] = args.first
 			end
-		end
-
-		# Option string style
-		if args.length == 1 && args.first.to_s.index( '=' )
-			connopts.unshift( args.first )
-
-		# Append positional parameters
 		else
-			args.each_with_index do |val, i|
-				next unless val # Skip nil placeholders
+			max = CONNECT_ARGUMENT_ORDER.length
+			raise ArgumentError,
+				"Extra positional parameter %d: %p" % [ max + 1, args[max] ] if args.length > max
 
-				key = CONNECT_ARGUMENT_ORDER[ i ] or
-					raise ArgumentError, "Extra positional parameter %d: %p" % [ i+1, val ]
-				connopts.push( "%s=%s" % [key, PG::Connection.quote_connstr(val.to_s)] )
+			CONNECT_ARGUMENT_ORDER.zip( args ) do |(k,v)|
+				options[ k.to_sym ] = v if v
 			end
 		end
 
-		return connopts.join(' ')
+		options.merge!( hash_arg )
+
+		if uri
+			uri.host     = nil if options[:host]
+			uri.port     = nil if options[:port]
+			uri.user     = nil if options[:user]
+			uri.password = nil if options[:password]
+			uri.path     = '' if options[:dbname]
+			uri.query    = URI.encode_www_form( options )
+			return uri.to_s.sub( /^#{uri.scheme}:(?!\/\/)/, "#{uri.scheme}://" )
+		else
+			option_string += ' ' unless option_string.empty? && options.empty?
+			return option_string + options.map { |k,v| "#{k}=#{quote_connstr(v)}" }.join( ' ' )
+		end
 	end
 
+
 	#  call-seq:
 	#     conn.copy_data( sql ) {|sql_result| ... } -> PG::Result
 	#

data/lib/pg/text_decoder.rb

@@ -27,11 +27,11 @@ module PG
 		end
 
 		class TimestampWithTimeZone < SimpleDecoder
-			ISO_DATETIME_WITH_TIMEZONE = /\A(\d{4})-(\d\d)-(\d\d) (\d\d):(\d\d):(\d\d)(\.\d+)?([-\+]\d\d)\z/
+			ISO_DATETIME_WITH_TIMEZONE = /\A(\d{4})-(\d\d)-(\d\d) (\d\d):(\d\d):(\d\d)(\.\d+)?([-\+]\d\d):?(\d\d)?:?(\d\d)?\z/
 
 			def decode(string, tuple=nil, field=nil)
 				if string =~ ISO_DATETIME_WITH_TIMEZONE
-					Time.new $1.to_i, $2.to_i, $3.to_i, $4.to_i, $5.to_i, "#{$6}#{$7}".to_r, "#{$8}:00"
+					Time.new $1.to_i, $2.to_i, $3.to_i, $4.to_i, $5.to_i, "#{$6}#{$7}".to_r, "#{$8}:#{$9 || '00'}:#{$10 || '00'}"
 				else
 					string
 				end

data/spec/pg/connection_spec.rb

@@ -45,6 +45,14 @@ describe PG::Connection do
 		expect( optstring ).to match( /(^|\s)user='jrandom'/ )
 	end
 
+	it "can create a connection option string from an option string and a hash" do
+		optstring = described_class.parse_connect_args( 'dbname=original', :user => 'jrandom' )
+
+		expect( optstring ).to be_a( String )
+		expect( optstring ).to match( /(^|\s)dbname=original/ )
+		expect( optstring ).to match( /(^|\s)user='jrandom'/ )
+	end
+
 	it "escapes single quotes and backslashes in connection parameters" do
 		expect(
 			described_class.parse_connect_args( "DB 'browser' \\" )
@@ -52,18 +60,72 @@ describe PG::Connection do
 
 	end
 
+	let(:uri) { 'postgresql://user:pass@pgsql.example.com:222/db01?sslmode=require' }
+
+	it "can connect using a URI" do
+		string = described_class.parse_connect_args( uri )
+
+		expect( string ).to be_a( String )
+		expect( string ).to match( %r{^postgresql://user:pass@pgsql.example.com:222/db01\?} )
+		expect( string ).to match( %r{\?.*sslmode=require} )
+
+		string = described_class.parse_connect_args( URI.parse(uri) )
+
+		expect( string ).to be_a( String )
+		expect( string ).to match( %r{^postgresql://user:pass@pgsql.example.com:222/db01\?} )
+		expect( string ).to match( %r{\?.*sslmode=require} )
+	end
+
+	it "can create a connection URI from a URI and a hash" do
+		string = described_class.parse_connect_args( uri, :connect_timeout => 2 )
+
+		expect( string ).to be_a( String )
+		expect( string ).to match( %r{^postgresql://user:pass@pgsql.example.com:222/db01\?} )
+		expect( string ).to match( %r{\?.*sslmode=require} )
+		expect( string ).to match( %r{\?.*connect_timeout=2} )
+
+		string = described_class.parse_connect_args( uri,
+			:user => 'a',
+			:password => 'b',
+			:host => 'localhost',
+			:port => 555,
+			:dbname => 'x' )
+
+		expect( string ).to be_a( String )
+		expect( string ).to match( %r{^postgresql://\?} )
+		expect( string ).to match( %r{\?.*user=a} )
+		expect( string ).to match( %r{\?.*password=b} )
+		expect( string ).to match( %r{\?.*host=localhost} )
+		expect( string ).to match( %r{\?.*port=555} )
+		expect( string ).to match( %r{\?.*dbname=x} )
+	end
+
+	it "can create a connection URI with a non-standard domain socket directory" do
+		string = described_class.parse_connect_args( 'postgresql://%2Fvar%2Flib%2Fpostgresql/dbname' )
+
+		expect( string ).to be_a( String )
+		expect( string ).to match( %r{^postgresql://%2Fvar%2Flib%2Fpostgresql/dbname} )
+
+		string = described_class.
+			parse_connect_args( 'postgresql:///dbname', :host => '/var/lib/postgresql' )
+
+		expect( string ).to be_a( String )
+		expect( string ).to match( %r{^postgresql:///dbname\?} )
+		expect( string ).to match( %r{\?.*host=%2Fvar%2Flib%2Fpostgresql} )
+	end
+
 	it "connects with defaults if no connection parameters are given" do
 		expect( described_class.parse_connect_args ).to eq( '' )
 	end
 
 	it "connects successfully with connection string" do
-		tmpconn = described_class.connect(@conninfo)
+		tmpconn = described_class.connect( @conninfo )
 		expect( tmpconn.status ).to eq( PG::CONNECTION_OK )
 		tmpconn.finish
 	end
 
 	it "connects using 7 arguments converted to strings" do
-		tmpconn = described_class.connect('localhost', @port, nil, nil, :test, nil, nil)
+		tmpconn = described_class.connect( 'localhost', @port, nil, nil, :test, nil, nil )
 		expect( tmpconn.status ).to eq( PG::CONNECTION_OK )
 		tmpconn.finish
 	end
@@ -89,8 +151,13 @@ describe PG::Connection do
 
 	it "raises an exception when connecting with an invalid number of arguments" do
 		expect {
-			described_class.connect( 1, 2, 3, 4, 5, 6, 7, 'extra' )
-		}.to raise_error( ArgumentError, /extra positional parameter/i )
+			described_class.connect( 1, 2, 3, 4, 5, 6, 7, 'the-extra-arg' )
+		}.to raise_error do |error|
+			expect( error ).to be_an( ArgumentError )
+			expect( error.message ).to match( /extra positional parameter/i )
+			expect( error.message ).to match( /8/ )
+			expect( error.message ).to match( /the-extra-arg/ )
+		end
 	end
 
 	it "can connect asynchronously", :socket_io do
@@ -162,8 +229,6 @@ describe PG::Connection do
 		expect( @conn.user ).to be_a_kind_of( String )
 		expect( @conn.pass ).to eq( "" )
 		expect( @conn.host ).to eq( "localhost" )
-		# TODO: Not sure why libpq returns a NULL ptr instead of "127.0.0.1"
-		expect( @conn.hostaddr ).to eq( nil ) if @conn.server_version >= 9_04_00
 		expect( @conn.port ).to eq( 54321 )
 		expect( @conn.tty ).to eq( "" )
 		expect( @conn.options ).to eq( "" )
@@ -1128,9 +1193,20 @@ describe PG::Connection do
 				expect( escaped.encoding ).to eq( Encoding::ISO8859_1 )
 				expect( escaped ).to eq( "\"string to\"" )
 			end
+		end
 
+		it "can quote bigger strings with quote_ident" do
+			original = "'01234567\"" * 100
+			escaped = described_class.quote_ident( original + "\0afterzero" )
+			expect( escaped ).to eq( "\"" + original.gsub("\"", "\"\"") + "\"" )
 		end
 
+		it "can quote Arrays with quote_ident" do
+			original = "'01234567\""
+			escaped = described_class.quote_ident( [original]*3 )
+			expected = ["\"" + original.gsub("\"", "\"\"") + "\""] * 3
+			expect( escaped ).to eq( expected.join(".") )
+		end
 
 		describe "Ruby 1.9.x default_internal encoding" do
 

data/spec/pg/type_spec.rb

@@ -15,6 +15,8 @@ describe "PG::Type derivations" do
 	let!(:textdec_string) { PG::TextDecoder::String.new }
 	let!(:textenc_timestamp) { PG::TextEncoder::TimestampWithoutTimeZone.new }
 	let!(:textdec_timestamp) { PG::TextDecoder::TimestampWithoutTimeZone.new }
+	let!(:textenc_timestamptz) { PG::TextEncoder::TimestampWithTimeZone.new }
+	let!(:textdec_timestamptz) { PG::TextDecoder::TimestampWithTimeZone.new }
 	let!(:textenc_bytea) { PG::TextEncoder::Bytea.new }
 	let!(:textdec_bytea) { PG::TextDecoder::Bytea.new }
 	let!(:binaryenc_int2) { PG::BinaryEncoder::Int2.new }
@@ -85,6 +87,48 @@ describe "PG::Type derivations" do
 				expect( textdec_bytea.decode("\\377\\000") ).to eq( "\xff\0".b )
 			end
 
+			context 'timestamps' do
+				it 'decodes timestamps without timezone' do
+					expect( textdec_timestamp.decode('2016-01-02 23:23:59.123456') ).
+						to be_within(0.000001).of( Time.new(2016,01,02, 23, 23, 59.123456) )
+				end
+				it 'decodes timestamps with hour timezone' do
+					expect( textdec_timestamptz.decode('2015-01-26 17:26:42.691511-04') ).
+						to be_within(0.000001).of( Time.new(2015,01,26, 17, 26, 42.691511, "-04:00") )
+					expect( textdec_timestamptz.decode('2015-01-26 17:26:42.691511+10') ).
+						to be_within(0.000001).of( Time.new(2015,01,26, 17, 26, 42.691511, "+10:00") )
+				end
+				it 'decodes timestamps with hour:minute timezone' do
+					expect( textdec_timestamptz.decode('2015-01-26 17:26:42.691511-04:15') ).
+						to be_within(0.000001).of( Time.new(2015,01,26, 17, 26, 42.691511, "-04:15") )
+					expect( textdec_timestamptz.decode('2015-01-26 17:26:42.691511-0430') ).
+						to be_within(0.000001).of( Time.new(2015,01,26, 17, 26, 42.691511, "-04:30") )
+					expect( textdec_timestamptz.decode('2015-01-26 17:26:42.691511+10:45') ).
+						to be_within(0.000001).of( Time.new(2015,01,26, 17, 26, 42.691511, "+10:45") )
+				end
+				it 'decodes timestamps with hour:minute:sec timezone' do
+					# SET TIME ZONE 'Europe/Dublin'; -- Was UTC−00:25:21 until 1916
+					# SELECT '1900-01-01'::timestamptz;
+					# -- "1900-01-01 00:00:00-00:25:21"
+					expect( textdec_timestamptz.decode('1916-01-01 00:00:00-00:25:21') ).
+						to be_within(0.000001).of( Time.new(1916, 1, 1, 0, 0, 0, "-00:25:21") )
+				end
+			end
+
+			context 'identifier quotation' do
+				it 'should build an array out of an quoted identifier string' do
+					quoted_type = PG::TextDecoder::Identifier.new
+					expect( quoted_type.decode(%["A.".".B"]) ).to eq( ["A.", ".B"] )
+					expect( quoted_type.decode(%["'A"".""B'"]) ).to eq( ['\'A"."B\''] )
+				end
+
+				it 'should split unquoted identifier string' do
+					quoted_type = PG::TextDecoder::Identifier.new
+					expect( quoted_type.decode(%[a.b]) ).to eq( ['a','b'] )
+					expect( quoted_type.decode(%[a]) ).to eq( ['a'] )
+				end
+			end
+
 			it "should raise when decode method is called with wrong args" do
 				expect{ textdec_int.decode() }.to raise_error(ArgumentError)
 				expect{ textdec_int.decode("123", 2, 3, 4) }.to raise_error(ArgumentError)
@@ -156,6 +200,15 @@ describe "PG::Type derivations" do
 				expect( textenc_bytea.encode("\x00\x01\x02\x03\xef".b) ).to eq( "\\x00010203ef" )
 			end
 
+			context 'identifier quotation' do
+				it 'should quote and escape identifier' do
+					quoted_type = PG::TextEncoder::Identifier.new
+					expect( quoted_type.encode(['schema','table','col']) ).to eq( %["schema"."table"."col"] )
+					expect( quoted_type.encode(['A.','.B']) ).to eq( %["A.".".B"] )
+					expect( quoted_type.encode(%['A"."B']) ).to eq( %["'A"".""B'"] )
+				end
+			end
+
 			it "should encode with ruby encoder" do
 				expect( intenc_incrementer.encode(3) ).to eq( "4 " )
 			end
@@ -347,20 +400,6 @@ describe "PG::Type derivations" do
 					array_type = PG::TextDecoder::Array.new elements_type: nil
 					expect( array_type.decode(%[{3,4}]) ).to eq( ['3','4'] )
 				end
-
-				context 'identifier quotation' do
-					it 'should build an array out of an quoted identifier string' do
-						quoted_type = PG::TextDecoder::Identifier.new elements_type: textdec_string
-						expect( quoted_type.decode(%["A.".".B"]) ).to eq( ["A.", ".B"] )
-						expect( quoted_type.decode(%["'A"".""B'"]) ).to eq( ['\'A"."B\''] )
-					end
-
-					it 'should split unquoted identifier string' do
-						quoted_type = PG::TextDecoder::Identifier.new elements_type: textdec_string
-						expect( quoted_type.decode(%[a.b]) ).to eq( ['a','b'] )
-						expect( quoted_type.decode(%[a]) ).to eq( ['a'] )
-					end
-				end
 			end
 
 			describe '#encode' do
@@ -422,22 +461,6 @@ describe "PG::Type derivations" do
 					expect( textenc_float_array.encode(1234) ).to eq( "1234" )
 				end
 
-				context 'identifier quotation' do
-					it 'should quote and escape identifier' do
-						quoted_type = PG::TextEncoder::Identifier.new elements_type: textenc_string
-						expect( quoted_type.encode(['schema','table','col']) ).to eq( %["schema"."table"."col"] )
-						expect( quoted_type.encode(['A.','.B']) ).to eq( %["A.".".B"] )
-						expect( quoted_type.encode(%['A"."B']) ).to eq( %["'A"".""B'"] )
-					end
-
-					it 'shouldn\'t quote or escape identifier if requested to not do' do
-						quoted_type = PG::TextEncoder::Identifier.new elements_type: textenc_string,
-								needs_quotation: false
-						expect( quoted_type.encode(['a','b']) ).to eq( %[a.b] )
-						expect( quoted_type.encode(%[a.b]) ).to eq( %[a.b] )
-					end
-				end
-
 				context 'literal quotation' do
 					it 'should quote and escape literals' do
 						quoted_type = PG::TextEncoder::QuotedLiteral.new elements_type: textenc_string_array

metadata

@@ -1,121 +1,72 @@
 --- !ruby/object:Gem::Specification
 name: pg
 version: !ruby/object:Gem::Version
-  version: 0.18.1
+  version: 0.18.2
 platform: x86-mingw32
 authors:
 - Michael Granger
 - Lars Kanis
 autorequire: 
 bindir: bin
-cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDLjCCAhagAwIBAgIBAjANBgkqhkiG9w0BAQUFADA9MQ4wDAYDVQQDDAVrYW5p
-  czEXMBUGCgmSJomT8ixkARkWB2NvbWNhcmQxEjAQBgoJkiaJk/IsZAEZFgJkZTAe
-  Fw0xNDAyMjYwOTMzMDBaFw0xNTAyMjYwOTMzMDBaMD0xDjAMBgNVBAMMBWthbmlz
-  MRcwFQYKCZImiZPyLGQBGRYHY29tY2FyZDESMBAGCgmSJomT8ixkARkWAmRlMIIB
-  IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApop+rNmg35bzRugZ21VMGqI6
-  HGzPLO4VHYncWn/xmgPU/ZMcZdfj6MzIaZJ/czXyt4eHpBk1r8QOV3gBXnRXEjVW
-  9xi+EdVOkTV2/AVFKThcbTAQGiF/bT1n2M+B1GTybRzMg6hyhOJeGPqIhLfJEpxn
-  lJi4+ENAVT4MpqHEAGB8yFoPC0GqiOHQsdHxQV3P3c2OZqG+yJey74QtwA2tLcLn
-  Q53c63+VLGsOjODl1yPn/2ejyq8qWu6ahfTxiIlSar2UbwtaQGBDFdb2CXgEufXT
-  L7oaPxlmj+Q2oLOfOnInd2Oxop59HoJCQPsg8f921J43NCQGA8VHK6paxIRDLQID
-  AQABozkwNzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUvgTdT7fe
-  x17ugO3IOsjEJwW7KP4wDQYJKoZIhvcNAQEFBQADggEBAFmIAhRT0awqLQN9e4Uv
-  ZEk+jUWv4zkb+TWiKFJXlwjPyjGbZY9gVfOwAwMibYOK/t/+57ZzW3d0L12OUwvo
-  on84NVvYtIr1/iskJFWFkMoIquAFCdi9p68stSPMQK2XcrJJuRot29fJtropsZBa
-  2cpaNd/sRYdK4oep2usdKifA1lI0hIkPb3r5nLfwG2lAqBH7WZsUICHcTgR0VEbG
-  z9Ug5qQp9Uz73xC9YdGvGiuOX53LYobHAR4MWi2xxDlHI+ER8mRz0eY2FUuNu/Wj
-  GrqF74zpLl7/KFdHC8VmzwZS18hvDjxeLVuVI2gIGnBInqnlqv05g/l4/1pISh5j
-  dS4=
-  -----END CERTIFICATE-----
-date: 2015-01-06 00:00:00.000000000 Z
+cert_chain: []
+date: 2015-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: hoe-mercurial
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-- !ruby/object:Gem::Dependency
-  name: hoe-deveiate
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-- !ruby/object:Gem::Dependency
-  name: hoe-highline
+  name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
-  name: rake-compiler
+  name: hoe
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '3.12'
 - !ruby/object:Gem::Dependency
-  name: hoe
+  name: hoe-deveiate
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: hoe-bundler
   requirement: !ruby/object:Gem::Requirement