X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FDeploymentHandler%2FDeployMethod%2FSQL%2FTranslator.pm;h=7973095b0915d88228fb31492fd2ed3dcd8022ef;hb=418634284e2fdd63bb846894cc628ae1a61a6765;hp=17ff95d82d3c1eb003a53638bd6d7cb62ea51781;hpb=3aaf766fb64abe220ceaf0b39a93dc2eb925d143;p=dbsrgits%2FDBIx-Class-DeploymentHandler.git

diff --git a/lib/DBIx/Class/DeploymentHandler/DeployMethod/SQL/Translator.pm b/lib/DBIx/Class/DeploymentHandler/DeployMethod/SQL/Translator.pm
index 17ff95d..7973095 100644
--- 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';
 
@@ -142,28 +144,18 @@ method _ddl_schema_down_produce_filename($type, $versions, $dir) {
   );
 }
 
-method _deployment_statements {
-  my $type     = $self->storage->sqlt_type;
-  my $version  = $self->schema_version;
-
-  for my $filename (@{$self->_ddl_schema_consume_filenames($type, $version)}) {
-      open my $file, q(<), $filename
-        or carp "Can't open $filename ($!)";
-      my @rows = <$file>;
-      close $file;
-      return join '', @rows;
-  }
-}
-
 sub _deploy {
   my $self = shift;
   my $storage  = $self->storage;
 
   my $guard = $self->schema->txn_scope_guard if $self->txn_wrap;
 
-  foreach my $line ( split /;\n/, $self->_deployment_statements ) {
-    $line = join '', grep { !/^--/ } split /\n/, $line;
-    next if !$line || $line =~ /^BEGIN TRANSACTION|^COMMIT|^\s+$/;
+  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
@@ -177,6 +169,7 @@ sub _deploy {
   }
 
   $guard->commit if $self->txn_wrap;
+  return join "\n", @sql;
 }
 
 sub prepare_install {
@@ -195,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) {
@@ -270,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) {
@@ -353,16 +346,17 @@ method _prepare_changegrade($from_version, $to_version, $version_set, $direction
 method _read_sql_file($file) {
   return unless $file;
 
-  open my $fh, '<', $file or carp("Can't open upgrade file, $file ($!)");
-  my @data = split /\n/, join '', <$fh>;
+  open my $fh, '<', $file or carp("Can't open sql file, $file ($!)");
+  my @data = split /;\n/, join '', <$fh>;
   close $fh;
 
   @data = grep {
-    $_ &&
-    !/^--/ &&
-    !/^(BEGIN|BEGIN TRANSACTION|COMMIT)/m
-  } split /;/,
-    join '', @data;
+    $_ && # remove blank lines
+    !/^(BEGIN|BEGIN TRANSACTION|COMMIT)/ # strip txn's
+  } map {
+    s/^\s+//; s/\s+$//; # trim whitespace
+    join '', grep { !/^--/ } split /\n/ # remove comments
+  } @data;
 
   return \@data;
 }