X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FDeploymentHandler%2FDeprecated.pm;h=56c99a47350b774ccf11886973af4995172bbd8b;hb=refs%2Fheads%2Fmoo-port;hp=bd5a941b68c0d0c81ff4e472dc3c2ab4999fc34e;hpb=61627cf07a41385a0d721403057857a0b93669d5;p=dbsrgits%2FDBIx-Class-DeploymentHandler.git

diff --git a/lib/DBIx/Class/DeploymentHandler/Deprecated.pm b/lib/DBIx/Class/DeploymentHandler/Deprecated.pm
index bd5a941..56c99a4 100644
--- a/lib/DBIx/Class/DeploymentHandler/Deprecated.pm
+++ b/lib/DBIx/Class/DeploymentHandler/Deprecated.pm
@@ -6,21 +6,22 @@ use Moose;
 use Moose::Util 'apply_all_roles';
 
 extends 'DBIx::Class::DeploymentHandler::Dad';
+use DBIx::Class::DeploymentHandler::WithApplicatorDumple2;
 # a single with would be better, but we can't do that
 # see: http://rt.cpan.org/Public/Bug/Display.html?id=46347
-with 'DBIx::Class::DeploymentHandler::WithApplicatorDumple' => {
+with WithApplicatorDumple2(
     interface_role       => 'DBIx::Class::DeploymentHandler::HandlesDeploy',
     class_name           => 'DBIx::Class::DeploymentHandler::DeployMethod::SQL::Translator::Deprecated',
     delegate_name        => 'deploy_method',
     attributes_to_assume => ['schema'],
-    attributes_to_copy   => [qw( upgrade_directory databases sql_translator_args )],
-  },
-  'DBIx::Class::DeploymentHandler::WithApplicatorDumple' => {
+    attributes_to_copy   => [qw( script_directory databases sql_translator_args )],
+  ),
+  WithApplicatorDumple2(
     interface_role       => 'DBIx::Class::DeploymentHandler::HandlesVersionStorage',
     class_name           => 'DBIx::Class::DeploymentHandler::VersionStorage::Deprecated',
     delegate_name        => 'version_storage',
     attributes_to_assume => ['schema'],
-  };
+  );
 with 'DBIx::Class::DeploymentHandler::WithReasonableDefaults';
 
 sub BUILD {
@@ -29,22 +30,22 @@ sub BUILD {
   if ($self->schema->can('ordered_versions') && $self->schema->ordered_versions) {
     apply_all_roles(
       $self,
-      'DBIx::Class::DeploymentHandler::WithApplicatorDumple' => {
+      WithApplicatorDumple2(
         interface_role       => 'DBIx::Class::DeploymentHandler::HandlesVersioning',
         class_name           => 'DBIx::Class::DeploymentHandler::VersionHandler::ExplicitVersions',
         delegate_name        => 'version_handler',
         attributes_to_assume => [qw( database_version schema_version to_version )],
-      }
+      )
     );
   } else {
     apply_all_roles(
       $self,
-      'DBIx::Class::DeploymentHandler::WithApplicatorDumple' => {
+      WithApplicatorDumple2(
         interface_role       => 'DBIx::Class::DeploymentHandler::HandlesVersioning',
         class_name           => 'DBIx::Class::DeploymentHandler::VersionHandler::DatabaseToSchemaVersions',
         delegate_name        => 'version_handler',
         attributes_to_assume => [qw( database_version schema_version to_version )],
-      }
+      )
     );
   }
   # the following is just a hack so that ->version_storage
@@ -109,7 +110,7 @@ C<DBIx::Class::DeploymentHandler::Deprecated> extends
 L<DBIx::Class::DeploymentHandler::Dad>, so that's probably the first place to
 look when you are trying to figure out how everything works.
 
-Next would be to look at all the roles that fill in the blanks that
+Next would be to look at all the pieces that fill in the blanks that
 L<DBIx::Class::DeploymentHandler::Dad> expects to be filled.  They would be
 L<DBIx::Class::DeploymentHandler::DeployMethod::SQL::Translator::Deprecated>,
 L<DBIx::Class::DeploymentHandler::VersionStorage::Deprecated>, and