pg 1.1.0.pre20180730171000 → 1.1.0

data/History.rdoc

@@ -1,12 +1,6 @@
-== v2.0.0 - far from release -
+== v1.1.0 [2018-08-24] Michael Granger <ged@FaerieMUD.org>
 
-Removed:
-- Removed query method variants deprecated in pg-1.1.0.
-
-
-== v1.1.0 [YYYY-MM-DD] Michael Granger <ged@FaerieMUD.org>
-
-Deprecated:
+Deprecated (disable warnings per PG_SKIP_DEPRECATION_WARNING=1):
 - Forwarding conn.exec to conn.exec_params is deprecated.
 - Forwarding conn.exec_params to conn.exec is deprecated.
 - Forwarding conn.async_exec to conn.async_exec_params.
@@ -20,6 +14,7 @@ PG::Connection enhancements:
   They are identical to their syncronous counterpart, but make use of PostgreSQL's async API.
 - Replace `rb_thread_fd_select()` by faster `rb_wait_for_single_fd()` in `conn.block` and `conn.async_exec` .
 - Add PG::Connection#discard_results .
+- Raise an ArgumentError for strings containing zero bytes by #escape, #escape_literal, #escape_identifier, #quote_ident and PG::TextEncoder::Identifier. These methods previously truncated strings.
 
 Result retrieval enhancements:
 - Add PG::Result#tuple_values to retrieve all field values of a row as array.

data/Manifest.txt

@@ -1,4 +1,72 @@
-# Manifest is built per Rakefile as part of `rake gem`.
-# These files are required to satisfy Hoe:
+.gemtest
+BSDL
+ChangeLog
+Contributors.rdoc
+History.rdoc
+LICENSE
+Manifest.txt
+POSTGRES
+README-OS_X.rdoc
+README-Windows.rdoc
+README.ja.rdoc
 README.rdoc
+Rakefile
+Rakefile.cross
+ext/errorcodes.def
+ext/errorcodes.rb
+ext/errorcodes.txt
+ext/extconf.rb
+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_tuple.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/binary_decoder.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/tuple.rb
+lib/pg/type_map_by_column.rb
+spec/data/expected_trace.out
+spec/data/random_binary_data
+spec/helpers.rb
+spec/pg/basic_type_mapping_spec.rb
+spec/pg/connection_spec.rb
+spec/pg/connection_sync_spec.rb
+spec/pg/result_spec.rb
+spec/pg/tuple_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/Rakefile

@@ -55,7 +55,6 @@ $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.spec_extras[:files] = `hg manifest || git ls-files`.split
 	self.license 'BSD-3-Clause'
 
 	self.developer 'Michael Granger', 'ged@FaerieMUD.org'

data/ext/pg.c

@@ -1,6 +1,6 @@
 /*
  * pg.c - Toplevel extension
- * $Id$
+ * $Id: pg.c,v 0d4acc8a0bc5 2018/08/05 09:07:58 lars $
  *
  * Author/s:
  *
@@ -48,6 +48,7 @@
 
 #include "pg.h"
 
+int pg_skip_deprecation_warning;
 VALUE rb_mPG;
 VALUE rb_mPGconstants;
 
@@ -381,6 +382,8 @@ pg_s_init_ssl(VALUE self, VALUE do_ssl)
 void
 Init_pg_ext()
 {
+	pg_skip_deprecation_warning = RTEST(rb_eval_string("ENV['PG_SKIP_DEPRECATION_WARNING']"));
+
 	rb_mPG = rb_define_module( "PG" );
 	rb_mPGconstants = rb_define_module_under( rb_mPG, "Constants" );
 

data/ext/pg.h

@@ -217,6 +217,7 @@ typedef struct {
  * Globals
  **************************************************************************/
 
+extern int pg_skip_deprecation_warning;
 extern VALUE rb_mPG;
 extern VALUE rb_ePGerror;
 extern VALUE rb_eServerError;
@@ -350,4 +351,10 @@ rb_encoding *pg_conn_enc_get                           _(( PGconn * ));
 void notice_receiver_proxy(void *arg, const PGresult *result);
 void notice_processor_proxy(void *arg, const char *message);
 
+/* reports if `-W' specified and PG_SKIP_DEPRECATION_WARNING environment variable isn't set */
+#define pg_deprecated(x) \
+	do { \
+		if( !pg_skip_deprecation_warning ) rb_warning x; \
+	} while(0);
+
 #endif /* end __pg_h */

data/ext/pg_binary_decoder.c

@@ -1,6 +1,6 @@
 /*
  * pg_column_map.c - PG::ColumnMap class extension
- * $Id$
+ * $Id: pg_binary_decoder.c,v 5d166a4d0441 2018/07/29 12:03:00 lars $
  *
  */
 

data/ext/pg_binary_encoder.c

@@ -1,6 +1,6 @@
 /*
  * pg_column_map.c - PG::ColumnMap class extension
- * $Id$
+ * $Id: pg_binary_encoder.c,v e61a06f1f5ed 2015/12/25 21:14:21 lars $
  *
  */
 

data/ext/pg_connection.c

@@ -1,6 +1,6 @@
 /*
  * pg_connection.c - PG::Connection class extension
- * $Id$
+ * $Id: pg_connection.c,v e57f6b452eb3 2018/08/18 10:58:52 lars $
  *
  */
 
@@ -1006,7 +1006,7 @@ pgconn_exec(int argc, VALUE *argv, VALUE self)
 		}
 		return rb_pgresult;
 	}
-	rb_warning("forwarding exec to exec_params is deprecated");
+	pg_deprecated(("forwarding exec to exec_params is deprecated"));
 
 	/* Otherwise, just call #exec_params instead for backward-compatibility */
 	return pgconn_exec_params( argc, argv, self );
@@ -1321,7 +1321,7 @@ pgconn_exec_params( int argc, VALUE *argv, VALUE self )
 	 * is passed to #exec
 	 */
 	if ( NIL_P(paramsData.params) ) {
-		rb_warning("forwarding exec_params to exec is deprecated");
+		pg_deprecated(("forwarding exec_params to exec is deprecated"));
 		return pgconn_exec( 1, argv, self );
 	}
 	pgconn_query_assign_typemap( self, &paramsData );
@@ -1587,7 +1587,7 @@ pgconn_s_escape(VALUE self, VALUE string)
 	int enc_idx;
 	int singleton = !rb_obj_is_kind_of(self, rb_cPGconn);
 
-	Check_Type(string, T_STRING);
+	StringValueCStr(string);
 	enc_idx = ENCODING_GET( singleton ? string : self );
 	if( ENCODING_GET(string) != enc_idx ){
 		string = rb_str_export_to_enc(string, rb_enc_from_index(enc_idx));
@@ -1703,7 +1703,7 @@ pgconn_escape_literal(VALUE self, VALUE string)
 	VALUE result = Qnil;
 	int enc_idx = ENCODING_GET(self);
 
-	Check_Type(string, T_STRING);
+	StringValueCStr(string);
 	if( ENCODING_GET(string) != enc_idx ){
 		string = rb_str_export_to_enc(string, rb_enc_from_index(enc_idx));
 	}
@@ -1745,7 +1745,7 @@ pgconn_escape_identifier(VALUE self, VALUE string)
 	VALUE result = Qnil;
 	int enc_idx = ENCODING_GET(self);
 
-	Check_Type(string, T_STRING);
+	StringValueCStr(string);
 	if( ENCODING_GET(string) != enc_idx ){
 		string = rb_str_export_to_enc(string, rb_enc_from_index(enc_idx));
 	}
@@ -1851,7 +1851,7 @@ pgconn_send_query(int argc, VALUE *argv, VALUE self)
 		return Qnil;
 	}
 
-	rb_warning("forwarding async_exec to async_exec_params and send_query to send_query_params is deprecated");
+	pg_deprecated(("forwarding async_exec to async_exec_params and send_query to send_query_params is deprecated"));
 
 	/* If called with parameters, and optionally result_format,
 	 * use PQsendQueryParams
@@ -3223,7 +3223,7 @@ pgconn_async_exec_params(int argc, VALUE *argv, VALUE self)
 	pgconn_discard_results( self );
 	/* If called with no or nil parameters, use PQsendQuery for compatibility */
 	if ( argc == 1 || (argc >= 2 && argc <= 4 && NIL_P(argv[1]) )) {
-		rb_warning("forwarding async_exec_params to async_exec is deprecated");
+		pg_deprecated(("forwarding async_exec_params to async_exec is deprecated"));
 		pgconn_send_query( argc, argv, self );
 	} else {
 		pgconn_send_query_params( argc, argv, self );

data/ext/pg_result.c

@@ -1,6 +1,6 @@
 /*
  * pg_result.c - PG::Result class extension
- * $Id$
+ * $Id: pg_result.c,v a8b70c42b3e8 2018/07/30 14:09:38 kanis $
  *
  */
 

data/ext/pg_text_decoder.c

@@ -1,6 +1,6 @@
 /*
  * pg_text_decoder.c - PG::TextDecoder module
- * $Id$
+ * $Id: pg_text_decoder.c,v cee615e0ea2c 2018/07/30 05:27:05 lars $
  *
  */
 

data/ext/pg_text_encoder.c

@@ -1,6 +1,6 @@
 /*
  * pg_text_encoder.c - PG::TextEncoder module
- * $Id$
+ * $Id: pg_text_encoder.c,v e57f6b452eb3 2018/08/18 10:58:52 lars $
  *
  */
 
@@ -468,20 +468,19 @@ pg_text_enc_array(t_pg_coder *conv, VALUE value, char *out, VALUE *intermediate,
 static char *
 quote_identifier( VALUE value, VALUE out_string, char *current_out ){
 	char *p_in = RSTRING_PTR(value);
-	char *ptr1;
 	size_t strlen = RSTRING_LEN(value);
+	char *p_inend = p_in + strlen;
 	char *end_capa = current_out;
 
 	PG_RB_STR_ENSURE_CAPA( out_string, strlen + 2, current_out, end_capa );
 	*current_out++ = '"';
-	for(ptr1 = p_in; ptr1 != p_in + strlen; ptr1++) {
-		char c = *ptr1;
+	for(; p_in != p_inend; p_in++) {
+		char c = *p_in;
 		if (c == '"'){
-			strlen++;
-			PG_RB_STR_ENSURE_CAPA( out_string, p_in - ptr1 + strlen + 1, current_out, end_capa );
+			PG_RB_STR_ENSURE_CAPA( out_string, p_inend - p_in + 2, current_out, end_capa );
 			*current_out++ = '"';
 		} else if (c == 0){
-			break;
+			rb_raise(rb_eArgError, "string contains null byte");
 		}
 		*current_out++ = c;
 	}

data/ext/pg_tuple.c

@@ -311,9 +311,9 @@ pg_tuple_yield_key_value(VALUE key, VALUE index, VALUE _this)
 
 /*
  * call-seq:
- *    tup.each{ |value| ... }
+ *    tup.each{ |key, value| ... }
  *
- * Invokes block for each field value in the tuple.
+ * Invokes block for each field name and value in the tuple.
  */
 static VALUE
 pg_tuple_each(VALUE self)
@@ -354,7 +354,8 @@ pg_tuple_each_value(VALUE self)
 	RETURN_SIZED_ENUMERATOR(self, 0, NULL, pg_tuple_num_fields_for_enum);
 
 	for(field_num = 0; field_num < this->num_fields; field_num++) {
-		rb_yield(pg_tuple_aref(self, INT2NUM(field_num)));
+		VALUE value = pg_tuple_materialize_field(this, field_num);
+		rb_yield(value);
 	}
 
 	pg_tuple_detach(this);

data/ext/pg_type_map.c

@@ -1,6 +1,6 @@
 /*
  * pg_column_map.c - PG::ColumnMap class extension
- * $Id$
+ * $Id: pg_type_map.c,v 2af122820861 2017/01/14 19:56:36 lars $
  *
  */
 

data/ext/pg_type_map_all_strings.c

@@ -1,6 +1,6 @@
 /*
  * pg_type_map_all_strings.c - PG::TypeMapAllStrings class extension
- * $Id$
+ * $Id: pg_type_map_all_strings.c,v c53f993a4254 2014/12/12 21:57:29 lars $
  *
  * This is the default typemap.
  *

data/ext/pg_type_map_by_class.c

@@ -1,6 +1,6 @@
 /*
  * pg_type_map_by_class.c - PG::TypeMapByClass class extension
- * $Id$
+ * $Id: pg_type_map_by_class.c,v eeb8a82c5328 2014/11/10 19:34:02 lars $
  *
  * This type map can be used to select value encoders based on the class
  * of the given value to be send.

data/ext/pg_type_map_by_column.c

@@ -1,6 +1,6 @@
 /*
  * pg_column_map.c - PG::ColumnMap class extension
- * $Id$
+ * $Id: pg_type_map_by_column.c,v fcf731d3dff7 2015/09/08 12:25:06 jfali $
  *
  */
 

data/ext/pg_type_map_by_mri_type.c

@@ -1,6 +1,6 @@
 /*
  * pg_type_map_by_mri_type.c - PG::TypeMapByMriType class extension
- * $Id$
+ * $Id: pg_type_map_by_mri_type.c,v 1269b8ad77b8 2015/02/06 16:38:23 lars $
  *
  * This type map can be used to select value encoders based on the MRI-internal
  * value type code.

data/ext/pg_type_map_by_oid.c

@@ -1,6 +1,6 @@
 /*
  * pg_type_map_by_oid.c - PG::TypeMapByOid class extension
- * $Id$
+ * $Id: pg_type_map_by_oid.c,v c99d26015e3c 2014/12/12 20:58:25 lars $
  *
  */
 

data/ext/pg_type_map_in_ruby.c

@@ -1,6 +1,6 @@
 /*
  * pg_type_map_in_ruby.c - PG::TypeMapInRuby class extension
- * $Id$
+ * $Id: pg_type_map_in_ruby.c,v 3d89d3aae4fd 2015/01/05 16:19:41 kanis $
  *
  */
 

data/ext/util.c

@@ -1,6 +1,6 @@
 /*
  * util.c - Utils for ruby-pg
- * $Id$
+ * $Id: util.c,v fc1c4deb1398 2018/06/25 12:02:09 kanis $
  *
  */
 

data/lib/pg.rb

@@ -35,10 +35,10 @@ end
 module PG
 
 	# Library version
-	VERSION = '1.1.0.pre20180730171000'
+	VERSION = '1.1.0'
 
 	# VCS revision
-	REVISION = %q$Revision$
+	REVISION = %q$Revision: ca83074366ac $
 
 	class NotAllCopyDataRetrieved < PG::Error
 	end

data/spec/pg/basic_type_mapping_spec.rb

@@ -256,10 +256,10 @@ describe 'Basic type mapping' do
 																		CAST('294276-12-31 23:58:59.1231+03' AS TIMESTAMP WITH TIME ZONE),
 																		CAST('infinity' AS TIMESTAMP WITH TIME ZONE),
 																		CAST('-infinity' AS TIMESTAMP WITH TIME ZONE)", [], format )
-					expect( res.getvalue(0,0).iso8601(3) ).to eq( Time.new(2013, 12, 31, 23, 58, 59, "+02:00").getlocal.iso8601(3) )
-					expect( res.getvalue(0,1).iso8601(3) ).to eq( Time.new(1913, 12, 31, 23, 58, 59.1231, "-03:00").getlocal.iso8601(3) )
-					expect( res.getvalue(0,2).iso8601(3) ).to eq( Time.new(-4713, 11, 24, 23, 58, 59.1231, "-03:00").getlocal.iso8601(3) )
-					expect( res.getvalue(0,3).iso8601(3) ).to eq( Time.new(294276, 12, 31, 23, 58, 59.1231, "+03:00").getlocal.iso8601(3) )
+					expect( res.getvalue(0,0) ).to be_within(1e-3).of( Time.new(2013, 12, 31, 23, 58, 59, "+02:00").getlocal )
+					expect( res.getvalue(0,1) ).to be_within(1e-3).of( Time.new(1913, 12, 31, 23, 58, 59.1231, "-03:00").getlocal )
+					expect( res.getvalue(0,2) ).to be_within(1e-3).of( Time.new(-4713, 11, 24, 23, 58, 59.1231, "-03:00").getlocal )
+					expect( res.getvalue(0,3) ).to be_within(1e-3).of( Time.new(294276, 12, 31, 23, 58, 59.1231, "+03:00").getlocal )
 					expect( res.getvalue(0,4) ).to eq( 'infinity' )
 					expect( res.getvalue(0,5) ).to eq( '-infinity' )
 				end

data/spec/pg/connection_spec.rb

@@ -1237,51 +1237,51 @@ describe PG::Connection do
 			end
 
 			it "uses the client encoding for escaped string" do
-				original = "Möhre to\0 escape".encode( "utf-16be" )
+				original = "Möhre to 'scape".encode( "utf-16be" )
 				@conn.set_client_encoding( "euc_jp" )
 				escaped  = @conn.escape( original )
 				expect( escaped.encoding ).to eq( Encoding::EUC_JP )
-				expect( escaped ).to eq( "Möhre to".encode(Encoding::EUC_JP) )
+				expect( escaped ).to eq( "Möhre to ''scape".encode(Encoding::EUC_JP) )
 			end
 
 			it "uses the client encoding for escaped literal" do
-				original = "Möhre to\0 escape".encode( "utf-16be" )
+				original = "Möhre to 'scape".encode( "utf-16be" )
 				@conn.set_client_encoding( "euc_jp" )
 				escaped  = @conn.escape_literal( original )
 				expect( escaped.encoding ).to eq( Encoding::EUC_JP )
-				expect( escaped ).to eq( "'Möhre to'".encode(Encoding::EUC_JP) )
+				expect( escaped ).to eq( "'Möhre to ''scape'".encode(Encoding::EUC_JP) )
 			end
 
 			it "uses the client encoding for escaped identifier" do
-				original = "Möhre to\0 escape".encode( "utf-16le" )
+				original = "Möhre to 'scape".encode( "utf-16le" )
 				@conn.set_client_encoding( "euc_jp" )
 				escaped  = @conn.escape_identifier( original )
 				expect( escaped.encoding ).to eq( Encoding::EUC_JP )
-				expect( escaped ).to eq( "\"Möhre to\"".encode(Encoding::EUC_JP) )
+				expect( escaped ).to eq( "\"Möhre to 'scape\"".encode(Encoding::EUC_JP) )
 			end
 
 			it "uses the client encoding for quote_ident" do
-				original = "Möhre to\0 escape".encode( "utf-16le" )
+				original = "Möhre to 'scape".encode( "utf-16le" )
 				@conn.set_client_encoding( "euc_jp" )
 				escaped  = @conn.quote_ident( original )
 				expect( escaped.encoding ).to eq( Encoding::EUC_JP )
-				expect( escaped ).to eq( "\"Möhre to\"".encode(Encoding::EUC_JP) )
+				expect( escaped ).to eq( "\"Möhre to 'scape\"".encode(Encoding::EUC_JP) )
 			end
 
 			it "uses the previous string encoding for escaped string" do
-				original = "Möhre to\0 escape".encode( "iso-8859-1" )
+				original = "Möhre to 'scape".encode( "iso-8859-1" )
 				@conn.set_client_encoding( "euc_jp" )
 				escaped  = described_class.escape( original )
 				expect( escaped.encoding ).to eq( Encoding::ISO8859_1 )
-				expect( escaped ).to eq( "Möhre to".encode(Encoding::ISO8859_1) )
+				expect( escaped ).to eq( "Möhre to ''scape".encode(Encoding::ISO8859_1) )
 			end
 
 			it "uses the previous string encoding for quote_ident" do
-				original = "Möhre to\0 escape".encode( "iso-8859-1" )
+				original = "Möhre to 'scape".encode( "iso-8859-1" )
 				@conn.set_client_encoding( "euc_jp" )
 				escaped  = described_class.quote_ident( original )
 				expect( escaped.encoding ).to eq( Encoding::ISO8859_1 )
-				expect( escaped.encode ).to eq( "\"Möhre to\"".encode(Encoding::ISO8859_1) )
+				expect( escaped.encode ).to eq( "\"Möhre to 'scape\"".encode(Encoding::ISO8859_1) )
 			end
 
 			it "raises appropriate error if set_client_encoding is called with invalid arguments" do
@@ -1366,9 +1366,54 @@ describe PG::Connection do
 			end
 		end
 
+		it "rejects command strings with zero bytes" do
+			expect{ @conn.exec( "SELECT 1;\x00" ) }.to raise_error(ArgumentError, /null byte/)
+			expect{ @conn.exec_params( "SELECT 1;\x00", [] ) }.to raise_error(ArgumentError, /null byte/)
+			expect{ @conn.prepare( "abc\x00", "SELECT 1;" ) }.to raise_error(ArgumentError, /null byte/)
+			expect{ @conn.prepare( "abc", "SELECT 1;\x00" ) }.to raise_error(ArgumentError, /null byte/)
+			expect{ @conn.exec_prepared( "abc\x00", [] ) }.to raise_error(ArgumentError, /null byte/)
+			expect{ @conn.describe_prepared( "abc\x00" ) }.to raise_error(ArgumentError, /null byte/)
+			expect{ @conn.describe_portal( "abc\x00" ) }.to raise_error(ArgumentError, /null byte/)
+			expect{ @conn.send_query( "SELECT 1;\x00" ) }.to raise_error(ArgumentError, /null byte/)
+			expect{ @conn.send_query_params( "SELECT 1;\x00", [] ) }.to raise_error(ArgumentError, /null byte/)
+			expect{ @conn.send_prepare( "abc\x00", "SELECT 1;" ) }.to raise_error(ArgumentError, /null byte/)
+			expect{ @conn.send_prepare( "abc", "SELECT 1;\x00" ) }.to raise_error(ArgumentError, /null byte/)
+			expect{ @conn.send_query_prepared( "abc\x00", [] ) }.to raise_error(ArgumentError, /null byte/)
+			expect{ @conn.send_describe_prepared( "abc\x00" ) }.to raise_error(ArgumentError, /null byte/)
+			expect{ @conn.send_describe_portal( "abc\x00" ) }.to raise_error(ArgumentError, /null byte/)
+		end
+
+		it "rejects query params with zero bytes" do
+			expect{ @conn.exec_params( "SELECT 1;\x00", ["ab\x00"] ) }.to raise_error(ArgumentError, /null byte/)
+			expect{ @conn.exec_prepared( "abc\x00", ["ab\x00"] ) }.to raise_error(ArgumentError, /null byte/)
+			expect{ @conn.send_query_params( "SELECT 1;\x00", ["ab\x00"] ) }.to raise_error(ArgumentError, /null byte/)
+			expect{ @conn.send_query_prepared( "abc\x00", ["ab\x00"] ) }.to raise_error(ArgumentError, /null byte/)
+		end
+
+		it "rejects string with zero bytes in escape" do
+			expect{ @conn.escape( "ab\x00cd" ) }.to raise_error(ArgumentError, /null byte/)
+		end
+
+		it "rejects string with zero bytes in escape_literal" do
+			expect{ @conn.escape_literal( "ab\x00cd" ) }.to raise_error(ArgumentError, /null byte/)
+		end
+
+		it "rejects string with zero bytes in escape_identifier" do
+			expect{ @conn.escape_identifier( "ab\x00cd" ) }.to raise_error(ArgumentError, /null byte/)
+		end
+
+		it "rejects string with zero bytes in quote_ident" do
+			expect{ described_class.quote_ident( "ab\x00cd" ) }.to raise_error(ArgumentError, /null byte/)
+		end
+
+		it "rejects Array with string with zero bytes" do
+			original = ["xyz", "2\x00"]
+			expect{ described_class.quote_ident( original ) }.to raise_error(ArgumentError, /null byte/)
+		end
+
 		it "can quote bigger strings with quote_ident" do
 			original = "'01234567\"" * 100
-			escaped = described_class.quote_ident( original + "\0afterzero" )
+			escaped = described_class.quote_ident( original )
 			expect( escaped ).to eq( "\"" + original.gsub("\"", "\"\"") + "\"" )
 		end