From b2da4a8dc2176f41b81b9a6dda089217b0e47678 Mon Sep 17 00:00:00 2001 From: chris Date: Wed, 10 May 2017 23:26:52 +0200 Subject: [PATCH 1/2] Fixing tests for PGObject 2.0 with this module --- Changes | 3 +++ lib/PGObject/Type/ByteString.pm | 18 ++++++++++++------ t/02-registration.t | 9 ++++++++- 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/Changes b/Changes index ee89a23..1867688 100644 --- a/Changes +++ b/Changes @@ -1,4 +1,7 @@ Revision history for PGObject-Type-ByteString +1.01.0 2017-05-16 + Adds support for PGObject 2.x + 1.0.0 2016-11-19 First version. diff --git a/lib/PGObject/Type/ByteString.pm b/lib/PGObject/Type/ByteString.pm index 470e18a..b446dc2 100644 --- a/lib/PGObject/Type/ByteString.pm +++ b/lib/PGObject/Type/ByteString.pm @@ -13,11 +13,11 @@ PGObject::Type::DateTime - DateTime Wrappers for PGObject =head1 VERSION -Version 1.0.0 +Version 1.01.0 =cut -our $VERSION = '1.0.0'; +our $VERSION = '1.01.0'; =head1 SYNOPSIS @@ -48,10 +48,16 @@ sub register { my $types = $args{types}; $types = [ DBD::Pg::PG_BYTEA, 'bytea' ] unless defined $types and @$types; for my $type (@$types){ - my $ret = - PGObject->register_type(registry => $registry, pg_type => $type, - perl_class => $self); - return $ret unless $ret; + if ($PGObject::VERSION =~ /^1\./){ + my $ret = + PGObject->register_type(registry => $registry, pg_type => $type, + perl_class => $self); + return $ret unless $ret; + } else { + PGObject::Type::Registry->register_type( + registry => $registry, dbtype => $type, apptype => $self + ); + } } return 1; } diff --git a/t/02-registration.t b/t/02-registration.t index a362efe..04c81c7 100644 --- a/t/02-registration.t +++ b/t/02-registration.t @@ -24,7 +24,14 @@ ok(PGObject::Type::ByteString->register(registry => 'test', 'custom registry, mybytes registration'), ok(PGObject::Type::ByteString->register(registry => 'test'), 'default types, custom registry'); -my $registry = PGObject::get_type_registry(); +my $registry; + +if ($PGObject::VERSION =~ /^1\./){ + $registry = PGObject::get_type_registry(); +} else { + $registry = { map {$_ => PGObject::Type::Registry->inspect($_) } + qw(default test) }; +} for my $reg (qw(default test)){ for my $type (PG_BYTEA, 'mybytes') { is($registry->{$reg}->{$type}, 'PGObject::Type::ByteString', From 4acde7f082c233e743c3b3cf08c389e8be17d731 Mon Sep 17 00:00:00 2001 From: chris Date: Wed, 10 May 2017 23:27:36 +0200 Subject: [PATCH 2/2] Also excluding travis yml and mymeta from manifest --- MANIFEST.SKIP | 2 ++ 1 file changed, 2 insertions(+) diff --git a/MANIFEST.SKIP b/MANIFEST.SKIP index a42ef17..74aad2e 100644 --- a/MANIFEST.SKIP +++ b/MANIFEST.SKIP @@ -39,6 +39,8 @@ ^tmp \bTAGS$ ^MYMETA.yml$ +^.travis.yml$ +^MYMETA.json$ \bSu-[\d\.\_]+