comments for clarity and move backup stuff out of DM

[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..c22b6ab 100644 (file)
--- a/lib/DBIx/Class/DeploymentHandler.pm
+++ b/lib/DBIx/Class/DeploymentHandler.pm
@@ -7,6 +7,7 @@ require DBIx::Class::ResultSet; # loaded for type constraint
 use Carp::Clan '^DBIx::Class::DeploymentHandler';
 
 with 'DBIx::Class::DeploymentHandler::WithSqltDeployMethod';
+with 'DBIx::Class::DeploymentHandler::WithDatabaseToSchemaVersions';
 
 BEGIN {
   use Moose::Util::TypeConstraints;
@@ -23,7 +24,6 @@ has schema => (
   isa      => 'DBIx::Class::Schema',
   is       => 'ro',
   required => 1,
-  handles => [qw( ddl_filename schema_version )],
 );
 
 has upgrade_directory => ( # configuration
@@ -48,14 +48,16 @@ has do_backup => ( # configuration
 has version_rs => (
   isa        => 'DBIx::Class::ResultSet',
   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
+  handles    => [qw( is_installed )],
 );
 
-method _build_version_rs {
-   $self->schema->set_us_up_the_bomb;
-   $self->schema->resultset('__VERSION')
-}
+has to_version => ( # configuration
+  is         => 'ro',
+  lazy_build => 1, # builder comes from another role...
+                   # which is... probably not how we want it
+);
 
 has databases => ( # configuration
   coerce  => 1,
@@ -70,14 +72,14 @@ 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;
 
-  $new_version ||= $self->schema_version;
+  my $new_version = $self->to_version;
 
   if ($new_version) {
-    $self->deploy;
+    $self->_deploy;
 
     $self->version_rs->create({
       version     => $new_version,
@@ -87,47 +89,14 @@ 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;
-
-  # do sets of upgrade
-  while ( @version_list >= 2 ) {
-    $self->upgrade_single_step( $version_list[0], $version_list[1] );
-    shift @version_list;
+sub upgrade {
+  while ( my $version_list = $_[0]->next_version_set ) {
+    $_[0]->_upgrade_single_step($version_list);
   }
 }
 
+method backup { $self->storage->backup($self->backup_directory) }
+
 __PACKAGE__->meta->make_immutable;
 
 1;