monotonic (and others) now pass

diff --git a/lib/DBIx/Class/DeploymentHandler/VersionHandler/Monotonic.pm b/lib/DBIx/Class/DeploymentHandler/VersionHandler/Monotonic.pm
index c1fa768..f42bff7 100644 (file)
--- a/lib/DBIx/Class/DeploymentHandler/VersionHandler/Monotonic.pm
+++ b/lib/DBIx/Class/DeploymentHandler/VersionHandler/Monotonic.pm
@@ -48,7 +48,7 @@ sub previous_version_set {
     return undef
   } else {
     $self->_dec_version;
-    return [$self->_version, $self->_version + 1];
+    return [$self->_version + 1, $self->_version];
   }
 }
 

diff --git a/lib/DBIx/Class/DeploymentHandler/WithReasonableDefaults.pm b/lib/DBIx/Class/DeploymentHandler/WithReasonableDefaults.pm
index 2f1c913..e9b85f7 100644 (file)
--- a/lib/DBIx/Class/DeploymentHandler/WithReasonableDefaults.pm
+++ b/lib/DBIx/Class/DeploymentHandler/WithReasonableDefaults.pm
@@ -23,7 +23,7 @@ around prepare_downgrade => sub {
 
   my $from_version = shift || $self->database_version;
   my $to_version   = shift || $self->schema_version;
-  my $version_set  = shift || [$to_version, $from_version];
+  my $version_set  = shift || [$from_version, $to_version];
 
   $self->$orig($from_version, $to_version, $version_set);
 };
@@ -64,7 +64,7 @@ Defaulted args:
 
   my $from_version = $self->database_version;
   my $to_version   = $self->schema_version;
-  my $version_set  = [$from_version, $to_version];
+  my $version_set  = [$to_version];
 
 =head2 install_resultsource
 

diff --git a/t/version_handlers/monotonic.t b/t/version_handlers/monotonic.t
index b12f5aa..7bc0310 100644 (file)
--- a/t/version_handlers/monotonic.t
+++ b/t/version_handlers/monotonic.t
@@ -27,42 +27,42 @@ use aliased
 
 {
   my $vh = Monotonic->new({
-        to_version       => 1,
-        schema_version   => 1,
-        database_version => 1,
+    to_version       => 1,
+    schema_version   => 1,
+    database_version => 1,
   });
 
   ok $vh, 'VersionHandler gets instantiated';
 
   ok(
-        !$vh->next_version_set,
-        'next version set returns undef if we are at the version requested'
+    !$vh->next_version_set,
+    'next version set returns undef if we are at the version requested'
   );
 }
 
 ONETOFIVE: {
   my $vh = Monotonic->new({
-        to_version       => 5,
-        schema_version   => 1,
-        database_version => 1,
+    to_version       => 5,
+    schema_version   => 1,
+    database_version => 1,
   });
 
   ok $vh, 'VersionHandler gets instantiated';
   ok(
-        eq_array($vh->next_version_set, [1,2]),
-        'first version pair works'
+    eq_array($vh->next_version_set, [1,2]),
+    'first version pair works'
   );
   ok(
-        eq_array($vh->next_version_set, [2,3]),
-        'second version pair works'
+    eq_array($vh->next_version_set, [2,3]),
+    'second version pair works'
   );
   ok(
-        eq_array($vh->next_version_set, [3,4]),
-        'third version pair works'
+    eq_array($vh->next_version_set, [3,4]),
+    'third version pair works'
   );
   ok(
-        eq_array($vh->next_version_set, [4,5]),
-        'fourth version pair works'
+    eq_array($vh->next_version_set, [4,5]),
+    'fourth version pair works'
   );
   ok( !$vh->next_version_set, 'no more versions after final pair' );
   ok( !$vh->next_version_set, 'still no more versions after final pair' );
@@ -70,27 +70,27 @@ ONETOFIVE: {
 
 FIVETOONE: {
   my $vh = Monotonic->new({
-        to_version       => 1,
-        schema_version   => 1,
-        database_version => 5,
+    to_version       => 1,
+    schema_version   => 1,
+    database_version => 5,
   });
 
   ok $vh, 'VersionHandler gets instantiated';
   ok(
-        eq_array($vh->previous_version_set, [4,5]),
-        'first version pair works'
+    eq_array($vh->previous_version_set, [5,4]),
+    'first version pair works'
   );
   ok(
-        eq_array($vh->previous_version_set, [3,4]),
-        'second version pair works'
+    eq_array($vh->previous_version_set, [4,3]),
+    'second version pair works'
   );
   ok(
-        eq_array($vh->previous_version_set, [2,3]),
-        'third version pair works'
+    eq_array($vh->previous_version_set, [3,2]),
+    'third version pair works'
   );
   ok(
-        eq_array($vh->previous_version_set, [1,2]),
-        'fourth version pair works'
+    eq_array($vh->previous_version_set, [2,1]),
+    'fourth version pair works'
   );
   ok( !$vh->previous_version_set, 'no more versions before initial pair' );
   ok( !$vh->previous_version_set, 'still no more versions before initial pair' );
@@ -98,26 +98,26 @@ FIVETOONE: {
 
 dies_ok {
   my $vh = Monotonic->new({
-        schema_version   => 2,
-        database_version => '1.1',
+    schema_version   => 2,
+    database_version => '1.1',
   });
   $vh->next_version_set
 } 'dies if database version not an Int';
 
 dies_ok {
   my $vh = Monotonic->new({
-        to_version       => 0,
-        schema_version   => 1,
-        database_version => 1,
+    to_version       => 0,
+    schema_version   => 1,
+    database_version => 1,
   });
   $vh->next_version_set;
 } 'cannot request an upgrade version before the current version';
 
 dies_ok {
   my $vh = Monotonic->new({
-        to_version       => 2,
-        schema_version   => 1,
-        database_version => 1,
+    to_version       => 2,
+    schema_version   => 1,
+    database_version => 1,
   });
   $vh->previous_version_set;
 } 'cannot request a downgrade version after the current version';