tiny cleanup, mark which attrs are purely for config

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

diff --git a/lib/DBIx/Class/DeploymentHandler.pm b/lib/DBIx/Class/DeploymentHandler.pm
index 6b4dec2..b1c96de 100644 (file)
--- a/lib/DBIx/Class/DeploymentHandler.pm
+++ b/lib/DBIx/Class/DeploymentHandler.pm
@@ -10,7 +10,7 @@ use SQL::Translator;
 require SQL::Translator::Diff;
 use Try::Tiny;
 
-with 'DBIx::Class::DeploymentHandler::SqltDeployMethod';
+with 'DBIx::Class::DeploymentHandler::WithSqltDeployMethod';
 
 BEGIN {
   use Moose::Util::TypeConstraints;
@@ -30,16 +30,17 @@ has schema => (
   handles => [qw( ddl_filename schema_version )],
 );
 
-has upgrade_directory => (
+has upgrade_directory => ( # configuration
   isa      => 'Str',
   is       => 'ro',
   required => 1,
   default  => 'sql',
 );
 
-has backup_directory => (
+has backup_directory => ( # configuration
   isa => 'Str',
   is  => 'ro',
+  predicate  => 'has_backup_directory',
 );
 
 has storage => (
@@ -54,18 +55,7 @@ method _build_storage {
   $s
 }
 
-has _filedata => (
-  isa => 'ArrayRef[Str]',
-  is  => 'rw',
-);
-
-has do_backup => (
-  isa     => 'Bool',
-  is      => 'ro',
-  default => undef,
-);
-
-has do_diff_on_init => (
+has do_backup => ( # configuration
   isa     => 'Bool',
   is      => 'ro',
   default => undef,
@@ -83,24 +73,20 @@ method _build_version_rs {
    $self->schema->resultset('__VERSION')
 }
 
-has databases => (
+has databases => ( # configuration
   coerce  => 1,
   isa     => 'DBIx::Class::DeploymentHandler::Databases',
   is      => 'ro',
   default => sub { [qw( MySQL SQLite PostgreSQL )] },
 );
 
-has sqltargs => (
+has sqltargs => ( # configuration
   isa => 'HashRef',
   is  => 'ro',
   default => sub { {} },
 );
 
 method deploy {
-  my $schema   = $self->schema;
-  my $type     = undef;
-  my $sqltargs = $self->sqltargs;
-  my $dir      = $self->upgrade_directory;
   my $storage  = $self->storage;
 
   my $deploy = sub {
@@ -117,7 +103,7 @@ method deploy {
     }
     $storage->_query_end($line);
   };
-  my @statements = $self->deployment_statements();
+  my @statements = $self->deployment_statements;
   if (@statements > 1) {
     foreach my $statement (@statements) {
       $deploy->( $statement );
@@ -130,8 +116,6 @@ method deploy {
   }
 }
 
-method backup { $self->storage->backup($self->backup_directory) }
-
 method install($new_version) {
   carp 'Install not possible as versions table already exists in database'
     if $self->is_installed;
@@ -139,7 +123,7 @@ method install($new_version) {
   $new_version ||= $self->schema_version;
 
   if ($new_version) {
-    $self->deploy();
+    $self->deploy;
 
     $self->version_rs->create({
       version     => $new_version,
@@ -149,8 +133,6 @@ method install($new_version) {
   }
 }
 
-method create_upgrade_path { }
-
 method ordered_schema_versions { undef }
 
 method upgrade {
@@ -192,76 +174,6 @@ method upgrade {
   }
 }
 
-method upgrade_single_step($db_version, $target_version) {
-  if ($db_version eq $target_version) {
-    # croak?
-    carp "Upgrade not necessary\n";
-    return;
-  }
-
-  my $upgrade_file = $self->ddl_filename(
-    $self->storage->sqlt_type,
-    $target_version,
-    $self->upgrade_directory,
-    $db_version,
-  );
-
-  $self->create_upgrade_path({ upgrade_file => $upgrade_file });
-
-  unless (-f $upgrade_file) {
-    # croak?
-    carp "Upgrade not possible, no upgrade file found ($upgrade_file), please create one\n";
-    return;
-  }
-
-  carp "DB version ($db_version) is lower than the schema version (".$self->schema_version."). Attempting upgrade.\n";
-
-  $self->_filedata($self->_read_sql_file($upgrade_file)); # I don't like this --fREW 2010-02-22
-  $self->backup if $self->do_backup;
-  $self->schema->txn_do(sub { $self->do_upgrade });
-
-  $self->version_rs->create({
-    version     => $target_version,
-    # ddl         => $ddl,
-    # upgrade_sql => $upgrade_sql,
-  });
-}
-
-method do_upgrade { $self->run_upgrade(qr/.*?/) }
-
-method run_upgrade($stm) {
-  return unless $self->_filedata;
-  my @statements = grep { $_ =~ $stm } @{$self->_filedata};
-
-  for (@statements) {
-    $self->storage->debugobj->query_start($_) if $self->storage->debug;
-    $self->apply_statement($_);
-    $self->storage->debugobj->query_end($_) if $self->storage->debug;
-  }
-}
-
-method apply_statement($statement) {
-  # croak?
-  $self->storage->dbh->do($_) or carp "SQL was: $_"
-}
-
-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>;
-  close $fh;
-
-  @data = grep {
-    $_ &&
-    !/^--/ &&
-    !/^(BEGIN|BEGIN TRANSACTION|COMMIT)/m
-  } split /;/,
-    join '', @data;
-
-  return \@data;
-}
-
 __PACKAGE__->meta->make_immutable;
 
 1;