[Jifty-commit] r1368 - in jifty/trunk: lib/Jifty/Script

[jifty-commit at lists.jifty.org]

Author: alexmv
Date: Mon Jun 26 14:34:03 2006
New Revision: 1368

Modified:
   jifty/trunk/   (props changed)
   jifty/trunk/lib/Jifty/Script/Schema.pm

Log:
 r14396 at zoq-fot-pik:  chmrr | 2006-06-26 14:33:30 -0400
  * Don't update versions if loading ::Upgrade failed


Modified: jifty/trunk/lib/Jifty/Script/Schema.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Script/Schema.pm	(original)
+++ jifty/trunk/lib/Jifty/Script/Schema.pm	Mon Jun 26 14:34:03 2006
@@ -266,7 +266,7 @@
 
     my $appv = version->new( $Jifty::VERSION );
 
-    $self->upgrade_tables( "Jifty" => $dbv, $appv, "Jifty::Upgrade::Internal" );
+    return unless $self->upgrade_tables( "Jifty" => $dbv, $appv, "Jifty::Upgrade::Internal" );
     Jifty::Model::Metadata->store( jifty_db_version => $appv );
 }
 
@@ -282,7 +282,7 @@
     my $appv
         = version->new( Jifty->config->framework('Database')->{'Version'} );
 
-    $self->upgrade_tables( $self->{_application_class} => $dbv, $appv );
+    return unless $self->upgrade_tables( $self->{_application_class} => $dbv, $appv );
     Jifty::Model::Metadata->store( application_db_version => $appv );
 }
 
@@ -315,9 +315,9 @@
     );
 
     # Figure out what versions the upgrade knows about.
+    Jifty::Util->require($upgradeclass) or return;
     my %UPGRADES;
     eval {
-        Jifty::Util->require($upgradeclass);
         $UPGRADES{$_} = [ $upgradeclass->upgrade_to($_) ]
             for grep { $appv >= version->new($_) and $dbv < version->new($_) }
             $upgradeclass->versions();
@@ -418,6 +418,7 @@
         $log->info("Upgraded to version $appv");
         Jifty->handle->commit;
     }
+    return 1;
 }