more whitespace

[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 0b176bd..cbae8ca 100644 (file)
--- a/lib/DBIx/Class/DeploymentHandler.pm
+++ b/lib/DBIx/Class/DeploymentHandler.pm
@@ -5,61 +5,61 @@ use Method::Signatures::Simple;
 require DBIx::Class::Schema;    # loaded for type constraint
 require DBIx::Class::Storage;   # loaded for type constraint
 require DBIx::Class::ResultSet; # loaded for type constraint
-use Carp 'carp';
+use Carp::Clan '^DBIx::Class::DeploymentHandler';
 
 has schema => (
-   isa      => 'DBIx::Class::Schema',
-   is       => 'ro',
-   required => 1,
-   handles => [qw{schema_version}],
+  isa      => 'DBIx::Class::Schema',
+  is       => 'ro',
+  required => 1,
+  handles => [qw{schema_version}],
 );
 
 has upgrade_directory => (
-   isa      => 'Str',
-   is       => 'ro',
-   required => 1,
-   default  => 'sql',
+  isa      => 'Str',
+  is       => 'ro',
+  required => 1,
+  default  => 'sql',
 );
 
 has backup_directory => (
-   isa => 'Str',
-   is  => 'ro',
+  isa => 'Str',
+  is  => 'ro',
 );
 
 has storage => (
-   isa        => 'DBIx::Class::Storage',
-   is         => 'ro',
-   lazy_build => 1,
+  isa        => 'DBIx::Class::Storage',
+  is         => 'ro',
+  lazy_build => 1,
 );
 
 method _build_storage {
-   my $s = $self->schema->storage;
-   $s->_determine_driver;
-   $s
+  my $s = $self->schema->storage;
+  $s->_determine_driver;
+  $s
 }
 
 has _filedata => (
-   isa => 'Str',
-   is  => 'rw',
+  isa => 'Str',
+  is  => 'rw',
 );
 
 has do_backup => (
-   isa     => 'Bool',
-   is      => 'ro',
-   default => undef,
+  isa     => 'Bool',
+  is      => 'ro',
+  default => undef,
 );
 
 has do_diff_on_init => (
-   isa     => 'Bool',
-   is      => 'ro',
-   default => undef,
+  isa     => 'Bool',
+  is      => 'ro',
+  default => undef,
 );
 
 has version_rs => (
-   isa        => 'DBIx::Class::ResultSet',
-   is         => 'ro',
-   lazy_build => 1,
-   handles    => [qw( is_installed db_version )],
+  isa        => 'DBIx::Class::ResultSet',
+  is         => 'ro',
+  lazy_build => 1,
+  handles    => [qw( is_installed db_version )],
 );
 
 method _build_version_rs { $self->schema->resultset('VersionResult') }
@@ -76,9 +76,9 @@ method install($new_version) {
     $self->schema->deploy;
 
     $self->version_rs->create({
-       version     => $new_version,
-       # ddl         => $ddl,
-       # upgrade_sql => $upgrade_sql,
+      version     => $new_version,
+      # ddl         => $ddl,
+      # upgrade_sql => $upgrade_sql,
     });
   }
 }
@@ -92,13 +92,15 @@ method upgrade {
   my $schema_version = $self->schema_version;
 
   unless ($db_version) {
-      carp 'Upgrade not possible as database is unversioned. Please call install first.';
-      return;
+    # croak?
+    carp 'Upgrade not possible as database is unversioned. Please call install first.';
+    return;
   }
 
   if ( $db_version eq $schema_version ) {
-      carp "Upgrade not necessary\n";
-      return;
+    # croak?
+    carp "Upgrade not necessary\n";
+    return;
   }
 
   my @version_list = $self->ordered_schema_versions ||
@@ -106,12 +108,12 @@ method upgrade {
 
   # remove all versions in list above the required version
   while ( @version_list && ( $version_list[-1] ne $schema_version ) ) {
-      pop @version_list;
+    pop @version_list;
   }
 
   # remove all versions in list below the current version
   while ( @version_list && ( $version_list[0] ne $db_version ) ) {
-      shift @version_list;
+    shift @version_list;
   }
 
   # check we have an appropriate list of versions
@@ -119,23 +121,18 @@ method upgrade {
 
   # do sets of upgrade
   while ( @version_list >= 2 ) {
-      $self->upgrade_single_step( $version_list[0], $version_list[1] );
-      shift @version_list;
+    $self->upgrade_single_step( $version_list[0], $version_list[1] );
+    shift @version_list;
   }
 }
 
 method upgrade_single_step($db_version, $target_version) {
   if ($db_version eq $target_version) {
+    # croak?
     carp "Upgrade not necessary\n";
     return;
   }
 
-  # strangely the first time this is called can
-  # differ to subsequent times. so we call it
-  # here to be sure.
-  # XXX - just fix it
-  $self->storage->sqlt_type;
-
   my $upgrade_file = $self->ddl_filename(
     $self->storage->sqlt_type,
     $target_version,
@@ -146,22 +143,21 @@ method upgrade_single_step($db_version, $target_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";
 
-  # backup if necessary then apply upgrade
-  $self->_filedata($self->_read_sql_file($upgrade_file));
+  $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 });
 
-  # set row in dbix_class_schema_versions table
   $self->version_rs->create({
-     version     => $target_version,
-     # ddl         => $ddl,
-     # upgrade_sql => $upgrade_sql,
+    version     => $target_version,
+    # ddl         => $ddl,
+    # upgrade_sql => $upgrade_sql,
   });
 }
 
@@ -179,6 +175,7 @@ method run_upgrade($stm) {
 }
 
 method apply_statement($statement) {
+  # croak?
   $self->storage->dbh->do($_) or carp "SQL was: $_"
 }
 
@@ -191,6 +188,7 @@ sub _create_db_to_schema_diff {
 
   my $db = $driver_to_db_map{$self->storage->dbh->{Driver}{Name}};
   unless ($db) {
+    # croak?
     print "Sorry, this is an unsupported DB\n";
     return;
   }
@@ -263,3 +261,7 @@ method _read_sql_file($file) {
 }
 
 1;
+
+__END__
+
+vim: ts=2,sw=2,expandtab