make Types to avoid Copy/Pasting them

[dbsrgits/DBIx-Class-DeploymentHandler.git] / lib / DBIx / Class / DeploymentHandler / DeployMethod / SQL / Translator.pm

diff --git a/lib/DBIx/Class/DeploymentHandler/DeployMethod/SQL/Translator.pm b/lib/DBIx/Class/DeploymentHandler/DeployMethod/SQL/Translator.pm
index 6c53b49..7973095 100644 (file)
--- a/lib/DBIx/Class/DeploymentHandler/DeployMethod/SQL/Translator.pm
+++ b/lib/DBIx/Class/DeploymentHandler/DeployMethod/SQL/Translator.pm
@@ -7,6 +7,8 @@ require SQL::Translator::Diff;
 require DBIx::Class::Storage;   # loaded for type constraint
 use autodie;
 use File::Path;
+use DBIx::Class::DeploymentHandler::Types;
+
 
 with 'DBIx::Class::DeploymentHandler::HandlesDeploy';
 
@@ -148,12 +150,12 @@ sub _deploy {
 
   my $guard = $self->schema->txn_scope_guard if $self->txn_wrap;
 
-  foreach my $line (
-    map @{$self->_read_sql_file($_)}, @{$self->_ddl_schema_consume_filenames(
+  my @sql = map @{$self->_read_sql_file($_)}, @{$self->_ddl_schema_consume_filenames(
       $self->storage->sqlt_type,
       $self->schema_version
-    )}
-  ) {
+    )};
+
+  foreach my $line (@sql) {
     $storage->_query_start($line);
     try {
       # do a dbh_do cycle here, as we need some error checking in
@@ -167,6 +169,7 @@ sub _deploy {
   }
 
   $guard->commit if $self->txn_wrap;
+  return join "\n", @sql;
 }
 
 sub prepare_install {
@@ -185,7 +188,7 @@ sub prepare_install {
     %{$sqltargs}
   });
 
-  my $sqlt_schema = $sqlt->translate({ data => $schema })
+  my $sqlt_schema = $sqlt->translate( data => $schema )
     or $self->throw_exception($sqlt->error);
 
   foreach my $db (@$databases) {
@@ -260,7 +263,7 @@ method _prepare_changegrade($from_version, $to_version, $version_set, $direction
   my $sqlt = SQL::Translator->new( $sqltargs );
 
   $sqlt->parser('SQL::Translator::Parser::DBIx::Class');
-  my $sqlt_schema = $sqlt->translate({ data => $schema })
+  my $sqlt_schema = $sqlt->translate( data => $schema )
     or $self->throw_exception ($sqlt->error);
 
   foreach my $db (@$databases) {