Hello community, here is the log from the commit of package perl-DBD-Pg for openSUSE:Factory checked in at 2015-04-02 16:04:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-DBD-Pg (Old) and /work/SRC/openSUSE:Factory/.perl-DBD-Pg.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-DBD-Pg" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-DBD-Pg/perl-DBD-Pg.changes 2015-01-26 16:47:22.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-DBD-Pg.new/perl-DBD-Pg.changes 2015-04-02 16:04:27.000000000 +0200 @@ -1,0 +2,15 @@ +Wed Feb 18 09:36:47 UTC 2015 - stephan.ba...@suse.com + +- Update to version 3.5.1 from 3.5.0 + Upstream changes: + - Prevent core dump if the second argument to the quote() method + is anything but a hashref + - Better "support" for SQL_ASCII servers in the tests. + Allow env var DBDPG_TEST_ALWAYS_ENV to force use of DBI_DSN and DBI_USER + in tests. + - Fix client_encoding detection on pre-9.1 servers + - Fix operator existence check in tests on pre-8.3 servers + - Documentation fix + - Fix pg_switch_prepared database handle documentation + +------------------------------------------------------------------- Old: ---- DBD-Pg-3.5.0.tar.gz New: ---- DBD-Pg-3.5.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-DBD-Pg.spec ++++++ --- /var/tmp/diff_new_pack.gKYURI/_old 2015-04-02 16:04:27.000000000 +0200 +++ /var/tmp/diff_new_pack.gKYURI/_new 2015-04-02 16:04:27.000000000 +0200 @@ -21,7 +21,7 @@ Summary: PostgreSQL database driver for the DBI module License: GPL-1.0+ or Artistic-1.0 Group: Development/Libraries/Perl -Version: 3.5.0 +Version: 3.5.1 Release: 0 Url: http://search.cpan.org/dist/DBD-Pg/ Source: http://www.cpan.org/authors/id/T/TU/TURNSTEP/DBD-Pg-%{version}.tar.gz ++++++ DBD-Pg-3.5.0.tar.gz -> DBD-Pg-3.5.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/DBD-Pg-3.5.0/Changes new/DBD-Pg-3.5.1/Changes --- old/DBD-Pg-3.5.0/Changes 2015-01-06 21:36:42.000000000 +0100 +++ new/DBD-Pg-3.5.1/Changes 2015-02-17 22:18:07.000000000 +0100 @@ -1,7 +1,30 @@ 'GSM' is Greg Sabino Mullane, g...@turnstep.com -Version 3.5.0 Released January 6, 2015 +Version 3.5.1 Released February 17, 2015 (git commit 6c3457ee20c19ae492d29c490af6800e7e6a0774) + + - Prevent core dump if the second argument to the quote() method + is anything but a hashref + [Greg Sabino Mullane] + (CPAN bug #101980) + + - Better "support" for SQL_ASCII servers in the tests. + Allow env var DBDPG_TEST_ALWAYS_ENV to force use of DBI_DSN and DBI_USER in tests. + [Greg Sabino Mullane] + + - Fix client_encoding detection on pre-9.1 servers + [Dagfinn Ilmari Mannsåker] + + - Fix operator existence check in tests on pre-8.3 servers + [Dagfinn Ilmari Mannsåker] + + - Documentation fix + [Stuart A Johnston] + + - Fix pg_switch_prepared database handle documentation + [Dagfinn Ilmari Mannsåker] + +Version 3.5.0 Released January 6, 2015 (git commit bb13d3306fd1c73fac1c0c8a330c14e6b8443942) - Allow "placeholder escaping" by the use of a backslash directly before it, e.g. "SELECT 1 FROM jsontable WHERE foo \\? ?" @@ -20,7 +43,7 @@ - In tests, force the client_encoding to UTF8, skip tests that involve characters not supported by the server_encoding - [Dagfinn Ilmari Mannsåker <ilm...@ilmari.org>] + [Dagfinn Ilmari Mannsåker] - Fix memory leak when selecting from arrays [Dagfinn Ilmari Mannsåker, reported by Krystian Samp] @@ -42,7 +65,7 @@ It's not documented or tested in DBI, but it used to work until DBD::Pg 3.4.0, and the change broke DBIx::Class::Schema::Loader, which uses type='%'. - [Dagfinn Ilmari Mannsåker <ilm...@ilmari.org>] + [Dagfinn Ilmari Mannsåker] Version 3.4.0 Released August 16, 2014 (git commit 7a5da12d84b4c2e9879f90fb6168f56c095071fa) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/DBD-Pg-3.5.0/META.yml new/DBD-Pg-3.5.1/META.yml --- old/DBD-Pg-3.5.0/META.yml 2015-01-02 18:04:28.000000000 +0100 +++ new/DBD-Pg-3.5.1/META.yml 2015-02-17 22:16:45.000000000 +0100 @@ -1,6 +1,6 @@ --- #YAML:1.0 name : DBD-Pg -version : 3.5.0 +version : 3.5.1 abstract : DBI PostgreSQL interface author: - Greg Sabino Mullane <g...@turnstep.com> @@ -30,10 +30,10 @@ provides: DBD::Pg: file : Pg.pm - version : 3.5.0 + version : 3.5.1 Bundle::DBD::Pg: file : lib/Bundle/DBD/Pg.pm - version : 3.5.0 + version : 3.5.1 keywords: - Postgres diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/DBD-Pg-3.5.0/Makefile.PL new/DBD-Pg-3.5.1/Makefile.PL --- old/DBD-Pg-3.5.0/Makefile.PL 2014-12-28 03:24:02.000000000 +0100 +++ new/DBD-Pg-3.5.1/Makefile.PL 2015-02-17 22:17:00.000000000 +0100 @@ -5,7 +5,7 @@ use 5.008001; ## No version.pm for this one, as the prereqs are not loaded yet. -my $VERSION = '3.5.0'; +my $VERSION = '3.5.1'; ## App::Info is stored inside t/lib ## Create a proper path so we can use it below diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/DBD-Pg-3.5.0/Pg.pm new/DBD-Pg-3.5.1/Pg.pm --- old/DBD-Pg-3.5.0/Pg.pm 2015-01-06 17:11:10.000000000 +0100 +++ new/DBD-Pg-3.5.1/Pg.pm 2015-02-17 22:17:03.000000000 +0100 @@ -16,7 +16,7 @@ { package DBD::Pg; - use version; our $VERSION = qv('3.5.0'); + use version; our $VERSION = qv('3.5.1'); use DBI (); use DynaLoader (); @@ -1676,7 +1676,7 @@ =head1 VERSION -This documents version 3.5.0 of the DBD::Pg module +This documents version 3.5.1 of the DBD::Pg module =head1 DESCRIPTION @@ -2445,7 +2445,7 @@ portable. Each question mark is internally replaced by a "dollar sign number" in the order in which they appear in the query (important when using L</bind_param>). -The method second type of placeholder is "dollar sign numbers". This is the method +The second type of placeholder is "dollar sign numbers". This is the method that Postgres uses internally and is overall probably the best method to use if you do not need compatibility with other database systems. DBD::Pg, like PostgreSQL, allows the same number to be used more than once in the query. @@ -2738,7 +2738,7 @@ The C<ping> method determines if there is a working connection to an active database server. It does this by sending a small query to the server, currently -B<'DBD::Pg ping test v3.5.0'>. It returns 0 (false) if the connection is not valid, +B<'DBD::Pg ping test v3.5.1'>. It returns 0 (false) if the connection is not valid, otherwise it returns a positive number (true). The value returned indicates the current state: @@ -3117,8 +3117,8 @@ prepared statements (assuming all other requirements for them are met). The default value, 2, means that a prepared statement will be prepared and used the second and subsequent time execute is called. To always use PQexecPrepared instead of PQexecParams, set -pg_switch_prepared to 1. Setting it to 0 will force DBD::Pg to use PQexecPrepared always - -this was the default behavior in versions older than 3.0.0. +pg_switch_prepared to 1 (this was the default behavior in earlier versions). +Setting pg_switch_prepared to 0 will force DBD::Pg to always use PQexecParams. =head3 B<pg_placeholder_dollaronly> (boolean) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/DBD-Pg-3.5.0/Pg.xs new/DBD-Pg-3.5.1/Pg.xs --- old/DBD-Pg-3.5.0/Pg.xs 2015-01-04 18:31:35.000000000 +0100 +++ new/DBD-Pg-3.5.1/Pg.xs 2015-02-06 21:46:56.000000000 +0100 @@ -252,6 +252,9 @@ } else { SV **svp; + /* Currently the type argument must be a hashref, so throw an exception if not */ + if (!SvROK(type_sv) || SvTYPE(SvRV(type_sv)) != SVt_PVHV) + croak("Second argument to quote must be a hashref"); if ((svp = hv_fetch((HV*)SvRV(type_sv),"pg_type", 7, 0)) != NULL) { type_info = pg_type_data(SvIV(*svp)); } @@ -263,7 +266,10 @@ } } if (!type_info) { - warn("Unknown type %" IVdf ", defaulting to UNKNOWN",SvIV(type_sv)); + if (NULL == type_info) + warn("No type given, defaulting to UNKNOWN"); + else + warn("Unknown type %" IVdf ", defaulting to UNKNOWN", SvIV(type_sv)); type_info = pg_type_data(PG_UNKNOWN); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/DBD-Pg-3.5.0/README new/DBD-Pg-3.5.1/README --- old/DBD-Pg-3.5.0/README 2015-01-04 18:29:20.000000000 +0100 +++ new/DBD-Pg-3.5.1/README 2015-02-17 22:16:53.000000000 +0100 @@ -5,7 +5,7 @@ DESCRIPTION: ------------ -This is version 3.5.0 of DBD::Pg, the Perl interface to Postgres using DBI. +This is version 3.5.1 of DBD::Pg, the Perl interface to Postgres using DBI. The web site for this interface, and the latest version, can be found at: http://search.cpan.org/dist/DBD-Pg/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/DBD-Pg-3.5.0/SIGNATURE new/DBD-Pg-3.5.1/SIGNATURE --- old/DBD-Pg-3.5.0/SIGNATURE 2015-01-06 21:37:17.000000000 +0100 +++ new/DBD-Pg-3.5.1/SIGNATURE 2015-02-17 22:18:19.000000000 +0100 @@ -15,24 +15,24 @@ Hash: RIPEMD160 SHA1 6f4143600430e0bc949c17b05ac34844e5fb3ee4 .perlcriticrc -SHA1 eefe4f4ef91721b392f67f1bbfe1e15d8f597355 Changes +SHA1 7fd50009ca75ffa163778593b7e80d6df1d76390 Changes SHA1 21bc5f3c797d4d5b72285198ffeb1e4e1f0a2902 LICENSES/artistic.txt SHA1 06877624ea5c77efe3b7e39b0f909eda6e25a4ec LICENSES/gpl-2.0.txt SHA1 9c2b33069c9ceb7cd57ea0aeb7b8de144ab75672 MANIFEST SHA1 8d2857ee9a6326c08507d8552f86709dd068fbe5 MANIFEST.SKIP -SHA1 cb54282e4ba29ba1e8324cb252d2eff977d42658 META.yml -SHA1 d317d0e9eaa0a054759d95f9838e84ec9073b3ee Makefile.PL +SHA1 51f67eaf226fbacb6481bdf1cd9ba2b1e60156bd META.yml +SHA1 18a007634ef746e54755063a017dd05274c3ba1e Makefile.PL SHA1 920964b687f475c0c89d208f7b0cf445cc75cfa5 Pg.h -SHA1 13104b7e303a6db326c3a203b1ae86c82e6f6af0 Pg.pm -SHA1 86349733b5e5ffed40f76bfe7222669ea927f7b4 Pg.xs -SHA1 195eee13c6801f5a389ac482263f247598e94ed4 README +SHA1 c80599daa9f4d7bc0c1ea69733da2be9ebd130ca Pg.pm +SHA1 881347f6fd99e6327a7b752a9da49d2d245bcff6 Pg.xs +SHA1 f4a18e8d7b65ec7fbb99c6b263f5e15b9e60b977 README SHA1 0332ac652afae7e53181e075ca446b88b8631ac6 README.dev SHA1 7e213bf90f513595b59c0a2c4ef94fea1592efcf README.win32 SHA1 d1d664776d39011f328c21bef989b937d5d5b1db TODO -SHA1 3ccf29a9a4bc49e545f840d0b73d39605b029999 dbdimp.c +SHA1 f026a43c85faa98115cecfa4cb3939249610d761 dbdimp.c SHA1 277805794455057c0b8c843b1169ed121a92ae75 dbdimp.h SHA1 6c33bcf138e577722283bef02fceb8cbce4d100d dbivport.h -SHA1 c72557dad6ec615574d1604883588bb94e528c22 lib/Bundle/DBD/Pg.pm +SHA1 48908ba26ca5d480c713932716ea31cc0e889d1e lib/Bundle/DBD/Pg.pm SHA1 31be571044014a059db6e66f81e73b50a8abe086 quote.c SHA1 931179894b8b48de407547a38ce0e034f75baaaa quote.h SHA1 93aa7e8cae0a361d1e6163dea0281ebff41f3c5f t/00_signature.t @@ -40,18 +40,18 @@ SHA1 1f50adea4f2c7a5110eca34dc8b6d5dc9d4121ed t/01connect.t SHA1 42b566f777c15a3d07e41d4bca55be435349376c t/01constants.t SHA1 428de15fda885a2834908679123f0a527ae345f2 t/02attribs.t -SHA1 0cecadd1ce6a2086aa64c11724a3ab38b1a6efc9 t/03dbmethod.t +SHA1 fe201e464695e9e0c521889e7aabb48f673024d8 t/03dbmethod.t SHA1 4e16959f7f2e68667a42c86c3d35e8d317034b23 t/03smethod.t SHA1 dd47bd1ac55072177a57f856daca98904939112c t/04misc.t SHA1 9113f062bf144a5768e9e4e98a0f140f498caee1 t/06bytea.t SHA1 c4c43b2229411c3850de0a9cb9bae8e5ccc7d822 t/07copy.t SHA1 3da07722ec0801113b6624c5e2037043e48b9203 t/08async.t SHA1 36a86f92ee4e573a05e6d21186dee2722cea23f7 t/09arrays.t -SHA1 814a98c8151c931ceadff49aa642c569cb12f272 t/12placeholders.t +SHA1 d844cdaa86209a4424ffabb562798138611c0b2b t/12placeholders.t SHA1 81558ca5c783ea6792fd103444a04df615a8d127 t/20savepoints.t -SHA1 5bf25a5fa3fe5e34389639f023c2fcc65a3f3c6d t/30unicode.t +SHA1 e793893121498fd1317a2bc97336edbf405b18d6 t/30unicode.t SHA1 1d2b40b3d8b4c19e98983b4b749d651b834ca5d0 t/99cleanup.t -SHA1 e84e98957d2a70c879efb7e5b84a80c51e6054f6 t/dbdpg_test_setup.pl +SHA1 dbe586c65d10a865565257e07aadc1bd708f7956 t/dbdpg_test_setup.pl SHA1 0e196509e83b3ca603478d994a0837edd51b841d t/lib/App/Info.pm SHA1 e02b0b5206c37280f9259e6a02839cbfc10be53f t/lib/App/Info/Handler.pm SHA1 cc5d256a57f1fe0ddc587685a0cd64f812bb1ce9 t/lib/App/Info/Handler/Print.pm @@ -66,7 +66,7 @@ SHA1 f07cd5ecaeb854c81ceb9206364979cf607e6546 win32.mak -----BEGIN PGP SIGNATURE----- -iEYEAREDAAYFAlSsR30ACgkQvJuQZxSWSshtowCgqDOJfPD2Yf67C6s2Ip1uayX4 -ZA4AoObdH2XypiL0gunoZqz6aE+aeEY7 -=ztMZ +iEYEAREDAAYFAlTjsBsACgkQvJuQZxSWSshm2gCeNleZPlGqWsGQbAdLGs+r7xAS +CuAAniw4aN/9Xi1rkGwbTx1hKoN2Biyn +=jZjV -----END PGP SIGNATURE----- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/DBD-Pg-3.5.0/dbdimp.c new/DBD-Pg-3.5.1/dbdimp.c --- old/DBD-Pg-3.5.0/dbdimp.c 2015-01-04 18:30:13.000000000 +0100 +++ new/DBD-Pg-3.5.1/dbdimp.c 2015-02-17 22:17:21.000000000 +0100 @@ -84,6 +84,7 @@ static PGTransactionStatusType pg_db_txn_status (pTHX_ imp_dbh_t *imp_dbh); static int pg_db_start_txn (pTHX_ SV *dbh, imp_dbh_t *imp_dbh); static int handle_old_async(pTHX_ SV * handle, imp_dbh_t * imp_dbh, const int asyncflag); +static void pg_db_detect_client_encoding_utf8(pTHX_ imp_dbh_t *imp_dbh); /* ================================================================== */ void dbd_init (dbistate_t *dbistate) @@ -224,9 +225,7 @@ } } - imp_dbh->client_encoding_utf8 = - (0 == strncmp(PQparameterStatus(imp_dbh->conn, "client_encoding"), "UTF8", 4)) - ? DBDPG_TRUE : DBDPG_FALSE; + pg_db_detect_client_encoding_utf8(aTHX_ imp_dbh); /* If the client_encoding is UTF8, flip the utf8 flag until convinced otherwise */ imp_dbh->pg_utf8_flag = imp_dbh->client_encoding_utf8; @@ -474,7 +473,7 @@ } /* No matter what state we are in, send an empty query to the backend */ - result = PQexec(imp_dbh->conn, "/* DBD::Pg ping test v3.5.0 */"); + result = PQexec(imp_dbh->conn, "/* DBD::Pg ping test v3.5.1 */"); if (NULL == result) { /* Something very bad, usually indicating the backend is gone */ return -3; @@ -928,9 +927,7 @@ } /* Do The Right Thing */ else if (-1 == imp_dbh->pg_enable_utf8) { - imp_dbh->client_encoding_utf8 = - (0 == strncmp(PQparameterStatus(imp_dbh->conn, "client_encoding"), "UTF8", 4)) - ? DBDPG_TRUE : DBDPG_FALSE; + pg_db_detect_client_encoding_utf8(aTHX_ imp_dbh); imp_dbh->pg_enable_utf8 = -1; imp_dbh->pg_utf8_flag = imp_dbh->client_encoding_utf8; } @@ -1996,7 +1993,7 @@ */ if ('\\' == oldch && imp_dbh->ph_escaped) { /* copy the placeholder-like character but ignore the backslash */ - unsigned char *p = statement-2; + char *p = statement-2; while(*p++) { *(p-1) = *p; } @@ -2952,6 +2949,25 @@ return utf8 ? pg_upgraded_sv(aTHX_ input) : pg_downgraded_sv(aTHX_ input); } +static void pg_db_detect_client_encoding_utf8(pTHX_ imp_dbh_t *imp_dbh) { + char *clean_encoding; + int i, j; + const char * const client_encoding = + PQparameterStatus(imp_dbh->conn, "client_encoding"); + STRLEN len = strlen(client_encoding); + Newx(clean_encoding, len + 1, char); + for (i = 0, j = 0; i < len; i++) { + const char c = toLOWER(client_encoding[i]); + if (isALPHA(c) || isDIGIT(c)) + clean_encoding[j++] = c; + }; + clean_encoding[j] = '\0'; + imp_dbh->client_encoding_utf8 = + (strnEQ(clean_encoding, "utf8", 4) || strnEQ(clean_encoding, "unicode", 8)) + ? DBDPG_TRUE : DBDPG_FALSE; + Safefree(clean_encoding); +} + /* ================================================================== */ int pg_quickexec (SV * dbh, const char * sql, const int asyncflag) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/DBD-Pg-3.5.0/lib/Bundle/DBD/Pg.pm new/DBD-Pg-3.5.1/lib/Bundle/DBD/Pg.pm --- old/DBD-Pg-3.5.0/lib/Bundle/DBD/Pg.pm 2014-12-28 03:23:27.000000000 +0100 +++ new/DBD-Pg-3.5.1/lib/Bundle/DBD/Pg.pm 2015-02-17 22:16:41.000000000 +0100 @@ -4,7 +4,7 @@ use strict; use warnings; -$VERSION = '3.5.0'; +$VERSION = '3.5.1'; 1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/DBD-Pg-3.5.0/t/03dbmethod.t new/DBD-Pg-3.5.1/t/03dbmethod.t --- old/DBD-Pg-3.5.0/t/03dbmethod.t 2015-01-06 16:54:42.000000000 +0100 +++ new/DBD-Pg-3.5.1/t/03dbmethod.t 2015-02-06 21:46:37.000000000 +0100 @@ -26,7 +26,7 @@ if (! $dbh) { plan skip_all => 'Connection to database failed, cannot continue testing'; } -plan tests => 559; +plan tests => 562; isnt ($dbh, undef, 'Connect to database for database handle method testing'); @@ -1314,6 +1314,24 @@ # Test various quote types # +## Invalid type arguments +$t='DB handle method "quote" throws exception on non-reference type argument'; +eval { $dbh->quote('abc', 'def'); }; +like ($@, qr{hashref}, $t); + +$t='DB handle method "quote" throws exception on arrayref type argument'; +eval { $dbh->quote('abc', ['arraytest']); }; +like ($@, qr{hashref}, $t); + +SKIP: { + eval { require Test::Warn; }; + if ($@) { + skip ('Need Test::Warn for some tests', 1); + } + + $t='DB handle method "quote" allows an empty hashref'; + Test::Warn::warning_like ( sub { $dbh->quote('abc', {}); }, qr/UNKNOWN/, $t); +} ## Points $t='DB handle method "quote" works with type PG_POINT'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/DBD-Pg-3.5.0/t/12placeholders.t new/DBD-Pg-3.5.1/t/12placeholders.t --- old/DBD-Pg-3.5.0/t/12placeholders.t 2015-01-06 17:55:42.000000000 +0100 +++ new/DBD-Pg-3.5.1/t/12placeholders.t 2015-02-08 19:08:06.000000000 +0100 @@ -657,9 +657,13 @@ SKIP: { my $server_encoding = $dbh->selectrow_array('SHOW server_encoding'); + my $client_encoding = $dbh->selectrow_array('SHOW client_encoding'); skip "Cannot test non-ascii dollar quotes with server_encoding='$server_encoding' (need UTF8 or SQL_ASCII)", 3, unless $server_encoding =~ /\A(?:UTF8|SQL_ASCII)\z/; + skip 'Cannot test non-ascii dollar quotes unless client_encoding is UTF8', 3 + if $client_encoding ne 'UTF8'; + for my $ident (qq{\x{5317}}, qq{abc\x{5317}}, qq{_cde\x{5317}}) { ## hi-bit chars eval { $sth = $dbh->prepare(qq{SELECT \$$ident\$ 123 \$$ident\$}); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/DBD-Pg-3.5.0/t/30unicode.t new/DBD-Pg-3.5.1/t/30unicode.t --- old/DBD-Pg-3.5.0/t/30unicode.t 2015-01-06 17:02:20.000000000 +0100 +++ new/DBD-Pg-3.5.1/t/30unicode.t 2015-02-08 19:06:19.000000000 +0100 @@ -27,6 +27,7 @@ my @tests; my $server_encoding = $dbh->selectrow_array('SHOW server_encoding'); +my $client_encoding = $dbh->selectrow_array('SHOW client_encoding'); # Beware, characters used for testing need to be known to Unicode version 4.0.0, # which is what perl 5.8.1 shipped with. @@ -90,6 +91,10 @@ ) { skip "Can't do $range tests with server_encoding='$server_encoding'", 1 if $range !~ ($ranges{$server_encoding} || qr/\A(?:ascii)\z/); + + skip 'Cannot perform range tests if client_encoding is not UTF8', 1 + if $client_encoding ne 'UTF8'; + foreach my $enable_utf8 (1, 0, -1) { my $desc = "$state $range UTF-8 $test->{qtype} $type (pg_enable_utf8=$enable_utf8)"; my @args = @{$test->{args} || []}; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/DBD-Pg-3.5.0/t/dbdpg_test_setup.pl new/DBD-Pg-3.5.1/t/dbdpg_test_setup.pl --- old/DBD-Pg-3.5.0/t/dbdpg_test_setup.pl 2015-01-06 17:51:49.000000000 +0100 +++ new/DBD-Pg-3.5.1/t/dbdpg_test_setup.pl 2015-02-07 20:59:02.000000000 +0100 @@ -787,6 +787,12 @@ $testdir = "$dir/dbdpg_test_database"; } + ## Allow forcing of ENV variables + if ($ENV{DBDPG_TEST_ALWAYS_ENV}) { + $testdsn = $ENV{DBI_DSN} || ''; + $testuser = $ENV{DBI_USER} || ''; + } + return $testdsn, $testuser, $helpconnect, $su, $uid, $testdir, $pg_ctl, $initdb, $error, $version; } ## end of get_test_settings @@ -823,7 +829,7 @@ my $schema = 'dbd_pg_testschema'; my $SQL = 'SELECT 1 FROM pg_operator o, pg_namespace n '. - 'WHERE oprname=? AND oprleft::regtype::text = ? AND oprright::regtype::text = ?'. + 'WHERE oprname=? AND oprleft = ?::regtype AND oprright = ?::regtype'. ' AND o.oprnamespace = n.oid AND n.nspname = ?'; my $sth = $dbh->prepare_cached($SQL); my $count = $sth->execute($opname,$leftarg,$rightarg,$schema); @@ -901,7 +907,6 @@ ## Remove the test directory entirely return if $ENV{DBDPG_TESTINITDB}; return if ! eval { require File::Path; 1; }; - warn "Removing test database directory\n"; File::Path::rmtree($testdir); return;
