instead of WITH, using +, and fixed up regex for naming

[dbsrgits/DBIx-Class.git] / lib / DBIx / Class / ResultSource.pm

diff --git a/lib/DBIx/Class/ResultSource.pm b/lib/DBIx/Class/ResultSource.pm
index 574bc4b..f366ae8 100644 (file)
--- a/lib/DBIx/Class/ResultSource.pm
+++ b/lib/DBIx/Class/ResultSource.pm
@@ -1890,8 +1890,8 @@ sub inject_resultset_components {
 
    # this generation of class bit needs to go into CCC
    my @normalized = @components; 
-   $_ =~ s/\W/_/g for @normalized;  
-   my $class = $self->resultset_class . "::WITH::" . join ("::", @normalized);
+   $_ =~ s/[\W_]+/_/g for @normalized;  
+   my $class = $self->resultset_class . "::+::" . join ("::", @normalized);
    Class::C3::Componentised->inject_base($class, $self->resultset_class);
    $self->resultset_class($class);