From 6ed68bf37192f65d83a94c1d221134dab5cde58f Mon Sep 17 00:00:00 2001 From: Masahiro Iuchi Date: Sat, 15 Apr 2017 22:17:58 +0900 Subject: [PATCH 1/4] Fix failed tests with Perl 5.25.11 --- t/01-col-inheritance.t | 2 +- t/02-basic.t | 2 +- t/03-primary-keys.t | 2 +- t/04-clone.t | 2 +- t/05-deflate.t | 2 +- t/06-errors.t | 2 +- t/07-has-a-cached.t | 2 +- t/07-has-a.t | 2 +- t/08-iterator.t | 2 +- t/09-resultset.t | 2 +- t/10-resultset-peek.t | 2 +- t/12-windows.t | 2 +- t/20-driver-sqlite.t | 2 +- t/31-cached.t | 4 ++-- t/32-partitioned.t | 4 ++-- t/33-views.t | 2 +- t/34-both.t | 4 ++-- t/35-multiplexed.t | 2 +- t/41-callbacks.t | 2 +- t/42-callbacks-multi-pk.t | 2 +- t/50-profiling.t | 2 +- 21 files changed, 24 insertions(+), 24 deletions(-) diff --git a/t/01-col-inheritance.t b/t/01-col-inheritance.t index c702fb6..b27dbf4 100644 --- a/t/01-col-inheritance.t +++ b/t/01-col-inheritance.t @@ -4,7 +4,7 @@ use strict; use lib 't/lib'; -require 't/lib/db-common.pl'; +require './t/lib/db-common.pl'; use Test::More; unless (eval { require DBD::SQLite }) { diff --git a/t/02-basic.t b/t/02-basic.t index eb6063c..c8e246e 100644 --- a/t/02-basic.t +++ b/t/02-basic.t @@ -5,7 +5,7 @@ use strict; use lib 't/lib'; use lib 't/lib/cached'; -require 't/lib/db-common.pl'; +require './t/lib/db-common.pl'; use Test::More; use Test::Exception; diff --git a/t/03-primary-keys.t b/t/03-primary-keys.t index ca9fdc3..1cde4a0 100644 --- a/t/03-primary-keys.t +++ b/t/03-primary-keys.t @@ -5,7 +5,7 @@ use strict; use lib 't/lib'; use lib 't/lib/cached'; -require 't/lib/db-common.pl'; +require './t/lib/db-common.pl'; use Test::More; use Test::Exception; diff --git a/t/04-clone.t b/t/04-clone.t index 0a7a0e0..5957c19 100644 --- a/t/04-clone.t +++ b/t/04-clone.t @@ -5,7 +5,7 @@ use strict; use lib 't/lib'; use lib 't/lib/cached'; -require 't/lib/db-common.pl'; +require './t/lib/db-common.pl'; use Test::More; use Test::Exception; diff --git a/t/05-deflate.t b/t/05-deflate.t index dae9e83..6b72f4a 100644 --- a/t/05-deflate.t +++ b/t/05-deflate.t @@ -5,7 +5,7 @@ use strict; use lib 't/lib'; use lib 't/lib/cached'; -require 't/lib/db-common.pl'; +require './t/lib/db-common.pl'; use Test::More; use Test::Exception; diff --git a/t/06-errors.t b/t/06-errors.t index b0fb326..1ec58e2 100644 --- a/t/06-errors.t +++ b/t/06-errors.t @@ -3,7 +3,7 @@ use strict; use lib 't/lib'; -require 't/lib/db-common.pl'; +require './t/lib/db-common.pl'; use Test::More; use Test::Exception; diff --git a/t/07-has-a-cached.t b/t/07-has-a-cached.t index 4abeea7..2e0ec2c 100644 --- a/t/07-has-a-cached.t +++ b/t/07-has-a-cached.t @@ -5,7 +5,7 @@ use strict; use lib 't/lib'; use lib 't/lib/cached'; -require 't/lib/db-common.pl'; +require './t/lib/db-common.pl'; use Test::More; use Test::Exception; diff --git a/t/07-has-a.t b/t/07-has-a.t index 04a00dc..f464ddf 100644 --- a/t/07-has-a.t +++ b/t/07-has-a.t @@ -5,7 +5,7 @@ use strict; use lib 't/lib'; use lib 't/lib/cached'; -require 't/lib/db-common.pl'; +require './t/lib/db-common.pl'; use Test::More; use Test::Exception; diff --git a/t/08-iterator.t b/t/08-iterator.t index 10d8a8b..8b0f4bb 100644 --- a/t/08-iterator.t +++ b/t/08-iterator.t @@ -5,7 +5,7 @@ use strict; use lib 't/lib'; use lib 't/lib/cached'; -require 't/lib/db-common.pl'; +require './t/lib/db-common.pl'; use Test::More; use Test::Exception; diff --git a/t/09-resultset.t b/t/09-resultset.t index 2466785..b2e73f5 100644 --- a/t/09-resultset.t +++ b/t/09-resultset.t @@ -4,7 +4,7 @@ use strict; use lib 't/lib'; -require 't/lib/db-common.pl'; +require './t/lib/db-common.pl'; $Data::ObjectDriver::DEBUG = 0; use Test::More; diff --git a/t/10-resultset-peek.t b/t/10-resultset-peek.t index 639916f..cd040d4 100644 --- a/t/10-resultset-peek.t +++ b/t/10-resultset-peek.t @@ -7,7 +7,7 @@ use strict; use lib 't/lib'; -require 't/lib/db-common.pl'; +require './t/lib/db-common.pl'; $Data::ObjectDriver::DEBUG = 0; use Test::More; diff --git a/t/12-windows.t b/t/12-windows.t index 152ee2e..c946620 100644 --- a/t/12-windows.t +++ b/t/12-windows.t @@ -6,7 +6,7 @@ use Data::Dumper; use lib 't/lib'; use lib 't/lib/cached'; -require 't/lib/db-common.pl'; +require './t/lib/db-common.pl'; use Test::More; use Test::Exception; diff --git a/t/20-driver-sqlite.t b/t/20-driver-sqlite.t index 2a86695..60ca716 100644 --- a/t/20-driver-sqlite.t +++ b/t/20-driver-sqlite.t @@ -4,7 +4,7 @@ use strict; use lib 't/lib'; -require 't/lib/db-common.pl'; +require './t/lib/db-common.pl'; $Data::ObjectDriver::DEBUG = 0; use Test::More; diff --git a/t/31-cached.t b/t/31-cached.t index 36c964e..890e035 100644 --- a/t/31-cached.t +++ b/t/31-cached.t @@ -5,7 +5,7 @@ use strict; use lib 't/lib'; # for Cache::Memory substitute. use lib 't/lib/cached'; -require 't/lib/db-common.pl'; +require './t/lib/db-common.pl'; use Test::More; BEGIN { @@ -187,6 +187,6 @@ ok(! Ingredient->lookup(1), "really deleted"); is($recipe->remove, 1, 'Recipe removed successfully'); is($recipe2->remove, 1, 'Recipe removed successfully'); -require 't/txn-common.pl'; +require './t/txn-common.pl'; sub DESTROY { teardown_dbs(qw( global )); } diff --git a/t/32-partitioned.t b/t/32-partitioned.t index 9df52c8..e9d7e26 100644 --- a/t/32-partitioned.t +++ b/t/32-partitioned.t @@ -4,7 +4,7 @@ use strict; use lib 't/lib/partitioned'; -require 't/lib/db-common.pl'; +require './t/lib/db-common.pl'; use Test::More; unless (eval { require DBD::SQLite }) { @@ -123,6 +123,6 @@ is $ingredient3->remove, 1, 'Ingredient removed successfully'; is $recipe->remove, 1, 'Recipe removed successfully'; is $recipe2->remove, 1, 'Recipe removed successfully'; -require 't/txn-common.pl'; +require './t/txn-common.pl'; sub DESTROY { teardown_dbs(qw( global cluster1 cluster2 )); } diff --git a/t/33-views.t b/t/33-views.t index 02e378e..5309e3a 100644 --- a/t/33-views.t +++ b/t/33-views.t @@ -4,7 +4,7 @@ use strict; use lib 't/lib/views'; -require 't/lib/db-common.pl'; +require './t/lib/db-common.pl'; use Test::More; BEGIN { diff --git a/t/34-both.t b/t/34-both.t index 5257bd2..fdc2ee5 100644 --- a/t/34-both.t +++ b/t/34-both.t @@ -5,7 +5,7 @@ use strict; use lib 't/lib'; use lib 't/lib/both'; -require 't/lib/db-common.pl'; +require './t/lib/db-common.pl'; use Test::More; use Test::Exception; @@ -186,6 +186,6 @@ $replaced = Recipe->lookup($rid); ok $replaced->{__cached}; is $replaced->title, 'Cup Cake'; -require 't/txn-common.pl'; +require './t/txn-common.pl'; sub DESTROY { teardown_dbs(qw( global cluster1 cluster2 )); } diff --git a/t/35-multiplexed.t b/t/35-multiplexed.t index b742971..c0ac95a 100644 --- a/t/35-multiplexed.t +++ b/t/35-multiplexed.t @@ -4,7 +4,7 @@ use strict; use lib 't/lib/multiplexed'; -require 't/lib/db-common.pl'; +require './t/lib/db-common.pl'; use Test::Exception; use Test::More; diff --git a/t/41-callbacks.t b/t/41-callbacks.t index 2da0e18..90d1271 100644 --- a/t/41-callbacks.t +++ b/t/41-callbacks.t @@ -4,7 +4,7 @@ use strict; use lib 't/lib'; -require 't/lib/db-common.pl'; +require './t/lib/db-common.pl'; use Test::More; unless (eval { require DBD::SQLite }) { diff --git a/t/42-callbacks-multi-pk.t b/t/42-callbacks-multi-pk.t index 5e0d4d8..877c46d 100644 --- a/t/42-callbacks-multi-pk.t +++ b/t/42-callbacks-multi-pk.t @@ -4,7 +4,7 @@ use strict; use lib 't/lib/partitioned'; -require 't/lib/db-common.pl'; +require './t/lib/db-common.pl'; use Test::More; unless (eval { require DBD::SQLite }) { diff --git a/t/50-profiling.t b/t/50-profiling.t index 7366305..e518d89 100644 --- a/t/50-profiling.t +++ b/t/50-profiling.t @@ -5,7 +5,7 @@ use strict; use lib 't/lib'; use lib 't/lib/both'; -require 't/lib/db-common.pl'; +require './t/lib/db-common.pl'; use Test::More; use Test::Exception; From 02ef3c2d56d113b1332cafcfebde051291741e8a Mon Sep 17 00:00:00 2001 From: Masahiro Iuchi Date: Sat, 15 Apr 2017 22:19:39 +0900 Subject: [PATCH 2/4] Add db files generated in test to .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 5edf410..956efd8 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ !LICENSE /cpanfile.snapshot /local +/*.db From bd8c4930fa8bb9a329bc1395d957bd26ceeb8eb5 Mon Sep 17 00:00:00 2001 From: Masahiro Iuchi Date: Sat, 15 Apr 2017 22:41:25 +0900 Subject: [PATCH 3/4] Test with Perl 5.22 and 5.24 on Travis CI --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 4a3a5a9..4ae9b15 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,8 @@ perl: - "5.16" - "5.18" - "5.20" + - "5.22" + - "5.24" before_install: - cpanm -n DBD::SQLite Devel::Cover::Report::Coveralls script: From 0b7254dda100c1076d5c701d538527a02f90dab1 Mon Sep 17 00:00:00 2001 From: Takatsugu Shigeta Date: Wed, 19 Apr 2017 01:32:17 +0000 Subject: [PATCH 4/4] Bump version --- Changes | 2 ++ META.json | 11 ++++++----- lib/Data/ObjectDriver.pm | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Changes b/Changes index d7ffb2c..ed959bd 100644 --- a/Changes +++ b/Changes @@ -1,5 +1,7 @@ {{$NEXT}} + - Fix failed tests with Perl 5.25.11 (miniuchi) #24 + 0.14 2016-01-14T03:03:02Z - Fix test for SQLite 3.10 compatibility (ziguzagu) #21 diff --git a/META.json b/META.json index 74a3bca..a453f4e 100644 --- a/META.json +++ b/META.json @@ -4,7 +4,7 @@ "-2006" ], "dynamic_config" : 0, - "generated_by" : "Minilla/v3.0.1, CPAN::Meta::Converter version 2.150001", + "generated_by" : "Minilla/v3.0.10, CPAN::Meta::Converter version 2.150005", "license" : [ "artistic_2" ], @@ -79,7 +79,7 @@ "web" : "https://github.com/sixapart/data-objectdriver" } }, - "version" : "0.14", + "version" : "0.15", "x_authority" : "cpan:SIXAPART", "x_contributors" : [ "Mart Atkins ", @@ -103,7 +103,8 @@ "ambs ", "David Steinbrunner ", "Akira Sawada ", - "Masahiro Iuchi ", - "ziguzagu " - ] + "ziguzagu ", + "Masahiro Iuchi " + ], + "x_serialization_backend" : "JSON::PP version 2.27300_01" } diff --git a/lib/Data/ObjectDriver.pm b/lib/Data/ObjectDriver.pm index 194ac5f..4bf7e76 100644 --- a/lib/Data/ObjectDriver.pm +++ b/lib/Data/ObjectDriver.pm @@ -11,7 +11,7 @@ use Data::ObjectDriver::Iterator; __PACKAGE__->mk_accessors(qw( pk_generator txn_active )); -our $VERSION = '0.14'; +our $VERSION = '0.15'; our $DEBUG = $ENV{DOD_DEBUG} || 0; our $PROFILE = $ENV{DOD_PROFILE} || 0; our $PROFILER;