r70558 - in /trunk/libdbix-class-schema-loader-perl: ./ debian/ lib/DBIx/Class/Schema/ lib/DBIx/Class/Schema/Loader/ lib/DBIx/Class/Schema/Loader/DBI/ lib/DBIx/Class/Schema/Loader/DBI/ADO/ lib/DBIx/Class/Schema/Loader/DBI/Component/ lib/DBIx/Class/Schema/Loader/DBI/ODBC/ lib/DBIx/Class/Schema/Loader/DBI/Sybase/ lib/DBIx/Class/Schema/Loader/Optional/ lib/DBIx/Class/Schema/Loader/RelBuilder/Compat/ t/lib/ t/lib/DBIx/Class/
jawnsy-guest at users.alioth.debian.org
jawnsy-guest at users.alioth.debian.org
Sat Mar 5 23:44:48 UTC 2011
Author: jawnsy-guest
Date: Sat Mar 5 23:44:41 2011
New Revision: 70558
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=70558
Log:
Integrate new upstream release
Added:
trunk/libdbix-class-schema-loader-perl/t/lib/DBIx/Class/TestComponentForMap.pm
- copied unchanged from r70544, branches/upstream/libdbix-class-schema-loader-perl/current/t/lib/DBIx/Class/TestComponentForMap.pm
trunk/libdbix-class-schema-loader-perl/t/lib/TestComponentForMapFQN.pm
- copied unchanged from r70544, branches/upstream/libdbix-class-schema-loader-perl/current/t/lib/TestComponentForMapFQN.pm
Modified:
trunk/libdbix-class-schema-loader-perl/Changes
trunk/libdbix-class-schema-loader-perl/MANIFEST
trunk/libdbix-class-schema-loader-perl/META.yml
trunk/libdbix-class-schema-loader-perl/README
trunk/libdbix-class-schema-loader-perl/debian/changelog
trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader.pm
trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/Base.pm
trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI.pm
trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/ADO.pm
trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/ADO/MS_Jet.pm
trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/ADO/Microsoft_SQL_Server.pm
trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/Component/QuotedDefault.pm
trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/DB2.pm
trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/Informix.pm
trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/InterBase.pm
trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/MSSQL.pm
trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/ODBC.pm
trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/ODBC/ACCESS.pm
trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/ODBC/Firebird.pm
trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/ODBC/Microsoft_SQL_Server.pm
trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/ODBC/SQL_Anywhere.pm
trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/Oracle.pm
trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/Pg.pm
trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/SQLAnywhere.pm
trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/SQLite.pm
trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/Sybase.pm
trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/Sybase/Common.pm
trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/Sybase/Microsoft_SQL_Server.pm
trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/Writing.pm
trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/mysql.pm
trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/Optional/Dependencies.pod
trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/RelBuilder.pm
trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/RelBuilder/Compat/v0_040.pm
trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/RelBuilder/Compat/v0_05.pm
trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/RelBuilder/Compat/v0_06.pm
trunk/libdbix-class-schema-loader-perl/t/lib/dbixcsl_common_tests.pm
Modified: trunk/libdbix-class-schema-loader-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-class-schema-loader-perl/Changes?rev=70558&op=diff
==============================================================================
--- trunk/libdbix-class-schema-loader-perl/Changes (original)
+++ trunk/libdbix-class-schema-loader-perl/Changes Sat Mar 5 23:44:41 2011
@@ -1,4 +1,7 @@
Revision history for Perl extension DBIx::Class::Schema::Loader
+
+0.07010 2011-03-04 08:26:31
+ - add result_component_map option
0.07009 2011-02-25 11:06:51
- fix a syntax error in MS Access ADO driver
Modified: trunk/libdbix-class-schema-loader-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-class-schema-loader-perl/MANIFEST?rev=70558&op=diff
==============================================================================
--- trunk/libdbix-class-schema-loader-perl/MANIFEST (original)
+++ trunk/libdbix-class-schema-loader-perl/MANIFEST Sat Mar 5 23:44:41 2011
@@ -94,6 +94,7 @@
t/lib/DBICTest/Schema/_no_skip_load_external/Foo.pm
t/lib/DBICTest/Schema/_skip_load_external/Foo.pm
t/lib/DBIx/Class/TestComponent.pm
+t/lib/DBIx/Class/TestComponentForMap.pm
t/lib/dbixcsl_common_tests.pm
t/lib/dbixcsl_dumper_tests.pm
t/lib/DBIXCSL_Test/Schema/LoaderTest1.pm
@@ -105,6 +106,7 @@
t/lib/My/SchemaBaseClass.pm
t/lib/TestAdditional.pm
t/lib/TestAdditionalBase.pm
+t/lib/TestComponentForMapFQN.pm
t/lib/TestComponentFQN.pm
t/lib/TestLeftBase.pm
t/lib/TestLoaderSubclass.pm
Modified: trunk/libdbix-class-schema-loader-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-class-schema-loader-perl/META.yml?rev=70558&op=diff
==============================================================================
--- trunk/libdbix-class-schema-loader-perl/META.yml (original)
+++ trunk/libdbix-class-schema-loader-perl/META.yml Sat Mar 5 23:44:41 2011
@@ -56,4 +56,4 @@
MailingList: http://lists.scsys.co.uk/cgi-bin/mailman/listinfo/dbix-class
license: http://dev.perl.org/licenses/
repository: git://git.shadowcat.co.uk/dbsrgits/DBIx-Class-Schema-Loader.git
-version: 0.07009
+version: 0.07010
Modified: trunk/libdbix-class-schema-loader-perl/README
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-class-schema-loader-perl/README?rev=70558&op=diff
==============================================================================
--- trunk/libdbix-class-schema-loader-perl/README (original)
+++ trunk/libdbix-class-schema-loader-perl/README Sat Mar 5 23:44:41 2011
@@ -318,6 +318,8 @@
Matias E. Fernandez <mfernandez at pisco.ch>
+ mstratman: Mark A. Stratman <stratman at gmail.com>
+
... and lots of other folks. If we forgot you, please write the current
maintainer or RT.
Modified: trunk/libdbix-class-schema-loader-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-class-schema-loader-perl/debian/changelog?rev=70558&op=diff
==============================================================================
--- trunk/libdbix-class-schema-loader-perl/debian/changelog (original)
+++ trunk/libdbix-class-schema-loader-perl/debian/changelog Sat Mar 5 23:44:41 2011
@@ -1,4 +1,4 @@
-libdbix-class-schema-loader-perl (0.07009-1) UNRELEASED; urgency=low
+libdbix-class-schema-loader-perl (0.07010-1) UNRELEASED; urgency=low
WAITS-FOR: libclass-c3-componentised-perl 1.0008
@@ -7,7 +7,7 @@
* Bump to debhelper 8
* Refresh copyright information
- -- Jonathan Yu <jawnsy at cpan.org> Sun, 27 Feb 2011 16:30:39 -0500
+ -- Jonathan Yu <jawnsy at cpan.org> Sat, 05 Mar 2011 17:57:04 -0500
libdbix-class-schema-loader-perl (0.07002-1) unstable; urgency=low
Modified: trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader.pm?rev=70558&op=diff
==============================================================================
--- trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader.pm (original)
+++ trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader.pm Sat Mar 5 23:44:41 2011
@@ -10,7 +10,7 @@
# Always remember to do all digits for the version even if they're 0
# i.e. first release of 0.XX *must* be 0.XX000. This avoids fBSD ports
# brain damage and presumably various other packaging systems too
-our $VERSION = '0.07009';
+our $VERSION = '0.07010';
__PACKAGE__->mk_group_accessors('inherited', qw/
_loader_args
@@ -524,6 +524,8 @@
Matias E. Fernandez <mfernandez at pisco.ch>
+mstratman: Mark A. Stratman <stratman at gmail.com>
+
... and lots of other folks. If we forgot you, please write the current
maintainer or RT.
Modified: trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/Base.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/Base.pm?rev=70558&op=diff
==============================================================================
--- trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/Base.pm (original)
+++ trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/Base.pm Sat Mar 5 23:44:41 2011
@@ -25,7 +25,7 @@
use Class::Load 'load_class';
use namespace::clean;
-our $VERSION = '0.07009';
+our $VERSION = '0.07010';
__PACKAGE__->mk_group_ro_accessors('simple', qw/
schema
@@ -88,6 +88,7 @@
col_collision_map
rel_collision_map
real_dump_directory
+ result_component_map
datetime_undef_if_invalid
_result_class_methods
/);
@@ -366,6 +367,22 @@
classes. A good example would be
L<InflateColumn::DateTime|DBIx::Class::InflateColumn::DateTime>
+=head2 result_component_map
+
+A hashref of moniker keys and component values. Unlike C<components>, which loads the
+given components into every table class, this option allows you to load certain
+components for specified tables. For example:
+
+ result_component_map => {
+ StationVisited => '+YourApp::Schema::Component::StationVisited',
+ RouteChange => [
+ '+YourApp::Schema::Component::RouteChange',
+ 'InflateColumn::DateTime',
+ ],
+ }
+
+You may use this in conjunction with C<components>.
+
=head2 use_namespaces
This is now the default, to go back to L<DBIx::Class::Schema/load_classes> pass
@@ -596,6 +613,18 @@
/);
$self->_validate_class_args;
+
+ if ($self->result_component_map) {
+ my %rc_map = %{ $self->result_component_map };
+ foreach my $moniker (keys %rc_map) {
+ $rc_map{$moniker} = [ $rc_map{$moniker} ] unless ref $rc_map{$moniker};
+ }
+ $self->result_component_map(\%rc_map);
+ }
+ else {
+ $self->result_component_map({});
+ }
+ $self->_validate_result_component_map;
if ($self->use_moose) {
if (not DBIx::Class::Schema::Loader::Optional::Dependencies->req_ok_for('use_moose')) {
@@ -790,31 +819,50 @@
sub _validate_class_args {
my $self = shift;
- my $args = shift;
foreach my $k (@CLASS_ARGS) {
next unless $self->$k;
my @classes = ref $self->$k eq 'ARRAY' ? @{ $self->$k } : $self->$k;
- foreach my $c (@classes) {
- # components default to being under the DBIx::Class namespace unless they
- # are preceeded with a '+'
- if ( $k =~ m/components$/ && $c !~ s/^\+// ) {
- $c = 'DBIx::Class::' . $c;
+ $self->_validate_classes($k, \@classes);
+ }
+}
+
+sub _validate_result_component_map {
+ my $self = shift;
+
+ my $map = $self->result_component_map;
+ return unless $map && ref $map eq 'HASH';
+
+ foreach my $classes (values %$map) {
+ $self->_validate_classes('result_component_map', [@$classes]);
+ }
+}
+
+sub _validate_classes {
+ my $self = shift;
+ my $key = shift;
+ my $classes = shift;
+
+ foreach my $c (@$classes) {
+ # components default to being under the DBIx::Class namespace unless they
+ # are preceeded with a '+'
+ if ( $key =~ m/component/ && $c !~ s/^\+// ) {
+ $c = 'DBIx::Class::' . $c;
+ }
+
+ # 1 == installed, 0 == not installed, undef == invalid classname
+ my $installed = Class::Inspector->installed($c);
+ if ( defined($installed) ) {
+ if ( $installed == 0 ) {
+ croak qq/$c, as specified in the loader option "$key", is not installed/;
}
-
- # 1 == installed, 0 == not installed, undef == invalid classname
- my $installed = Class::Inspector->installed($c);
- if ( defined($installed) ) {
- if ( $installed == 0 ) {
- croak qq/$c, as specified in the loader option "$k", is not installed/;
- }
- } else {
- croak qq/$c, as specified in the loader option "$k", is an invalid class name/;
- }
- }
- }
-}
+ } else {
+ croak qq/$c, as specified in the loader option "$key", is an invalid class name/;
+ }
+ }
+}
+
sub _find_file_in_inc {
my ($self, $file) = @_;
@@ -1574,20 +1622,33 @@
$self->_use ($table_class, @{$self->additional_classes});
$self->_inject($table_class, @{$self->left_base_classes});
- if (my @components = @{ $self->components }) {
- $self->_dbic_stmt($table_class, 'load_components', @components);
- }
+ my @components = @{ $self->components || [] };
+
+ push @components, @{ $self->result_component_map->{$table_moniker} }
+ if exists $self->result_component_map->{$table_moniker};
+
+ $self->_dbic_stmt($table_class, 'load_components', @components) if @components;
$self->_inject($table_class, @{$self->additional_base_classes});
}
sub _is_result_class_method {
- my ($self, $name) = @_;
+ my ($self, $name, $table_name) = @_;
+
+ my $table_moniker = $table_name ? $self->_table2moniker($table_name) : '';
if (not $self->_result_class_methods) {
my (@methods, %methods);
my $base = $self->result_base_class || 'DBIx::Class::Core';
- my @components = map { /^\+/ ? substr($_,1) : "DBIx::Class::$_" } @{ $self->components || [] };
+
+ my @components = @{ $self->components || [] };
+
+ push @components, @{ $self->result_component_map->{$table_moniker} }
+ if exists $self->result_component_map->{$table_moniker};
+
+ for my $c (@components) {
+ $c = $c =~ /^\+/ ? substr($c,1) : "DBIx::Class::$c";
+ }
for my $class ($base, @components, $self->use_moose ? 'Moose::Object' : ()) {
load_class $class;
@@ -1619,7 +1680,7 @@
next if $accessor eq 'id'; # special case (very common column)
- if ($self->_is_result_class_method($accessor)) {
+ if ($self->_is_result_class_method($accessor, $table_name)) {
my $mapped = 0;
if (my $map = $self->col_collision_map) {
Modified: trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI.pm?rev=70558&op=diff
==============================================================================
--- trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI.pm (original)
+++ trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI.pm Sat Mar 5 23:44:41 2011
@@ -8,7 +8,7 @@
use Try::Tiny;
use namespace::clean;
-our $VERSION = '0.07009';
+our $VERSION = '0.07010';
__PACKAGE__->mk_group_accessors('simple', qw/
_disable_pk_detection
Modified: trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/ADO.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/ADO.pm?rev=70558&op=diff
==============================================================================
--- trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/ADO.pm (original)
+++ trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/ADO.pm Sat Mar 5 23:44:41 2011
@@ -7,7 +7,7 @@
use Carp::Clan qw/^DBIx::Class/;
use namespace::clean;
-our $VERSION = '0.07009';
+our $VERSION = '0.07010';
=head1 NAME
Modified: trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/ADO/MS_Jet.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/ADO/MS_Jet.pm?rev=70558&op=diff
==============================================================================
--- trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/ADO/MS_Jet.pm (original)
+++ trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/ADO/MS_Jet.pm Sat Mar 5 23:44:41 2011
@@ -11,7 +11,7 @@
use Try::Tiny;
use namespace::clean;
-our $VERSION = '0.07009';
+our $VERSION = '0.07010';
=head1 NAME
Modified: trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/ADO/Microsoft_SQL_Server.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/ADO/Microsoft_SQL_Server.pm?rev=70558&op=diff
==============================================================================
--- trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/ADO/Microsoft_SQL_Server.pm (original)
+++ trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/ADO/Microsoft_SQL_Server.pm Sat Mar 5 23:44:41 2011
@@ -10,7 +10,7 @@
use Carp::Clan qw/^DBIx::Class/;
use namespace::clean;
-our $VERSION = '0.07009';
+our $VERSION = '0.07010';
=head1 NAME
Modified: trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/Component/QuotedDefault.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/Component/QuotedDefault.pm?rev=70558&op=diff
==============================================================================
--- trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/Component/QuotedDefault.pm (original)
+++ trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/Component/QuotedDefault.pm Sat Mar 5 23:44:41 2011
@@ -4,7 +4,7 @@
use warnings;
use mro 'c3';
-our $VERSION = '0.07009';
+our $VERSION = '0.07010';
=head1 NAME
Modified: trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/DB2.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/DB2.pm?rev=70558&op=diff
==============================================================================
--- trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/DB2.pm (original)
+++ trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/DB2.pm Sat Mar 5 23:44:41 2011
@@ -9,7 +9,7 @@
use Carp::Clan qw/^DBIx::Class/;
use mro 'c3';
-our $VERSION = '0.07009';
+our $VERSION = '0.07010';
=head1 NAME
Modified: trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/Informix.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/Informix.pm?rev=70558&op=diff
==============================================================================
--- trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/Informix.pm (original)
+++ trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/Informix.pm Sat Mar 5 23:44:41 2011
@@ -8,7 +8,7 @@
use Scalar::Util 'looks_like_number';
use namespace::clean;
-our $VERSION = '0.07009';
+our $VERSION = '0.07010';
=head1 NAME
Modified: trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/InterBase.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/InterBase.pm?rev=70558&op=diff
==============================================================================
--- trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/InterBase.pm (original)
+++ trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/InterBase.pm Sat Mar 5 23:44:41 2011
@@ -8,7 +8,7 @@
use List::Util 'first';
use namespace::clean;
-our $VERSION = '0.07009';
+our $VERSION = '0.07010';
=head1 NAME
Modified: trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/MSSQL.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/MSSQL.pm?rev=70558&op=diff
==============================================================================
--- trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/MSSQL.pm (original)
+++ trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/MSSQL.pm Sat Mar 5 23:44:41 2011
@@ -8,7 +8,7 @@
use Try::Tiny;
use namespace::clean;
-our $VERSION = '0.07009';
+our $VERSION = '0.07010';
=head1 NAME
Modified: trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/ODBC.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/ODBC.pm?rev=70558&op=diff
==============================================================================
--- trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/ODBC.pm (original)
+++ trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/ODBC.pm Sat Mar 5 23:44:41 2011
@@ -7,7 +7,7 @@
use Carp::Clan qw/^DBIx::Class/;
use namespace::clean;
-our $VERSION = '0.07009';
+our $VERSION = '0.07010';
=head1 NAME
Modified: trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/ODBC/ACCESS.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/ODBC/ACCESS.pm?rev=70558&op=diff
==============================================================================
--- trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/ODBC/ACCESS.pm (original)
+++ trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/ODBC/ACCESS.pm Sat Mar 5 23:44:41 2011
@@ -10,7 +10,7 @@
use Try::Tiny;
use namespace::clean;
-our $VERSION = '0.07009';
+our $VERSION = '0.07010';
__PACKAGE__->mk_group_accessors('simple', qw/
__ado_connection
Modified: trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/ODBC/Firebird.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/ODBC/Firebird.pm?rev=70558&op=diff
==============================================================================
--- trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/ODBC/Firebird.pm (original)
+++ trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/ODBC/Firebird.pm Sat Mar 5 23:44:41 2011
@@ -9,7 +9,7 @@
use Carp::Clan qw/^DBIx::Class/;
use mro 'c3';
-our $VERSION = '0.07009';
+our $VERSION = '0.07010';
=head1 NAME
Modified: trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/ODBC/Microsoft_SQL_Server.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/ODBC/Microsoft_SQL_Server.pm?rev=70558&op=diff
==============================================================================
--- trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/ODBC/Microsoft_SQL_Server.pm (original)
+++ trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/ODBC/Microsoft_SQL_Server.pm Sat Mar 5 23:44:41 2011
@@ -8,7 +8,7 @@
use Carp::Clan qw/^DBIx::Class/;
use mro 'c3';
-our $VERSION = '0.07009';
+our $VERSION = '0.07010';
=head1 NAME
Modified: trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/ODBC/SQL_Anywhere.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/ODBC/SQL_Anywhere.pm?rev=70558&op=diff
==============================================================================
--- trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/ODBC/SQL_Anywhere.pm (original)
+++ trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/ODBC/SQL_Anywhere.pm Sat Mar 5 23:44:41 2011
@@ -8,7 +8,7 @@
use Carp::Clan qw/^DBIx::Class/;
use mro 'c3';
-our $VERSION = '0.07009';
+our $VERSION = '0.07010';
=head1 NAME
Modified: trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/Oracle.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/Oracle.pm?rev=70558&op=diff
==============================================================================
--- trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/Oracle.pm (original)
+++ trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/Oracle.pm Sat Mar 5 23:44:41 2011
@@ -9,7 +9,7 @@
use Carp::Clan qw/^DBIx::Class/;
use mro 'c3';
-our $VERSION = '0.07009';
+our $VERSION = '0.07010';
=head1 NAME
Modified: trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/Pg.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/Pg.pm?rev=70558&op=diff
==============================================================================
--- trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/Pg.pm (original)
+++ trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/Pg.pm Sat Mar 5 23:44:41 2011
@@ -9,7 +9,7 @@
use Carp::Clan qw/^DBIx::Class/;
use mro 'c3';
-our $VERSION = '0.07009';
+our $VERSION = '0.07010';
=head1 NAME
Modified: trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/SQLAnywhere.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/SQLAnywhere.pm?rev=70558&op=diff
==============================================================================
--- trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/SQLAnywhere.pm (original)
+++ trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/SQLAnywhere.pm Sat Mar 5 23:44:41 2011
@@ -9,7 +9,7 @@
/;
use Carp::Clan qw/^DBIx::Class/;
-our $VERSION = '0.07009';
+our $VERSION = '0.07010';
=head1 NAME
Modified: trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/SQLite.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/SQLite.pm?rev=70558&op=diff
==============================================================================
--- trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/SQLite.pm (original)
+++ trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/SQLite.pm Sat Mar 5 23:44:41 2011
@@ -9,7 +9,7 @@
use Carp::Clan qw/^DBIx::Class/;
use mro 'c3';
-our $VERSION = '0.07009';
+our $VERSION = '0.07010';
=head1 NAME
Modified: trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/Sybase.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/Sybase.pm?rev=70558&op=diff
==============================================================================
--- trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/Sybase.pm (original)
+++ trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/Sybase.pm Sat Mar 5 23:44:41 2011
@@ -6,7 +6,7 @@
use Carp::Clan qw/^DBIx::Class/;
use mro 'c3';
-our $VERSION = '0.07009';
+our $VERSION = '0.07010';
=head1 NAME
Modified: trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/Sybase/Common.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/Sybase/Common.pm?rev=70558&op=diff
==============================================================================
--- trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/Sybase/Common.pm (original)
+++ trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/Sybase/Common.pm Sat Mar 5 23:44:41 2011
@@ -6,7 +6,7 @@
use Carp::Clan qw/^DBIx::Class/;
use mro 'c3';
-our $VERSION = '0.07009';
+our $VERSION = '0.07010';
=head1 NAME
Modified: trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/Sybase/Microsoft_SQL_Server.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/Sybase/Microsoft_SQL_Server.pm?rev=70558&op=diff
==============================================================================
--- trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/Sybase/Microsoft_SQL_Server.pm (original)
+++ trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/Sybase/Microsoft_SQL_Server.pm Sat Mar 5 23:44:41 2011
@@ -6,7 +6,7 @@
use Carp::Clan qw/^DBIx::Class/;
use mro 'c3';
-our $VERSION = '0.07009';
+our $VERSION = '0.07010';
=head1 NAME
Modified: trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/Writing.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/Writing.pm?rev=70558&op=diff
==============================================================================
--- trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/Writing.pm (original)
+++ trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/Writing.pm Sat Mar 5 23:44:41 2011
@@ -1,7 +1,7 @@
package DBIx::Class::Schema::Loader::DBI::Writing;
use strict;
-our $VERSION = '0.07009';
+our $VERSION = '0.07010';
# Empty. POD only.
Modified: trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/mysql.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/mysql.pm?rev=70558&op=diff
==============================================================================
--- trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/mysql.pm (original)
+++ trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/DBI/mysql.pm Sat Mar 5 23:44:41 2011
@@ -6,7 +6,7 @@
use Carp::Clan qw/^DBIx::Class/;
use mro 'c3';
-our $VERSION = '0.07009';
+our $VERSION = '0.07010';
=head1 NAME
Modified: trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/Optional/Dependencies.pod
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/Optional/Dependencies.pod?rev=70558&op=diff
==============================================================================
--- trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/Optional/Dependencies.pod (original)
+++ trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/Optional/Dependencies.pod Sat Mar 5 23:44:41 2011
@@ -18,7 +18,7 @@
...
- configure_requires 'DBIx::Class::Schema::Loader' => '0.07009';
+ configure_requires 'DBIx::Class::Schema::Loader' => '0.07010';
require DBIx::Class::Schema::Loader::Optional::Dependencies;
Modified: trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/RelBuilder.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/RelBuilder.pm?rev=70558&op=diff
==============================================================================
--- trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/RelBuilder.pm (original)
+++ trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/RelBuilder.pm Sat Mar 5 23:44:41 2011
@@ -15,7 +15,7 @@
use List::MoreUtils 'apply';
use namespace::clean;
-our $VERSION = '0.07009';
+our $VERSION = '0.07010';
# Glossary:
#
Modified: trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/RelBuilder/Compat/v0_040.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/RelBuilder/Compat/v0_040.pm?rev=70558&op=diff
==============================================================================
--- trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/RelBuilder/Compat/v0_040.pm (original)
+++ trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/RelBuilder/Compat/v0_040.pm Sat Mar 5 23:44:41 2011
@@ -7,7 +7,7 @@
use Carp::Clan qw/^DBIx::Class/;
use Lingua::EN::Inflect::Number ();
-our $VERSION = '0.07009';
+our $VERSION = '0.07010';
sub _relnames_and_method {
my ( $self, $local_moniker, $rel, $cond, $uniqs, $counters ) = @_;
Modified: trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/RelBuilder/Compat/v0_05.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/RelBuilder/Compat/v0_05.pm?rev=70558&op=diff
==============================================================================
--- trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/RelBuilder/Compat/v0_05.pm (original)
+++ trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/RelBuilder/Compat/v0_05.pm Sat Mar 5 23:44:41 2011
@@ -7,7 +7,7 @@
use Carp::Clan qw/^DBIx::Class/;
use Lingua::EN::Inflect::Number ();
-our $VERSION = '0.07009';
+our $VERSION = '0.07010';
sub _to_PL {
my ($self, $name) = @_;
Modified: trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/RelBuilder/Compat/v0_06.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/RelBuilder/Compat/v0_06.pm?rev=70558&op=diff
==============================================================================
--- trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/RelBuilder/Compat/v0_06.pm (original)
+++ trunk/libdbix-class-schema-loader-perl/lib/DBIx/Class/Schema/Loader/RelBuilder/Compat/v0_06.pm Sat Mar 5 23:44:41 2011
@@ -7,7 +7,7 @@
use Carp::Clan qw/^DBIx::Class/;
use Lingua::EN::Inflect::Phrase ();
-our $VERSION = '0.07009';
+our $VERSION = '0.07010';
sub _normalize_name {
my ($self, $name) = @_;
Modified: trunk/libdbix-class-schema-loader-perl/t/lib/dbixcsl_common_tests.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-class-schema-loader-perl/t/lib/dbixcsl_common_tests.pm?rev=70558&op=diff
==============================================================================
--- trunk/libdbix-class-schema-loader-perl/t/lib/dbixcsl_common_tests.pm (original)
+++ trunk/libdbix-class-schema-loader-perl/t/lib/dbixcsl_common_tests.pm Sat Mar 5 23:44:41 2011
@@ -102,7 +102,7 @@
$num_rescans++ if $self->{vendor} eq 'Firebird';
plan tests => @connect_info *
- (188 + $num_rescans * $col_accessor_map_tests + $extra_count + ($self->{data_type_tests}{test_count} || 0));
+ (192 + $num_rescans * $col_accessor_map_tests + $extra_count + ($self->{data_type_tests}{test_count} || 0));
foreach my $info_idx (0..$#connect_info) {
my $info = $connect_info[$info_idx];
@@ -224,6 +224,7 @@
col_collision_map => { '^(can)\z' => 'caught_collision_%s' },
rel_collision_map => { '^(set_primary_key)\z' => 'caught_rel_collision_%s' },
col_accessor_map => \&test_col_accessor_map,
+ result_component_map => { LoaderTest2X => 'TestComponentForMap', LoaderTest1 => '+TestComponentForMapFQN' },
%{ $self->{loader_options} || {} },
);
@@ -431,8 +432,20 @@
'Additional Component' );
}
- is ((try { $class1->testcomponent_fqn }), 'TestComponentFQN works',
- 'fully qualified component class');
+ is try { $class2->dbix_class_testcomponentformap }, 'dbix_class_testcomponentformap works',
+ 'component from result_component_map';
+
+ isnt try { $class1->dbix_class_testcomponentformap }, 'dbix_class_testcomponentformap works',
+ 'component from result_component_map not added to not mapped Result';
+
+ is try { $class1->testcomponent_fqn }, 'TestComponentFQN works',
+ 'fully qualified component class';
+
+ is try { $class1->testcomponentformap_fqn }, 'TestComponentForMapFQN works',
+ 'fully qualified component class from result_component_map';
+
+ isnt try { $class2->testcomponentformap_fqn }, 'TestComponentForMapFQN works',
+ 'fully qualified component class from result_component_map not added to not mapped Result';
SKIP: {
can_ok( $class1, 'loader_test1_classmeth' )
More information about the Pkg-perl-cvs-commits
mailing list