[Catalyst-commits] r12517 - in
Catalyst-Controller-DBIC-API/1.004/trunk:
lib/Catalyst/Controller/DBIC lib/Catalyst/Controller/DBIC/API
t/lib/RestTest/Controller/API/REST t/var
nperez at dev.catalyst.perl.org
nperez at dev.catalyst.perl.org
Mon Jan 4 02:28:38 GMT 2010
Author: nperez
Date: 2010-01-04 02:28:35 +0000 (Mon, 04 Jan 2010)
New Revision: 12517
Modified:
Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API.pm
Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API/Base.pm
Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API/REST.pm
Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API/RPC.pm
Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API/Request.pm
Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API/RequestArguments.pm
Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API/StaticArguments.pm
Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API/StoredResultSource.pm
Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API/Types.pm
Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API/Validator.pm
Catalyst-Controller-DBIC-API/1.004/trunk/t/lib/RestTest/Controller/API/REST/CD.pm
Catalyst-Controller-DBIC-API/1.004/trunk/t/var/DBIxClass.db
Log:
Fix abraxxa's complex prefetch_allows rules and bump version for release
Modified: Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API/Base.pm
===================================================================
--- Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API/Base.pm 2010-01-03 21:58:55 UTC (rev 12516)
+++ Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API/Base.pm 2010-01-04 02:28:35 UTC (rev 12517)
@@ -1,6 +1,6 @@
package # hide from PAUSE
Catalyst::Controller::DBIC::API::Base;
-our $VERSION = '1.004000';
+our $VERSION = '1.004001';
use Moose;
Modified: Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API/REST.pm
===================================================================
--- Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API/REST.pm 2010-01-03 21:58:55 UTC (rev 12516)
+++ Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API/REST.pm 2010-01-04 02:28:35 UTC (rev 12517)
@@ -1,5 +1,5 @@
package Catalyst::Controller::DBIC::API::REST;
-our $VERSION = '1.004000';
+our $VERSION = '1.004001';
use Moose;
BEGIN { extends 'Catalyst::Controller::DBIC::API::Base'; }
Modified: Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API/RPC.pm
===================================================================
--- Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API/RPC.pm 2010-01-03 21:58:55 UTC (rev 12516)
+++ Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API/RPC.pm 2010-01-04 02:28:35 UTC (rev 12517)
@@ -1,5 +1,5 @@
package Catalyst::Controller::DBIC::API::RPC;
-our $VERSION = '1.004000';
+our $VERSION = '1.004001';
use Moose;
BEGIN { extends 'Catalyst::Controller::DBIC::API::Base'; }
Modified: Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API/Request.pm
===================================================================
--- Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API/Request.pm 2010-01-03 21:58:55 UTC (rev 12516)
+++ Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API/Request.pm 2010-01-04 02:28:35 UTC (rev 12517)
@@ -1,5 +1,5 @@
package Catalyst::Controller::DBIC::API::Request;
-our $VERSION = '1.004000';
+our $VERSION = '1.004001';
use Moose::Role;
use MooseX::Aliases;
use MooseX::Types::Moose('Object');
Modified: Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API/RequestArguments.pm
===================================================================
--- Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API/RequestArguments.pm 2010-01-03 21:58:55 UTC (rev 12516)
+++ Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API/RequestArguments.pm 2010-01-04 02:28:35 UTC (rev 12517)
@@ -1,5 +1,5 @@
package Catalyst::Controller::DBIC::API::RequestArguments;
-our $VERSION = '1.004000';
+our $VERSION = '1.004001';
use MooseX::Role::Parameterized;
use Catalyst::Controller::DBIC::API::Types(':all');
use MooseX::Types::Moose(':all');
@@ -134,7 +134,10 @@
}
elsif(HashRef->check($rel))
{
- $self->check_has_relation(%$rel, undef, $static);
+ while(my($k,$v) = each %$rel)
+ {
+ $self->check_has_relation($k, $v, undef, $static);
+ }
$self->prefetch_validator->load($rel);
}
else
Modified: Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API/StaticArguments.pm
===================================================================
--- Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API/StaticArguments.pm 2010-01-03 21:58:55 UTC (rev 12516)
+++ Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API/StaticArguments.pm 2010-01-04 02:28:35 UTC (rev 12517)
@@ -1,5 +1,5 @@
package Catalyst::Controller::DBIC::API::StaticArguments;
-our $VERSION = '1.004000';
+our $VERSION = '1.004001';
use Moose::Role;
use MooseX::Types::Moose(':all');
use namespace::autoclean;
Modified: Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API/StoredResultSource.pm
===================================================================
--- Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API/StoredResultSource.pm 2010-01-03 21:58:55 UTC (rev 12516)
+++ Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API/StoredResultSource.pm 2010-01-04 02:28:35 UTC (rev 12517)
@@ -1,5 +1,5 @@
package Catalyst::Controller::DBIC::API::StoredResultSource;
-our $VERSION = '1.004000';
+our $VERSION = '1.004001';
use Moose::Role;
use Moose::Util::TypeConstraints;
use MooseX::Types::Moose(':all');
@@ -51,15 +51,16 @@
{
my $rel_src = $nest->related_source($rel);
die "Relation '$rel_src' does not exist" if not defined($rel_src);
- #FIXME
- # %$foo expands to two args: $key, $value
- # but just if the hash has only one key/value pair
- return $self->check_has_relation(%$other, $rel_src, $static);
+
+ while(my($k,$v) = each %$other)
+ {
+ $self->check_has_relation($k, $v, $rel_src, $static);
+ }
}
else
{
return 1 if $static && ArrayRef->check($other) && $other->[0] eq '*';
- die "Relation '$rel' does not exist in ${\ref($nest)}"
+ die "Relation '$rel' does not exist in ${\$nest->from}"
unless $nest->has_relationship($rel) || $nest->has_column($rel);
return 1;
}
@@ -73,15 +74,18 @@
{
try
{
- #FIXME
- # %$foo expands to two args: $key, $value
- # but just if the hash has only one key/value pair
- $self->check_has_relation(%$col_rel, undef, $static);
+ while(my($k,$v) = each %$col_rel)
+ {
+ $self->check_has_relation($k, $v, undef, $static);
+ }
}
catch
{
# not a relation but a column with a predicate
- $self->check_has_column(keys %$col_rel);
+ while(my($k, undef) = each %$col_rel)
+ {
+ $self->check_has_column($k);
+ }
}
}
else
Modified: Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API/Types.pm
===================================================================
--- Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API/Types.pm 2010-01-03 21:58:55 UTC (rev 12516)
+++ Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API/Types.pm 2010-01-04 02:28:35 UTC (rev 12517)
@@ -1,5 +1,5 @@
package Catalyst::Controller::DBIC::API::Types;
-our $VERSION = '1.004000';
+our $VERSION = '1.004001';
use warnings;
use strict;
Modified: Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API/Validator.pm
===================================================================
--- Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API/Validator.pm 2010-01-03 21:58:55 UTC (rev 12516)
+++ Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API/Validator.pm 2010-01-04 02:28:35 UTC (rev 12517)
@@ -1,5 +1,5 @@
package Catalyst::Controller::DBIC::API::Visitor;
-our $VERSION = '1.004000';
+our $VERSION = '1.004001';
use Moose;
use namespace::autoclean;
@@ -93,7 +93,7 @@
Catalyst::Controller::DBIC::API::Visitor->meta->make_immutable;
package Catalyst::Controller::DBIC::API::Validator;
-our $VERSION = '1.004000';
+our $VERSION = '1.004001';
use Moose;
use namespace::autoclean;
Modified: Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API.pm
===================================================================
--- Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API.pm 2010-01-03 21:58:55 UTC (rev 12516)
+++ Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API.pm 2010-01-04 02:28:35 UTC (rev 12517)
@@ -9,7 +9,7 @@
=cut
-our $VERSION = '1.004000';
+our $VERSION = '1.004001';
=head1 NAME
Modified: Catalyst-Controller-DBIC-API/1.004/trunk/t/lib/RestTest/Controller/API/REST/CD.pm
===================================================================
--- Catalyst-Controller-DBIC-API/1.004/trunk/t/lib/RestTest/Controller/API/REST/CD.pm 2010-01-03 21:58:55 UTC (rev 12516)
+++ Catalyst-Controller-DBIC-API/1.004/trunk/t/lib/RestTest/Controller/API/REST/CD.pm 2010-01-04 02:28:35 UTC (rev 12517)
@@ -10,7 +10,7 @@
class => 'RestTestDB::CD',
create_requires => ['artist', 'title', 'year' ],
update_allows => ['title', 'year'],
- prefetch_allows => [['artist', ['tracks'], { cd_to_producer => ['producer'], tag => 'cd' }]],
+ prefetch_allows => [['artist', ['tracks'], { cd_to_producer => ['producer'], tags => 'cd' }]],
);
1;
Modified: Catalyst-Controller-DBIC-API/1.004/trunk/t/var/DBIxClass.db
===================================================================
(Binary files differ)
More information about the Catalyst-commits
mailing list