Merge 'trunk' into 'current'

r31951@brandon-blacks-computer (orig r3359):  blblack | 2007-05-22 07:56:21 -0500
0.03012 released

diff --git a/Changes b/Changes
index d6db3e6..3d103d8 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,5 +1,6 @@
 Revision history for Perl extension DBIx::Class::Schema::Loader
 
+0.03012 Tue May 22, 2007
         - Relationship names for multiple multi-col rels between
           the same table fixed by ilmari
         - Fix from Marc Espie for CREATE TABLE 'foo' for SQLite

diff --git a/lib/DBIx/Class/Schema/Loader.pm b/lib/DBIx/Class/Schema/Loader.pm
index 72abc6f..2b33b0f 100644 (file)
--- a/lib/DBIx/Class/Schema/Loader.pm
+++ b/lib/DBIx/Class/Schema/Loader.pm
@@ -2,8 +2,7 @@ package DBIx::Class::Schema::Loader;
 
 use strict;
 use warnings;
-use base qw/DBIx::Class::Schema/;
-use base qw/Class::Data::Accessor/;
+use base qw/DBIx::Class::Schema Class::Data::Accessor/;
 use Carp::Clan qw/^DBIx::Class/;
 use UNIVERSAL::require;
 use Class::C3;