From: Rafael Kitover <rkitover@cpan.org>
Date: Thu, 24 Dec 2009 06:50:16 +0000 (+0000)
Subject: Merge 'current' into 'back-compat'
X-Git-Tag: 0.04999_13~23^2~4
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=673af860a975fe075f135903570a3efa3eacd60c;p=dbsrgits%2FDBIx-Class-Schema-Loader.git

Merge 'current' into 'back-compat'

r21713@hlagh (orig r7994):  caelum | 2009-11-30 09:06:50 -0500
base results on Core, only load components if there are extra components
r21715@hlagh (orig r7996):  caelum | 2009-11-30 11:35:46 -0500
fix MySQL rel introspection with on_connect_call => "set_strict_mode" (RT#52087)
r21717@hlagh (orig r7998):  caelum | 2009-11-30 18:27:45 -0500
tests pass again
r21718@hlagh (orig r7999):  caelum | 2009-11-30 18:44:28 -0500
new dev release
r21721@hlagh (orig r8002):  caelum | 2009-11-30 20:43:04 -0500
better handling of db_schema for Oracle, based on (RT#35732)
---

673af860a975fe075f135903570a3efa3eacd60c
diff --cc lib/DBIx/Class/Schema/Loader/Base.pm
index 141643c,110046d..47a4d6f
--- a/lib/DBIx/Class/Schema/Loader/Base.pm
+++ b/lib/DBIx/Class/Schema/Loader/Base.pm
@@@ -675,12 -524,9 +676,12 @@@ sub _dump_to_dir 
          $schema_text .= qq|__PACKAGE__->load_classes;\n|;
      }
  
 -    $self->_write_classfile($schema_class, $schema_text);
 +    {
 +        local $self->{version_to_dump} = $self->schema_version_to_dump;
 +        $self->_write_classfile($schema_class, $schema_text);
 +    }
  
-     my $result_base_class = $self->result_base_class || 'DBIx::Class';
+     my $result_base_class = $self->result_base_class || 'DBIx::Class::Core';
  
      foreach my $src_class (@classes) {
          my $src_text =