From: Brandon Black <blblack@gmail.com>
Date: Thu, 12 Oct 2006 15:54:22 +0000 (+0000)
Subject: Merge 'trunk' into 'current'
X-Git-Tag: 0.03999_01~27
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=06f6541ca97da4e9e289b1c28c803779aff2f5d8;p=dbsrgits%2FDBIx-Class-Schema-Loader.git

Merge 'trunk' into 'current'

r10808@moloko (orig r2799):  blblack | 2006-09-27 10:38:10 -0500
new tests + bugfix for rt.cpan.org #21025
r11203@moloko (orig r2819):  blblack | 2006-10-12 09:44:55 -0500
test update that should have been in the last commit...
r11204@moloko (orig r2820):  blblack | 2006-10-12 09:47:37 -0500
fix Build.PL wrt Class::Accessor::Fast broken $VERSION in 0.27
r11205@moloko (orig r2821):  blblack | 2006-10-12 09:53:18 -0500
apply fixes from rt.cpan.org #21758
r11206@moloko (orig r2822):  blblack | 2006-10-12 10:47:58 -0500
fix for rt.cpan.org #21084 (dump_overwrite pathological output recursion), bump version to 0.03007_01 temporarily for testing prior to 0.03008 release
---

06f6541ca97da4e9e289b1c28c803779aff2f5d8
diff --cc Changes
index bdf3e65,958893b..03b7741
--- a/Changes
+++ b/Changes
@@@ -1,11 -1,11 +1,17 @@@
  Revision history for Perl extension DBIx::Class::Schema::Loader
  
 +        - columns_info_for imported from DBIx::Class
 +        - relationships are now on by default, use skip_relationships
 +          to disable them
 +        - Removed previously deprecated methods/options
 +        - Added $VERSION to all packages in this dist
 +
+ 0.03008 XXX Not yet released
+         - fix for rt.cpan.org #21084 (dump_overwrite pathological output recursion)
+         - fix for rt.cpan.org #21758 (mysql reserved words as table names)
+         - fix for rt.cpan.org #21025 (SQLite FK parsing)
+         - workaround for rt.cpan.org #21746 ($Class::Accessor::Fast::VERSION issues)
+ 
  0.03007 Thu Jul 27 16:19:59 UTC 2006
          - Kill erroneous warning about connect/loader_options order (the real
            case is warned about elsewhere)
diff --cc lib/DBIx/Class/Schema/Loader/Base.pm
index 903be8d,cf67db0..be0600f
--- a/lib/DBIx/Class/Schema/Loader/Base.pm
+++ b/lib/DBIx/Class/Schema/Loader/Base.pm
@@@ -9,10 -9,9 +9,11 @@@ use UNIVERSAL::require
  use DBIx::Class::Schema::Loader::RelBuilder;
  use Data::Dump qw/ dump /;
  use POSIX qw//;
+ use Cwd qw//;
  require DBIx::Class;
  
 +our $VERSION = '0.03999_01';
 +
  __PACKAGE__->mk_ro_accessors(qw/
                                  schema
                                  schema_class