From: Rafael Kitover <rkitover@cpan.org>
Date: Thu, 22 Apr 2010 00:15:47 +0000 (-0400)
Subject: support CamelCase table names
X-Git-Tag: 0.07000~57
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=9990e58f49603b81e3c1195c0e83595b0333c8df;p=dbsrgits%2FDBIx-Class-Schema-Loader.git

support CamelCase table names
---

diff --git a/Changes b/Changes
index 7f318b3..f6da418 100644
--- a/Changes
+++ b/Changes
@@ -2,6 +2,7 @@ Revision history for Perl extension DBIx::Class::Schema::Loader
 
         - remove is_deferrable from default rel options to maintain
           principle of least surprise when round-tripping to deploy()
+        - support CamelCase table names
         - rewrite datetime default functions as \'CURRENT_TIMESTAMP' where
           possible (except for Sybase ASE) to ease cross-deployment
         - use column_info instead of select to get Oracle column list (RT#42281)
diff --git a/lib/DBIx/Class/Schema/Loader.pm b/lib/DBIx/Class/Schema/Loader.pm
index 6d3fb33..17db963 100644
--- a/lib/DBIx/Class/Schema/Loader.pm
+++ b/lib/DBIx/Class/Schema/Loader.pm
@@ -10,7 +10,7 @@ use Scalar::Util qw/ weaken /;
 # Always remember to do all digits for the version even if they're 0
 # i.e. first release of 0.XX *must* be 0.XX000. This avoids fBSD ports
 # brain damage and presumably various other packaging systems too
-our $VERSION = '0.06001';
+our $VERSION = '0.07000';
 
 __PACKAGE__->mk_group_accessors('inherited', qw/
                                 _loader_args
diff --git a/lib/DBIx/Class/Schema/Loader/Base.pm b/lib/DBIx/Class/Schema/Loader/Base.pm
index 430c9ab..b067c76 100644
--- a/lib/DBIx/Class/Schema/Loader/Base.pm
+++ b/lib/DBIx/Class/Schema/Loader/Base.pm
@@ -22,7 +22,7 @@ use Scalar::Util 'looks_like_number';
 use File::Slurp 'slurp';
 require DBIx::Class;
 
-our $VERSION = '0.06001';
+our $VERSION = '0.07000';
 
 __PACKAGE__->mk_group_ro_accessors('simple', qw/
                                 schema
@@ -170,6 +170,14 @@ more aggressive C<_id> stripping from relationships.
 
 In general, there is very little difference between v5 and v6 schemas.
 
+=item v7
+
+This mode is identical to C<v6> mode, except that monikerization of CamelCase
+table names is also done correctly.
+
+If you don't have any CamelCase table names, you can upgrade without breaking
+any of your code.
+
 =back
 
 Dynamic schemas will always default to the 0.04XXX relationship names and won't
@@ -273,17 +281,17 @@ a scalar moniker.  If the hash entry does not exist, or the function
 returns a false value, the code falls back to default behavior
 for that table name.
 
-The default behavior is to singularize the table name, and: C<join '', map
-ucfirst, split /[\W_]+/, lc $table>, which is to say: lowercase everything,
-split up the table name into chunks anywhere a non-alpha-numeric character
-occurs, change the case of first letter of each chunk to upper case, and put
-the chunks back together.  Examples:
+The default behavior is to split on case transition and non-alphanumeric
+boundaries, singularize the resulting phrase, then join the titlecased words
+together. Examples:
 
-    Table Name  | Moniker Name
-    ---------------------------
-    luser       | Luser
-    luser_group | LuserGroup
-    luser-opts  | LuserOpt
+    Table Name       | Moniker Name
+    ---------------------------------
+    luser            | Luser
+    luser_group      | LuserGroup
+    luser-opts       | LuserOpt
+    stations_visited | StationVisited
+    routeChange      | RouteChange
 
 =head2 inflect_plural
 
@@ -445,7 +453,7 @@ L<DBIx::Class::Schema::Loader>.
 
 =cut
 
-my $CURRENT_V = 'v6';
+my $CURRENT_V = 'v7';
 
 my @CLASS_ARGS = qw(
     schema_base_class result_base_class additional_base_classes
@@ -658,6 +666,8 @@ Version $real_ver static schema detected, turning on backcompat mode.
 Set the 'naming' attribute or the SCHEMA_LOADER_BACKCOMPAT environment variable
 to disable this warning.
 
+See: 'naming' in perldoc DBIx::Class::Schema::Loader::Base .
+
 See perldoc DBIx::Class::Schema::Loader::Manual::UpgradingFromV4 if upgrading
 from version 0.04006.
 EOF
@@ -1529,8 +1539,16 @@ sub _default_table2moniker {
         return join '', map ucfirst, split /[\W_]+/,
             Lingua::EN::Inflect::Number::to_S(lc $table);
     }
+    elsif ($self->naming->{monikers} eq 'v6') {
+        (my $as_phrase = lc $table) =~ s/_+/ /g;
+        my $inflected = Lingua::EN::Inflect::Phrase::to_S($as_phrase);
+
+        return join '', map ucfirst, split /\W+/, $inflected;
+    }
+
+    my @words = map lc, split /(?<=[[:lower:]])[\W_]*(?=[[:upper:]])|[\W_]+/, $table;
+    my $as_phrase = join ' ', @words;
 
-    (my $as_phrase = lc $table) =~ s/_+/ /g;
     my $inflected = Lingua::EN::Inflect::Phrase::to_S($as_phrase);
 
     return join '', map ucfirst, split /\W+/, $inflected;
diff --git a/lib/DBIx/Class/Schema/Loader/DBI.pm b/lib/DBIx/Class/Schema/Loader/DBI.pm
index aa02422..9864b33 100644
--- a/lib/DBIx/Class/Schema/Loader/DBI.pm
+++ b/lib/DBIx/Class/Schema/Loader/DBI.pm
@@ -6,7 +6,7 @@ use base qw/DBIx::Class::Schema::Loader::Base/;
 use Class::C3;
 use Carp::Clan qw/^DBIx::Class/;
 
-our $VERSION = '0.06001';
+our $VERSION = '0.07000';
 
 =head1 NAME
 
diff --git a/lib/DBIx/Class/Schema/Loader/DBI/Component/QuotedDefault.pm b/lib/DBIx/Class/Schema/Loader/DBI/Component/QuotedDefault.pm
index 7c1931c..bff0091 100644
--- a/lib/DBIx/Class/Schema/Loader/DBI/Component/QuotedDefault.pm
+++ b/lib/DBIx/Class/Schema/Loader/DBI/Component/QuotedDefault.pm
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 use Class::C3;
 
-our $VERSION = '0.06001';
+our $VERSION = '0.07000';
 
 =head1 NAME
 
diff --git a/lib/DBIx/Class/Schema/Loader/DBI/DB2.pm b/lib/DBIx/Class/Schema/Loader/DBI/DB2.pm
index ede73ae..fddab7b 100644
--- a/lib/DBIx/Class/Schema/Loader/DBI/DB2.pm
+++ b/lib/DBIx/Class/Schema/Loader/DBI/DB2.pm
@@ -9,7 +9,7 @@ use base qw/
 use Carp::Clan qw/^DBIx::Class/;
 use Class::C3;
 
-our $VERSION = '0.06001';
+our $VERSION = '0.07000';
 
 =head1 NAME
 
diff --git a/lib/DBIx/Class/Schema/Loader/DBI/InterBase.pm b/lib/DBIx/Class/Schema/Loader/DBI/InterBase.pm
index e24ec85..8976058 100644
--- a/lib/DBIx/Class/Schema/Loader/DBI/InterBase.pm
+++ b/lib/DBIx/Class/Schema/Loader/DBI/InterBase.pm
@@ -12,7 +12,7 @@ __PACKAGE__->mk_group_ro_accessors('simple', qw/
     unquoted_ddl
 /);
 
-our $VERSION = '0.06001';
+our $VERSION = '0.07000';
 
 =head1 NAME
 
diff --git a/lib/DBIx/Class/Schema/Loader/DBI/MSSQL.pm b/lib/DBIx/Class/Schema/Loader/DBI/MSSQL.pm
index ee04770..62158ad 100644
--- a/lib/DBIx/Class/Schema/Loader/DBI/MSSQL.pm
+++ b/lib/DBIx/Class/Schema/Loader/DBI/MSSQL.pm
@@ -10,7 +10,7 @@ __PACKAGE__->mk_group_accessors('simple', qw/
     case_sensitive_collation
 /);
 
-our $VERSION = '0.06001';
+our $VERSION = '0.07000';
 
 =head1 NAME
 
diff --git a/lib/DBIx/Class/Schema/Loader/DBI/ODBC.pm b/lib/DBIx/Class/Schema/Loader/DBI/ODBC.pm
index 44554ec..0f02ed5 100644
--- a/lib/DBIx/Class/Schema/Loader/DBI/ODBC.pm
+++ b/lib/DBIx/Class/Schema/Loader/DBI/ODBC.pm
@@ -6,7 +6,7 @@ use base 'DBIx::Class::Schema::Loader::DBI';
 use Carp::Clan qw/^DBIx::Class/;
 use Class::C3;
 
-our $VERSION = '0.06001';
+our $VERSION = '0.07000';
 
 =head1 NAME
 
diff --git a/lib/DBIx/Class/Schema/Loader/DBI/ODBC/Firebird.pm b/lib/DBIx/Class/Schema/Loader/DBI/ODBC/Firebird.pm
index c30ebab..366324e 100644
--- a/lib/DBIx/Class/Schema/Loader/DBI/ODBC/Firebird.pm
+++ b/lib/DBIx/Class/Schema/Loader/DBI/ODBC/Firebird.pm
@@ -9,7 +9,7 @@ use base qw/
 use Carp::Clan qw/^DBIx::Class/;
 use Class::C3;
 
-our $VERSION = '0.06001';
+our $VERSION = '0.07000';
 
 =head1 NAME
 
diff --git a/lib/DBIx/Class/Schema/Loader/DBI/ODBC/Microsoft_SQL_Server.pm b/lib/DBIx/Class/Schema/Loader/DBI/ODBC/Microsoft_SQL_Server.pm
index f0fc5d9..9100a13 100644
--- a/lib/DBIx/Class/Schema/Loader/DBI/ODBC/Microsoft_SQL_Server.pm
+++ b/lib/DBIx/Class/Schema/Loader/DBI/ODBC/Microsoft_SQL_Server.pm
@@ -8,7 +8,7 @@ use base qw/
 use Carp::Clan qw/^DBIx::Class/;
 use Class::C3;
 
-our $VERSION = '0.06001';
+our $VERSION = '0.07000';
 
 =head1 NAME
 
diff --git a/lib/DBIx/Class/Schema/Loader/DBI/ODBC/SQL_Anywhere.pm b/lib/DBIx/Class/Schema/Loader/DBI/ODBC/SQL_Anywhere.pm
index f4bb725..98cc6fa 100644
--- a/lib/DBIx/Class/Schema/Loader/DBI/ODBC/SQL_Anywhere.pm
+++ b/lib/DBIx/Class/Schema/Loader/DBI/ODBC/SQL_Anywhere.pm
@@ -8,7 +8,7 @@ use base qw/
 use Carp::Clan qw/^DBIx::Class/;
 use Class::C3;
 
-our $VERSION = '0.06001';
+our $VERSION = '0.07000';
 
 =head1 NAME
 
diff --git a/lib/DBIx/Class/Schema/Loader/DBI/Oracle.pm b/lib/DBIx/Class/Schema/Loader/DBI/Oracle.pm
index 5babfec..d93cfe3 100644
--- a/lib/DBIx/Class/Schema/Loader/DBI/Oracle.pm
+++ b/lib/DBIx/Class/Schema/Loader/DBI/Oracle.pm
@@ -9,7 +9,7 @@ use base qw/
 use Carp::Clan qw/^DBIx::Class/;
 use Class::C3;
 
-our $VERSION = '0.06001';
+our $VERSION = '0.07000';
 
 =head1 NAME
 
diff --git a/lib/DBIx/Class/Schema/Loader/DBI/Pg.pm b/lib/DBIx/Class/Schema/Loader/DBI/Pg.pm
index b89fe95..6264a97 100644
--- a/lib/DBIx/Class/Schema/Loader/DBI/Pg.pm
+++ b/lib/DBIx/Class/Schema/Loader/DBI/Pg.pm
@@ -9,7 +9,7 @@ use base qw/
 use Carp::Clan qw/^DBIx::Class/;
 use Class::C3;
 
-our $VERSION = '0.06001';
+our $VERSION = '0.07000';
 
 =head1 NAME
 
diff --git a/lib/DBIx/Class/Schema/Loader/DBI/SQLAnywhere.pm b/lib/DBIx/Class/Schema/Loader/DBI/SQLAnywhere.pm
index 2e16e96..f6b6479 100644
--- a/lib/DBIx/Class/Schema/Loader/DBI/SQLAnywhere.pm
+++ b/lib/DBIx/Class/Schema/Loader/DBI/SQLAnywhere.pm
@@ -9,7 +9,7 @@ use base qw/
 /;
 use Carp::Clan qw/^DBIx::Class/;
 
-our $VERSION = '0.06001';
+our $VERSION = '0.07000';
 
 =head1 NAME
 
diff --git a/lib/DBIx/Class/Schema/Loader/DBI/SQLite.pm b/lib/DBIx/Class/Schema/Loader/DBI/SQLite.pm
index 8610af3..e08cb56 100644
--- a/lib/DBIx/Class/Schema/Loader/DBI/SQLite.pm
+++ b/lib/DBIx/Class/Schema/Loader/DBI/SQLite.pm
@@ -10,7 +10,7 @@ use Carp::Clan qw/^DBIx::Class/;
 use Text::Balanced qw( extract_bracketed );
 use Class::C3;
 
-our $VERSION = '0.06001';
+our $VERSION = '0.07000';
 
 =head1 NAME
 
diff --git a/lib/DBIx/Class/Schema/Loader/DBI/Sybase.pm b/lib/DBIx/Class/Schema/Loader/DBI/Sybase.pm
index 376c622..1a479d8 100644
--- a/lib/DBIx/Class/Schema/Loader/DBI/Sybase.pm
+++ b/lib/DBIx/Class/Schema/Loader/DBI/Sybase.pm
@@ -6,7 +6,7 @@ use base 'DBIx::Class::Schema::Loader::DBI::Sybase::Common';
 use Carp::Clan qw/^DBIx::Class/;
 use Class::C3;
 
-our $VERSION = '0.06001';
+our $VERSION = '0.07000';
 
 =head1 NAME
 
diff --git a/lib/DBIx/Class/Schema/Loader/DBI/Sybase/Common.pm b/lib/DBIx/Class/Schema/Loader/DBI/Sybase/Common.pm
index 6e43df8..37c45cd 100644
--- a/lib/DBIx/Class/Schema/Loader/DBI/Sybase/Common.pm
+++ b/lib/DBIx/Class/Schema/Loader/DBI/Sybase/Common.pm
@@ -6,7 +6,7 @@ use base 'DBIx::Class::Schema::Loader::DBI';
 use Carp::Clan qw/^DBIx::Class/;
 use Class::C3;
 
-our $VERSION = '0.06001';
+our $VERSION = '0.07000';
 
 =head1 NAME
 
diff --git a/lib/DBIx/Class/Schema/Loader/DBI/Sybase/Microsoft_SQL_Server.pm b/lib/DBIx/Class/Schema/Loader/DBI/Sybase/Microsoft_SQL_Server.pm
index edc99c9..f4b8543 100644
--- a/lib/DBIx/Class/Schema/Loader/DBI/Sybase/Microsoft_SQL_Server.pm
+++ b/lib/DBIx/Class/Schema/Loader/DBI/Sybase/Microsoft_SQL_Server.pm
@@ -6,7 +6,7 @@ use base 'DBIx::Class::Schema::Loader::DBI::MSSQL';
 use Carp::Clan qw/^DBIx::Class/;
 use Class::C3;
 
-our $VERSION = '0.06001';
+our $VERSION = '0.07000';
 
 =head1 NAME
 
diff --git a/lib/DBIx/Class/Schema/Loader/DBI/Writing.pm b/lib/DBIx/Class/Schema/Loader/DBI/Writing.pm
index e74b616..1694989 100644
--- a/lib/DBIx/Class/Schema/Loader/DBI/Writing.pm
+++ b/lib/DBIx/Class/Schema/Loader/DBI/Writing.pm
@@ -1,7 +1,7 @@
 package DBIx::Class::Schema::Loader::DBI::Writing;
 use strict;
 
-our $VERSION = '0.06001';
+our $VERSION = '0.07000';
 
 # Empty. POD only.
 
diff --git a/lib/DBIx/Class/Schema/Loader/DBI/mysql.pm b/lib/DBIx/Class/Schema/Loader/DBI/mysql.pm
index 761515e..9e78f09 100644
--- a/lib/DBIx/Class/Schema/Loader/DBI/mysql.pm
+++ b/lib/DBIx/Class/Schema/Loader/DBI/mysql.pm
@@ -6,7 +6,7 @@ use base 'DBIx::Class::Schema::Loader::DBI';
 use Carp::Clan qw/^DBIx::Class/;
 use Class::C3;
 
-our $VERSION = '0.06001';
+our $VERSION = '0.07000';
 
 =head1 NAME
 
diff --git a/lib/DBIx/Class/Schema/Loader/RelBuilder.pm b/lib/DBIx/Class/Schema/Loader/RelBuilder.pm
index a6f4ebe..5e83da5 100644
--- a/lib/DBIx/Class/Schema/Loader/RelBuilder.pm
+++ b/lib/DBIx/Class/Schema/Loader/RelBuilder.pm
@@ -6,7 +6,7 @@ use Class::C3;
 use Carp::Clan qw/^DBIx::Class/;
 use Lingua::EN::Inflect::Phrase ();
 
-our $VERSION = '0.06001';
+our $VERSION = '0.07000';
 
 =head1 NAME
 
diff --git a/lib/DBIx/Class/Schema/Loader/RelBuilder/Compat/v0_040.pm b/lib/DBIx/Class/Schema/Loader/RelBuilder/Compat/v0_040.pm
index 3f6daa5..1d40f4c 100644
--- a/lib/DBIx/Class/Schema/Loader/RelBuilder/Compat/v0_040.pm
+++ b/lib/DBIx/Class/Schema/Loader/RelBuilder/Compat/v0_040.pm
@@ -7,7 +7,7 @@ use base 'DBIx::Class::Schema::Loader::RelBuilder';
 use Carp::Clan qw/^DBIx::Class/;
 use Lingua::EN::Inflect::Number ();
 
-our $VERSION = '0.06001';
+our $VERSION = '0.07000';
 
 sub _default_relationship_attrs { +{} }
 
diff --git a/lib/DBIx/Class/Schema/Loader/RelBuilder/Compat/v0_05.pm b/lib/DBIx/Class/Schema/Loader/RelBuilder/Compat/v0_05.pm
index 2eaf8f0..f461c5a 100644
--- a/lib/DBIx/Class/Schema/Loader/RelBuilder/Compat/v0_05.pm
+++ b/lib/DBIx/Class/Schema/Loader/RelBuilder/Compat/v0_05.pm
@@ -7,7 +7,7 @@ use base 'DBIx::Class::Schema::Loader::RelBuilder';
 use Carp::Clan qw/^DBIx::Class/;
 use Lingua::EN::Inflect::Number ();
 
-our $VERSION = '0.06001';
+our $VERSION = '0.07000';
 
 sub _to_PL {
     my ($self, $name) = @_;
diff --git a/t/12pg_common.t b/t/12pg_common.t
index f99ab9a..3b626b1 100644
--- a/t/12pg_common.t
+++ b/t/12pg_common.t
@@ -74,6 +74,7 @@ my $tester = dbixcsl_common_tests->new(
         numeric                          => { data_type => 'numeric' },
         decimal                          => { data_type => 'numeric' },
         'float(24)'                      => { data_type => 'real' },
+        'float(25)'                      => { data_type => 'double precision' },
         'float(53)'                      => { data_type => 'double precision' },
         float                            => { data_type => 'double precision' },
     },
diff --git a/t/25backcompat.t b/t/25backcompat.t
index d3f227e..6acc2ed 100644
--- a/t/25backcompat.t
+++ b/t/25backcompat.t
@@ -16,6 +16,8 @@ my $DUMP_DIR = './t/_common_dump';
 rmtree $DUMP_DIR;
 my $SCHEMA_CLASS = 'DBIXCSL_Test::Schema';
 
+my $RESULT_COUNT = 7;
+
 sub class_content_like;
 
 # test dynamic schema in 0.04006 mode
@@ -45,7 +47,7 @@ sub class_content_like;
 {
     my $res = run_loader(naming => 'current');
     is_deeply $res->{warnings}, [], 'no warnings with naming attribute set';
-    run_v6_tests($res);
+    run_v7_tests($res);
 }
 
 # test upgraded dynamic schema with external content loaded
@@ -82,7 +84,7 @@ sub class_content_like;
 'unsingularized class names in external content from unchanged Result class ' .
 'names are translated';
 
-    run_v6_tests($res);
+    run_v7_tests($res);
 }
 
 # test upgraded dynamic schema with use_namespaces with external content loaded
@@ -116,7 +118,7 @@ sub class_content_like;
 'unsingularized class names in external content from unchanged Result class ' .
 'names are translated';
 
-    run_v6_tests($res);
+    run_v7_tests($res);
 }
 
 # test upgraded static schema with external content loaded
@@ -133,7 +135,7 @@ sub class_content_like;
     my $res = run_loader(static => 1, naming => 'current');
     my $schema = $res->{schema};
 
-    run_v6_tests($res);
+    run_v7_tests($res);
 
     lives_and { is $schema->resultset('Quux')->find(1)->a_method, 'hlagh' }
 'external custom content for unsingularized Result was loaded by upgraded ' .
@@ -201,9 +203,9 @@ sub class_content_like;
 'correct number of warnings on upgrading static schema (with "naming" set)'
         or diag @{ $res->{warnings} };
 
-    run_v6_tests($res);
+    run_v7_tests($res);
 
-    is result_count('Result'), 6,
+    is result_count('Result'), $RESULT_COUNT,
         'un-singularized results were replaced during upgrade';
 
     # check that custom content was preserved
@@ -265,9 +267,9 @@ sub class_content_like;
 'correct number of warnings on upgrading static schema (with "naming" set)'
         or diag @{ $res->{warnings} };
 
-    run_v6_tests($res);
+    run_v7_tests($res);
 
-    is result_count(), 6,
+    is result_count(), $RESULT_COUNT,
         'un-singularized results were replaced during upgrade';
 
     # check that custom content was preserved
@@ -339,9 +341,9 @@ sub class_content_like;
 'correct number of warnings on upgrading static schema (with "naming" set)'
         or diag @{ $res->{warnings} };
 
-    run_v6_tests($res);
+    run_v7_tests($res);
 
-    is result_count(), 6,
+    is result_count(), $RESULT_COUNT,
 'un-singularized results were replaced during upgrade and Result dir removed';
 
     ok ((not -d result_dir('Result')),
@@ -396,7 +398,7 @@ sub class_content_like;
 'correct number of warnings on dumping static schema with use_namespaces => 0'
         or diag @{ $res->{warnings} };
 
-    run_v6_tests($res);
+    run_v7_tests($res);
 
     my $schema   = $res->{schema};
     add_custom_content($res->{schema}, {
@@ -423,7 +425,7 @@ sub class_content_like;
     is $res->{classes}{quuxs}, 'DBIXCSL_Test::Schema::Quux',
         'load_classes preserved on re-dump';
 
-    run_v6_tests($res);
+    run_v7_tests($res);
 
     # now upgrade the schema to use_namespaces
     $res = run_loader(
@@ -442,7 +444,7 @@ sub class_content_like;
 'correct number of warnings on upgrading to use_namespaces'
         or diag @{ $res->{warnings} };
 
-    run_v6_tests($res);
+    run_v7_tests($res);
 
     my @schema_files = schema_files();
 
@@ -479,7 +481,7 @@ sub class_content_like;
 'correct number of warnings on dumping static schema'
         or diag @{ $res->{warnings} };
 
-    run_v6_tests($res);
+    run_v7_tests($res);
 
     is $res->{classes}{quuxs}, 'DBIXCSL_Test::Schema::Result::Quux',
         'defaults to use_namespaces on regular dump';
@@ -502,7 +504,7 @@ sub class_content_like;
     is $res->{classes}{quuxs}, 'DBIXCSL_Test::Schema::Result::Quux',
         'use_namespaces preserved on re-dump';
 
-    run_v6_tests($res);
+    run_v7_tests($res);
 
     # now downgrade the schema to load_classes
     $res = run_loader(
@@ -521,12 +523,12 @@ sub class_content_like;
 'correct number of warnings on downgrading to load_classes'
         or diag @{ $res->{warnings} };
 
-    run_v6_tests($res);
+    run_v7_tests($res);
 
     is $res->{classes}{quuxs}, 'DBIXCSL_Test::Schema::Quux',
         'load_classes downgrade correct';
 
-    is result_count(), 6,
+    is result_count(), $RESULT_COUNT,
 'correct number of Results after upgrade and Result dir removed';
 
     ok ((not -d result_dir('Result')),
@@ -565,7 +567,7 @@ sub class_content_like;
 'correct number of warnings on dumping static schema'
         or diag @{ $res->{warnings} };
 
-    run_v6_tests($res);
+    run_v7_tests($res);
 
     is $res->{classes}{quuxs}, 'DBIXCSL_Test::Schema::MyResult::Quux',
         'defaults to use_namespaces and uses custom result_namespace';
@@ -589,7 +591,7 @@ sub class_content_like;
     is $res->{classes}{quuxs}, 'DBIXCSL_Test::Schema::MyResult::Quux',
         'use_namespaces and custom result_namespace preserved on re-dump';
 
-    run_v6_tests($res);
+    run_v7_tests($res);
 
     # now downgrade the schema to load_classes
     $res = run_loader(
@@ -608,12 +610,12 @@ sub class_content_like;
 'correct number of warnings on downgrading to load_classes'
         or diag @{ $res->{warnings} };
 
-    run_v6_tests($res);
+    run_v7_tests($res);
 
     is $res->{classes}{quuxs}, 'DBIXCSL_Test::Schema::Quux',
         'load_classes downgrade correct';
 
-    is result_count(), 6,
+    is result_count(), $RESULT_COUNT,
 'correct number of Results after upgrade and Result dir removed';
 
     ok ((not -d result_dir('MyResult')),
@@ -653,7 +655,7 @@ sub class_content_like;
     is $res->{classes}{quuxs}, 'DBIXCSL_Test::Schema::MyResult::Quux',
         'using new result_namespace';
 
-    is result_count('MyResult'), 6,
+    is result_count('MyResult'), $RESULT_COUNT,
 'correct number of Results after rewritten result_namespace';
 
     ok ((not -d schema_dir('Result')),
@@ -681,7 +683,7 @@ sub class_content_like;
     is $res->{classes}{quuxs}, 'DBIXCSL_Test::Schema::Mtfnpy::Quux',
         'using new result_namespace';
 
-    is result_count('Mtfnpy'), 6,
+    is result_count('Mtfnpy'), $RESULT_COUNT,
 'correct number of Results after rewritten result_namespace';
 
     ok ((not -d result_dir('MyResult')),
@@ -749,7 +751,7 @@ sub class_content_like;
     # now upgrade the schema
     $res = run_loader(static => 1, naming => 'current');
     $schema = $res->{schema};
-    run_v6_tests($res);
+    run_v7_tests($res);
 
     # check that custom content was preserved
     lives_and { is $schema->resultset('Bar')->find(1)->b_method, 'dongs' }
@@ -767,7 +769,6 @@ sub class_content_like;
 
 # test creating static schema in v5 mode then upgrade to current with external
 # content loaded
-# XXX needs real load_external tests
 {
     clean_dumpdir();
 
@@ -794,7 +795,7 @@ sub class_content_like;
     $res = run_loader(static => 1, naming => 'current');
     my $schema = $res->{schema};
 
-    run_v6_tests($res);
+    run_v7_tests($res);
 
     lives_and { is $schema->resultset('Baz')->find(1)->a_method, 'hlagh' }
         'external custom content loaded for v5 -> v6';
@@ -812,6 +813,47 @@ sub class_content_like;
         'external content rewritten for v5 -> v6 for upgraded Result class names';
 }
 
+# test creating static schema in v6 mode then upgrade to current with external
+# content loaded
+{
+    clean_dumpdir();
+
+    write_v6_schema_pm();
+
+    my $res = run_loader(static => 1);
+
+    like $res->{warnings}[0], qr/0.06001 static schema/, 'backcompat warning';
+
+    run_v6_tests($res);
+
+    my $temp_dir = setup_load_external({
+        Routechange => 'Quux',
+    }, { result_namespace => 'Result' });
+
+    add_custom_content($res->{schema}, {
+        Routechange => 'Quux',
+    }, {
+        result_namespace => 'Result',
+        rel_name_map => { RoutechangeQuux => 'custom_content_rel' },
+    });
+
+    $res = run_loader(static => 1, naming => 'current');
+    my $schema = $res->{schema};
+
+    run_v7_tests($res);
+
+    lives_and { is $schema->resultset('RouteChange')->find(1)->a_method, 'hlagh' }
+        'external custom content loaded for v6 -> v7';
+
+    lives_and { isa_ok $schema->resultset('RouteChange')->find(1)->quuxrel,
+        $res->{classes}{quuxs} }
+        'external content rewritten for v6 -> v7';
+
+    lives_and { isa_ok $schema->resultset('RouteChange')->find(1)->custom_content_rel,
+        $res->{classes}{quuxs} }
+        'custom content rewritten for v6 -> v7';
+}
+
 done_testing;
 
 END {
@@ -975,12 +1017,68 @@ EOF
     }
 }
 
+sub write_v6_schema_pm {
+    my %opts = @_;
+
+    (my $schema_dir = "$DUMP_DIR/$SCHEMA_CLASS") =~ s/::[^:]+\z//;
+    rmtree $schema_dir;
+    make_path $schema_dir;
+    my $schema_pm = "$schema_dir/Schema.pm";
+    open my $fh, '>', $schema_pm or die $!;
+    if (exists $opts{use_namespaces} && $opts{use_namespaces} == 0) {
+        print $fh <<'EOF';
+package DBIXCSL_Test::Schema;
+
+# Created by DBIx::Class::Schema::Loader
+# DO NOT MODIFY THE FIRST PART OF THIS FILE
+
+use strict;
+use warnings;
+
+use base 'DBIx::Class::Schema';
+
+__PACKAGE__->load_classes;
+
+
+# Created by DBIx::Class::Schema::Loader v0.06001 @ 2010-04-21 19:56:03
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:/fqZCb95hsGIe1g5qyQQZg
+
+
+# You can replace this text with custom content, and it will be preserved on regeneration
+1;
+EOF
+    }
+    else {
+        print $fh <<'EOF';
+package DBIXCSL_Test::Schema;
+
+# Created by DBIx::Class::Schema::Loader
+# DO NOT MODIFY THE FIRST PART OF THIS FILE
+
+use strict;
+use warnings;
+
+use base 'DBIx::Class::Schema';
+
+__PACKAGE__->load_namespaces;
+
+
+# Created by DBIx::Class::Schema::Loader v0.06001 @ 2010-04-21 19:54:31
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:nwO5Vi47kl0X9SpEoiVO5w
+
+
+# You can replace this text with custom content, and it will be preserved on regeneration
+1;
+EOF
+    }
+}
+
 sub run_v4_tests {
     my $res = shift;
     my $schema = $res->{schema};
 
-    is_deeply [ @{ $res->{monikers} }{qw/foos bar bazs quuxs stations_visited email/} ],
-        [qw/Foos Bar Bazs Quuxs StationsVisited Email/],
+    is_deeply [ @{ $res->{monikers} }{qw/foos bar bazs quuxs stations_visited RouteChange email/} ],
+        [qw/Foos Bar Bazs Quuxs StationsVisited Routechange Email/],
         'correct monikers in 0.04006 mode';
 
     isa_ok ((my $bar = eval { $schema->resultset('Bar')->find(1) }),
@@ -1005,8 +1103,8 @@ sub run_v5_tests {
     my $res = shift;
     my $schema = $res->{schema};
 
-    is_deeply [ @{ $res->{monikers} }{qw/foos bar bazs quuxs stations_visited email/} ],
-        [qw/Foo Bar Baz Quux StationsVisited Email/],
+    is_deeply [ @{ $res->{monikers} }{qw/foos bar bazs quuxs stations_visited RouteChange email/} ],
+        [qw/Foo Bar Baz Quux StationsVisited Routechange Email/],
         'correct monikers in v5 mode';
 
     ok my $bar = eval { $schema->resultset('Bar')->find(1) };
@@ -1029,8 +1127,32 @@ sub run_v6_tests {
     my $res = shift;
     my $schema = $res->{schema};
 
-    is_deeply [ @{ $res->{monikers} }{qw/foos bar bazs quuxs stations_visited email/} ],
-        [qw/Foo Bar Baz Quux StationVisited Email/],
+    is_deeply [ @{ $res->{monikers} }{qw/foos bar bazs quuxs stations_visited RouteChange email/} ],
+        [qw/Foo Bar Baz Quux StationVisited Routechange Email/],
+        'correct monikers in v6 mode';
+
+    ok my $bar = eval { $schema->resultset('Bar')->find(1) };
+
+    isa_ok eval { $bar->foo }, $res->{classes}{foos},
+        'correct rel name in v6 mode';
+
+    ok my $baz  = eval { $schema->resultset('Baz')->find(1) };
+
+    isa_ok eval { $baz->quux }, $res->{classes}{quuxs},
+        'correct rel type and name for UNIQUE FK in v6 mode';
+
+    ok my $foo = eval { $schema->resultset('Foo')->find(1) };
+
+    isa_ok eval { $foo->emails_to }, 'DBIx::Class::ResultSet',
+        'correct rel name inflection in v6 mode';
+}
+
+sub run_v7_tests {
+    my $res = shift;
+    my $schema = $res->{schema};
+
+    is_deeply [ @{ $res->{monikers} }{qw/foos bar bazs quuxs stations_visited RouteChange email/} ],
+        [qw/Foo Bar Baz Quux StationVisited RouteChange Email/],
         'correct monikers in current mode';
 
     ok my $bar = eval { $schema->resultset('Bar')->find(1) };
@@ -1129,6 +1251,7 @@ sub _rel_condition {
         BarFoo  => q{'foreign.fooid'   => 'self.foo_id'},
         BazStationsvisited => q{'foreign.id' => 'self.stations_visited_id'},
         StationsvisitedQuux => q{'foreign.quuxid' => 'self.quuxs_id'},
+        RoutechangeQuux => q{'foreign.quuxid' => 'self.quuxs_id'},
     }->{_rel_key($from, $to)};
 }
 
diff --git a/t/lib/dbixcsl_common_tests.pm b/t/lib/dbixcsl_common_tests.pm
index 66c9ac7..546e072 100644
--- a/t/lib/dbixcsl_common_tests.pm
+++ b/t/lib/dbixcsl_common_tests.pm
@@ -117,8 +117,17 @@ sub run_only_extra_tests {
         $self->drop_extra_tables_only;
 
         my $dbh = $self->dbconnect(1);
-        $dbh->do($_) for @{ $self->{extra}{create} || [] };
-        $dbh->do($self->{data_type_tests}{ddl}) if $self->{data_type_tests}{ddl};
+        {
+            # Silence annoying but harmless postgres "NOTICE:  CREATE TABLE..."
+            local $SIG{__WARN__} = sub {
+                my $msg = shift;
+                warn $msg unless $msg =~ m{^NOTICE:\s+CREATE TABLE};
+            };
+
+
+            $dbh->do($_) for @{ $self->{extra}{create} || [] };
+            $dbh->do($self->{data_type_tests}{ddl}) if $self->{data_type_tests}{ddl};
+        }
         $self->{_created} = 1;
 
         my $file_count = grep /CREATE (?:TABLE|VIEW)/i, @{ $self->{extra}{create} || [] };
@@ -887,7 +896,7 @@ sub test_schema {
             # Silence annoying but harmless postgres "NOTICE:  CREATE TABLE..."
             local $SIG{__WARN__} = sub {
                 my $msg = shift;
-                print STDERR $msg unless $msg =~ m{^NOTICE:\s+CREATE TABLE};
+                warn $msg unless $msg =~ m{^NOTICE:\s+CREATE TABLE};
             };
 
             $dbh->do($_) for @statements_rescan;
@@ -1462,7 +1471,7 @@ sub create {
     # Silence annoying but harmless postgres "NOTICE:  CREATE TABLE..."
     local $SIG{__WARN__} = sub {
         my $msg = shift;
-        print STDERR $msg unless $msg =~ m{^NOTICE:\s+CREATE TABLE};
+        warn $msg unless $msg =~ m{^NOTICE:\s+CREATE TABLE};
     };
 
     $dbh->do($_) for (@statements);
diff --git a/t/lib/make_dbictest_db_with_unique.pm b/t/lib/make_dbictest_db_with_unique.pm
index 87c7316..8dbd42a 100644
--- a/t/lib/make_dbictest_db_with_unique.pm
+++ b/t/lib/make_dbictest_db_with_unique.pm
@@ -36,6 +36,10 @@ $dbh->do($_) for (
         id INTEGER PRIMARY KEY,
         quuxs_id INTEGER REFERENCES quuxs (quuxid)
       )|,
+    q|CREATE TABLE RouteChange (
+        id INTEGER PRIMARY KEY,
+        quuxs_id INTEGER REFERENCES quuxs (quuxid)
+      )|,
     q|CREATE TABLE email (
         id INTEGER PRIMARY KEY,
         to_id INTEGER REFERENCES foos (fooid),
@@ -54,6 +58,7 @@ $dbh->do($_) for (
     q|INSERT INTO quuxs VALUES (1,20)|,
     q|INSERT INTO quuxs VALUES (2,19)|,
     q|INSERT INTO stations_visited VALUES (1,1)|,
+    q|INSERT INTO RouteChange VALUES (1,1)|,
 );
 
 END { unlink($fn); }