[Bast-commits] r6023 - in DBIx-Class/0.08/trunk: lib/DBIx/Class t

[jasonmay at dev.catalyst.perl.org]

Author: jasonmay
Date: 2009-04-29 16:18:11 +0100 (Wed, 29 Apr 2009)
New Revision: 6023

Added:
   DBIx-Class/0.08/trunk/t/63register_source.t
Modified:
   DBIx-Class/0.08/trunk/lib/DBIx/Class/Schema.pm
Log:
allow multiple classless sources to be registered without dying


Modified: DBIx-Class/0.08/trunk/lib/DBIx/Class/Schema.pm
===================================================================
--- DBIx-Class/0.08/trunk/lib/DBIx/Class/Schema.pm	2009-04-29 13:47:23 UTC (rev 6022)
+++ DBIx-Class/0.08/trunk/lib/DBIx/Class/Schema.pm	2009-04-29 15:18:11 UTC (rev 6023)
@@ -1280,6 +1280,7 @@
   $self->source_registrations(\%reg);
 
   return if ($params->{extra});
+  return unless defined($rs_class) && $rs_class->can('result_source_instance');
 
   my %map = %{$self->class_mappings};
   if (

Added: DBIx-Class/0.08/trunk/t/63register_source.t
===================================================================
--- DBIx-Class/0.08/trunk/t/63register_source.t	                        (rev 0)
+++ DBIx-Class/0.08/trunk/t/63register_source.t	2009-04-29 15:18:11 UTC (rev 6023)
@@ -0,0 +1,18 @@
+use strict;
+use warnings;
+
+use Test::Exception tests => 1;
+use lib qw(t/lib);
+use DBICTest;
+use DBICTest::Schema;
+use DBIx::Class::ResultSource::Table;
+
+my $schema = DBICTest->init_schema();
+
+my $foo = DBIx::Class::ResultSource::Table->new({ name => "foo" });
+my $bar = DBIx::Class::ResultSource::Table->new({ name => "bar" });
+
+lives_ok {
+    $schema->register_source(foo => $foo);
+    $schema->register_source(bar => $bar);
+} 'multiple classless sources can be registered';