pg 0.19.0.pre20160817083826 → 0.19.0.pre20160820113039

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c49e1dff958fe6dd764cfaca8da5a8b5e73e4273
-  data.tar.gz: 641472a239e3b4b94d6d4a3bf4ccfeccc04833a4
+  metadata.gz: 8058186c6bc4c34b0872a6ff898dd79402a68a5f
+  data.tar.gz: 3571df1473fea4349b51890f8c0ab8449ed42da4
 SHA512:
-  metadata.gz: 7b59477570b1d6201d05686f1335fd2ea24b57824a1f686925f7f9f12730a5a5a9fdd9492a85d9700bd2c4c3fd57979b28b09d6b9745af3b016713c379009b3a
-  data.tar.gz: aa58b0f6a12689e09eb95c514cdadd34591862aa3b0e70065ce06dc31a0d0a2dc6703883e4bf8fd385ac1eecffc8fc384dd728972d1896ad435e8901a3517ab4
+  metadata.gz: c1737c25dc56f669af2c1b0dc2a4fa3b6bc83233557b628da56b441c0fd2e8dab6ff8078b5687252a3cc932e8c63cd4a96e059b79745c545d782cdf685b47645
+  data.tar.gz: 01c63d8a07955cd36590d61d7c1beb43e9c5c0712f907ad9377672035efd45893a9ad15c01f51df3173a15f2780d29e1cdbe1126d365efdb7fb28d4fc9819a91

data/BSDL

@@ -1,4 +1,4 @@
-Copyright (C) 1993-2010 Yukihiro Matsumoto. All rights reserved.
+Copyright (C) 1993-2013 Yukihiro Matsumoto. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
@@ -19,4 +19,4 @@ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
+SUCH DAMAGE.

data/History.rdoc

@@ -1,14 +1,26 @@
 == v0.19.0 [YYYY-MM-DD] 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>

data/README.rdoc

@@ -11,7 +11,7 @@ docs :: http://deveiate.org/code/pg
 
 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.1 and later}[http://www.postgresql.org/support/versioning/].
 
 A small example usage:
 
@@ -37,10 +37,10 @@ A small example usage:
 
 == 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
+* PostgreSQL 9.1.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.
 
 
@@ -66,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
 
@@ -133,7 +137,7 @@ Lars Kanis <lars@greiz-reinsdorf.de>.
 
 == Copying
 
-Copyright (c) 1997-2015 by the authors.
+Copyright (c) 1997-2016 by the authors.
 
 * Jeff Davis <ruby-pg@j-davis.com>
 * Guy Decoux (ts) <decoux@moulon.inra.fr>
@@ -145,7 +149,7 @@ Copyright (c) 1997-2015 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

data/Rakefile

@@ -189,9 +189,7 @@ task :update_error_codes do
 
 	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
 
@@ -205,7 +203,6 @@ file GEMSPEC => __FILE__
 task GEMSPEC do |task|
 	spec = $hoespec.spec
 	spec.files.delete( '.gemtest' )
-	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|

data/ext/pg.c

@@ -1,12 +1,13 @@
 /*
  * pg.c - Toplevel extension
- * $Id: pg.c,v b60c89ee93c8 2015/02/11 20:59:36 lars $
+ * $Id: pg.c,v c77d0997b4e4 2016/08/20 17:30:03 ged $
  *
  * Author/s:
  *
  * - Jeff Davis <ruby-pg@j-davis.com>
  * - Guy Decoux (ts) <decoux@moulon.inra.fr>
  * - Michael Granger <ged@FaerieMUD.org>
+ * - Lars Kanis <lars@greiz-reinsdorf.de>
  * - Dave Lee
  * - Eiji Matsumoto <usagi@ruby.club.or.jp>
  * - Yukihiro Matsumoto <matz@ruby-lang.org>
@@ -15,10 +16,10 @@
  * See Contributors.rdoc for the many additional fine people that have contributed
  * to this library over the years.
  *
- * Copyright (c) 1997-2015 by the authors.
+ * Copyright (c) 1997-2016 by the authors.
  *
  * 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

data/lib/pg/basic_type_mapping.rb

@@ -188,7 +188,8 @@ module PG::BasicTypeRegistry
 	# 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 0, 'json', PG::TextEncoder::JSON, PG::TextDecoder::JSON
+	alias_type    0, 'jsonb',  'json'
 	# register_type 'citext', OID::Text.new
 	# register_type 'ltree', OID::Text.new
 	#
@@ -339,10 +340,11 @@ end
 # OIDs of supported type casts are not hard-coded in the sources, but are retrieved from the
 # PostgreSQL's pg_type table in PG::BasicTypeMapForQueries.new .
 #
-# Query params are type casted based on the MRI internal type of the given value.
+# Query params are type casted based on the class of the given value.
 #
 # Higher level libraries will most likely not make use of this class, but use their
-# own set of rules to choose suitable encoders and decoders.
+# own derivation of PG::TypeMapByClass or another set of rules to choose suitable
+# encoders and decoders for the values to be sent.
 #
 # Example:
 #   conn = PG::Connection.new

data/lib/pg/connection.rb

@@ -186,7 +186,7 @@ class PG::Connection
 				raise
 			else
 				res = get_last_result
-				if res.result_status != PGRES_COMMAND_OK
+				if !res || res.result_status != PGRES_COMMAND_OK
 					while get_copy_data
 					end
 					while get_result

data/lib/pg/text_decoder.rb

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'date'
+require 'json'
 
 module PG
 	module TextDecoder
@@ -39,6 +40,12 @@ module PG
 				end
 			end
 		end
+
+		class JSON < SimpleDecoder
+			def decode(string, tuple=nil, field=nil)
+				::JSON.load(string)
+			end
+		end
 	end
 end # module PG
 

data/lib/pg/text_encoder.rb

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
+require 'json'
+
 module PG
 	module TextEncoder
 		class Date < SimpleEncoder
@@ -22,6 +24,12 @@ module PG
 				value.respond_to?(:strftime) ? value.strftime(STRFTIME_ISO_DATETIME_WITH_TIMEZONE) : value
 			end
 		end
+
+		class JSON < SimpleEncoder
+			def encode(value)
+				::JSON.dump(value)
+			end
+		end
 	end
 end # module PG
 

data/spec/pg/basic_type_mapping_spec.rb

@@ -166,6 +166,27 @@ describe 'Basic type mapping' do
 				end
 			end
 
+			it "should do JSON conversions", :postgresql_94 do
+				[0].each do |format|
+					['JSON', 'JSONB'].each do |type|
+						res = @conn.exec( "SELECT CAST('123' AS #{type}),
+																			CAST('12.3' AS #{type}),
+																			CAST('true' AS #{type}),
+																			CAST('false' AS #{type}),
+																			CAST('null' AS #{type}),
+																			CAST('[1, \"a\", null]' AS #{type}),
+																			CAST('{\"b\" : [2,3]}' AS #{type})", [], format )
+						expect( res.getvalue(0,0) ).to eq( 123 )
+						expect( res.getvalue(0,1) ).to be_within(0.1).of( 12.3 )
+						expect( res.getvalue(0,2) ).to eq( true )
+						expect( res.getvalue(0,3) ).to eq( false )
+						expect( res.getvalue(0,4) ).to eq( nil )
+						expect( res.getvalue(0,5) ).to eq( [1, "a", nil] )
+						expect( res.getvalue(0,6) ).to eq( {"b" => [2, 3]} )
+					end
+				end
+			end
+
 			it "should do array type conversions" do
 				[0].each do |format|
 					res = @conn.exec( "SELECT CAST('{1,2,3}' AS INT2[]), CAST('{{1,2},{3,4}}' AS INT2[][]),
@@ -228,6 +249,39 @@ describe 'Basic type mapping' do
 				res = @conn.exec( "SELECT * FROM copytable" )
 				expect( res.values ).to eq( [['a', '123', '{5,4,3}'], ['b', '234', '{2,3}']] )
 			end
+
+			it "can do JSON conversions", :postgresql_94 do
+				['JSON', 'JSONB'].each do |type|
+					sql = "SELECT CAST('123' AS #{type}),
+						CAST('12.3' AS #{type}),
+						CAST('true' AS #{type}),
+						CAST('false' AS #{type}),
+						CAST('null' AS #{type}),
+						CAST('[1, \"a\", null]' AS #{type}),
+						CAST('{\"b\" : [2,3]}' AS #{type})"
+
+					tm = basic_type_mapping.build_column_map( @conn.exec( sql ) )
+					expect( tm.coders.map(&:name) ).to eq( [type.downcase] * 7 )
+
+					res = @conn.exec_params( "SELECT $1, $2, $3, $4, $5, $6, $7",
+						[ 123,
+							12.3,
+							true,
+							false,
+							nil,
+							[1, "a", nil],
+							{"b" => [2, 3]},
+						], 0, tm )
+
+					expect( res.getvalue(0,0) ).to eq( "123" )
+					expect( res.getvalue(0,1) ).to eq( "12.3" )
+					expect( res.getvalue(0,2) ).to eq( "true" )
+					expect( res.getvalue(0,3) ).to eq( "false" )
+					expect( res.getvalue(0,4) ).to eq( nil )
+					expect( res.getvalue(0,5).gsub(" ","") ).to eq( "[1,\"a\",null]" )
+					expect( res.getvalue(0,6).gsub(" ","") ).to eq( "{\"b\":[2,3]}" )
+				end
+			end
 		end
 
 		context "with usage of result oids for copy encoder selection" do

data/spec/pg/connection_spec.rb

@@ -643,6 +643,31 @@ describe PG::Connection do
 		expect( @conn ).to still_be_usable
 	end
 
+	it "gracefully handle SQL statements while in #copy_data for input" do
+		@conn.exec "ROLLBACK"
+		@conn.transaction do
+			@conn.exec( "CREATE TEMP TABLE copytable (col1 INT)" )
+			expect {
+				@conn.copy_data( "COPY copytable FROM STDOUT" ) do |res|
+					@conn.exec "SELECT 1"
+				end
+			}.to raise_error(PG::Error, /no COPY in progress/)
+		end
+		expect( @conn ).to still_be_usable
+	end
+
+	it "gracefully handle SQL statements while in #copy_data for output" do
+		@conn.exec "ROLLBACK"
+		@conn.transaction do
+			expect {
+				@conn.copy_data( "COPY (VALUES(1), (2)) TO STDOUT" ) do |res|
+					@conn.exec "SELECT 3"
+				end
+			}.to raise_error(PG::Error, /no COPY in progress/)
+		end
+		expect( @conn ).to still_be_usable
+	end
+
 	it "should raise an error for non copy statements in #copy_data" do
 		expect {
 			@conn.copy_data( "SELECT 1" ){}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg
 version: !ruby/object:Gem::Version
-  version: 0.19.0.pre20160817083826
+  version: 0.19.0.pre20160820113039
 platform: ruby
 authors:
 - Michael Granger
@@ -11,26 +11,32 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDMDCCAhigAwIBAgIBAjANBgkqhkiG9w0BAQUFADA+MQwwCgYDVQQDDANnZWQx
+  MIIEbDCCAtSgAwIBAgIBATANBgkqhkiG9w0BAQsFADA+MQwwCgYDVQQDDANnZWQx
   GTAXBgoJkiaJk/IsZAEZFglGYWVyaWVNVUQxEzARBgoJkiaJk/IsZAEZFgNvcmcw
-  HhcNMTYwNjAyMDE1NTQ2WhcNMTcwNjAyMDE1NTQ2WjA+MQwwCgYDVQQDDANnZWQx
+  HhcNMTYwODIwMTgxNzQyWhcNMTcwODIwMTgxNzQyWjA+MQwwCgYDVQQDDANnZWQx
   GTAXBgoJkiaJk/IsZAEZFglGYWVyaWVNVUQxEzARBgoJkiaJk/IsZAEZFgNvcmcw
-  ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDb92mkyYwuGBg1oRxt2tkH
-  +Uo3LAsaL/APBfSLzy8o3+B3AUHKCjMUaVeBoZdWtMHB75X3VQlvXfZMyBxj59Vo
-  cDthr3zdao4HnyrzAIQf7BO5Y8KBwVD+yyXCD/N65TTwqsQnO3ie7U5/9ut1rnNr
-  OkOzAscMwkfQxBkXDzjvAWa6UF4c5c9kR/T79iA21kDx9+bUMentU59aCJtUcbxa
-  7kcKJhPEYsk4OdxR9q2dphNMFDQsIdRO8rywX5FRHvcb+qnXC17RvxLHtOjysPtp
-  EWsYoZMxyCDJpUqbwoeiM+tAHoz2ABMv3Ahie3Qeb6+MZNAtMmaWfBx3dg2u+/WN
-  AgMBAAGjOTA3MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBSZ0hCV
-  qoHr122fGKelqffzEQBhszANBgkqhkiG9w0BAQUFAAOCAQEAF2XCzjfTFxkcVvuj
-  hhBezFkZnMDYtWezg4QCkR0RHg4sl1LdXjpvvI59SIgD/evD1hOteGKsXqD8t0E4
-  OPAWWv/z+JRma72zeYsBZLSDRPIUvBoul6qCpvY0MiWTh496mFwOxT5lvSAUoh+U
-  pQ/MQeH/yC6hbGp7IYska6J8T4z5XkYqafYZ3eKQ8H+xPd/z+gYx+jd0PfkWf1Wk
-  QQdziL01SKBHf33OAH/p/puCpwS+ZDfgnNx5oMijWbc671UXkrt7zjD0kGakq+9I
-  hnfm736z8j1wvWddqf45++gwPpDr1E4zoAq2PgRl/WBNyR0hfoZLpi3TnHu3eC0x
-  uALKNA==
+  ggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQC/JWGRHO+USzR97vXjkFgt
+  83qeNf2KHkcvrRTSnR64i6um/ziin0I0oX23H7VYrDJC9A/uoUa5nGRJS5Zw/+wW
+  ENcvWVZS4iUzi4dsYJGY6yEOsXh2CcF46+QevV8iE+UmbkU75V7Dy1JCaUOyizEt
+  TH5UHsOtUU7k9TYARt/TgYZKuaoAMZZd5qyVqhF1vV+7/Qzmp89NGflXf2xYP26a
+  4MAX2qqKX/FKXqmFO+AGsbwYTEds1mksBF3fGsFgsQWxftG8GfZQ9+Cyu2+l1eOw
+  cZ+lPcg834G9DrqW2zhqUoLr1MTly4pqxYGb7XoDhoR7dd1kFE2a067+DzWC/ADt
+  +QkcqWUm5oh1fN0eqr7NsZlVJDulFgdiiYPQiIN7UNsii4Wc9aZqBoGcYfBeQNPZ
+  soo/6za/bWajOKUmDhpqvaiRv9EDpVLzuj53uDoukMMwxCMfgb04+ckQ0t2G7wqc
+  /D+K9JW9DDs3Yjgv9k4h7YMhW5gftosd+NkNC/+Y2CkCAwEAAaN1MHMwCQYDVR0T
+  BAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFHKN/nkRusdqCJEuq3lgB3fJvyTg
+  MBwGA1UdEQQVMBOBEWdlZEBGYWVyaWVNVUQub3JnMBwGA1UdEgQVMBOBEWdlZEBG
+  YWVyaWVNVUQub3JnMA0GCSqGSIb3DQEBCwUAA4IBgQAPJzKiT0zBU7kpqe0aS2qb
+  FI0PJ4y5I8buU4IZGUD5NEt/N7pZNfOyBxkrZkXhS44Fp+xwBH5ebLbq/WY78Bqd
+  db0z6ZgW4LMYMpWFfbXsRbd9TU2f52L8oMAhxOvF7Of5qJMVWuFQ8FPagk2iHrdH
+  inYLQagqAF6goWTXgAJCdPd6SNeeSNqA6vlY7CV1Jh5kfNJJ6xu/CVij1GzCLu/5
+  DMOr26DBv+qLJRRC/2h34uX71q5QgeOyxvMg+7V3u/Q06DXyQ2VgeeqiwDFFpEH0
+  PFkdPO6ZqbTRcLfNH7mFgCBJjsfSjJrn0sPBlYyOXgCoByfZnZyrIMH/UY+lgQqS
+  6Von1VDsfQm0eJh5zYZD64ZF86phSR7mUX3mXItwH04HrZwkWpvgd871DZVR3i1n
+  w8aNA5re5+Rt/Vvjxj5AcEnZnZiz5x959NaddQocX32Z1unHw44pzRNUur1GInfW
+  p4vpx2kUSFSAGjtCbDGTNV2AH8w9OU4xEmNz8c5lyoA=
   -----END CERTIFICATE-----
-date: 2016-08-17 00:00:00.000000000 Z
+date: 2016-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hoe-mercurial
@@ -161,7 +167,7 @@ dependencies:
 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.1 and later}[http://www.postgresql.org/support/versioning/].
 
   A small example usage: