remove dead code from _deploy_statements

[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 c06f124..76d48e0 100644 (file)
--- a/lib/DBIx/Class/DeploymentHandler.pm
+++ b/lib/DBIx/Class/DeploymentHandler.pm
@@ -6,7 +6,9 @@ require DBIx::Class::Schema;    # loaded for type constraint
 require DBIx::Class::ResultSet; # loaded for type constraint
 use Carp::Clan '^DBIx::Class::DeploymentHandler';
 
-with 'DBIx::Class::DeploymentHandler::WithSqltDeployMethod';
+with 'DBIx::Class::DeploymentHandler::WithSqltDeployMethod',
+     'DBIx::Class::DeploymentHandler::WithDatabaseToSchemaVersions',
+     'DBIx::Class::DeploymentHandler::WithStandardVersionStorage';
 
 BEGIN {
   use Moose::Util::TypeConstraints;
@@ -23,7 +25,6 @@ has schema => (
   isa      => 'DBIx::Class::Schema',
   is       => 'ro',
   required => 1,
-  handles => [qw( ddl_filename schema_version )],
 );
 
 has upgrade_directory => ( # configuration
@@ -39,24 +40,12 @@ has backup_directory => ( # configuration
   predicate  => 'has_backup_directory',
 );
 
-has do_backup => ( # configuration
-  isa     => 'Bool',
-  is      => 'ro',
-  default => undef,
-);
-
-has version_rs => (
-  isa        => 'DBIx::Class::ResultSet',
+has to_version => ( # configuration
   is         => 'ro',
-  lazy_build => 1,
-  handles    => [qw( is_installed db_version )],
+  lazy_build => 1, # builder comes from another role...
+                   # which is... probably not how we want it
 );
 
-method _build_version_rs {
-   $self->schema->set_us_up_the_bomb;
-   $self->schema->resultset('__VERSION')
-}
-
 has databases => ( # configuration
   coerce  => 1,
   isa     => 'DBIx::Class::DeploymentHandler::Databases',
@@ -70,16 +59,16 @@ has sqltargs => ( # configuration
   default => sub { {} },
 );
 
-method install($new_version) {
+method install {
   carp 'Install not possible as versions table already exists in database'
-    if $self->is_installed;
+    if $self->version_storage_is_installed;
 
-  $new_version ||= $self->schema_version;
+  my $new_version = $self->to_version;
 
   if ($new_version) {
-    $self->deploy;
+    $self->_deploy;
 
-    $self->version_rs->create({
+    $self->add_database_version({
       version     => $new_version,
       # ddl         => $ddl,
       # upgrade_sql => $upgrade_sql,
@@ -87,47 +76,21 @@ method install($new_version) {
   }
 }
 
-method ordered_schema_versions { undef }
-
-method upgrade {
-  my $db_version     = $self->db_version;
-  my $schema_version = $self->schema_version;
-
-  unless ($db_version) {
-    # croak?
-    carp 'Upgrade not possible as database is unversioned. Please call install first.';
-    return;
-  }
-
-  if ( $db_version eq $schema_version ) {
-    # croak?
-    carp "Upgrade not necessary\n";
-    return;
-  }
-
-  my @version_list = $self->ordered_schema_versions ||
-    ( $db_version, $schema_version );
-
-  # remove all versions in list above the required version
-  while ( @version_list && ( $version_list[-1] ne $schema_version ) ) {
-    pop @version_list;
-  }
-
-  # remove all versions in list below the current version
-  while ( @version_list && ( $version_list[0] ne $db_version ) ) {
-    shift @version_list;
-  }
-
-  # check we have an appropriate list of versions
-  die if @version_list < 2;
+sub upgrade {
+  my $self = shift;
+  while ( my $version_list = $self->next_version_set ) {
+    $self->_upgrade_single_step($version_list);
 
-  # do sets of upgrade
-  while ( @version_list >= 2 ) {
-    $self->upgrade_single_step( $version_list[0], $version_list[1] );
-    shift @version_list;
+    $self->add_database_version({
+      version     => $version_list->[-1],
+      # ddl         => $ddl,
+      # upgrade_sql => $upgrade_sql,
+    });
   }
 }
 
+method backup { $self->storage->backup($self->backup_directory) }
+
 __PACKAGE__->meta->make_immutable;
 
 1;