fix to make reasonable defaults work

diff --git a/Changes b/Changes
index 4e14685..8131408 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,6 +1,7 @@
 Revision history for {{$dist->name}}
 
 {{$NEXT}}
+       - Fix the reasonable defaults for downgrading (jnap)
        - Stop warning all the time (ribasushi)
        - croak on a couple errors that should be fatal
        - Stop deleting the wrong version (for downgrades)

diff --git a/lib/DBIx/Class/DeploymentHandler/WithReasonableDefaults.pm b/lib/DBIx/Class/DeploymentHandler/WithReasonableDefaults.pm
index 25afb2b..af38852 100644 (file)
--- a/lib/DBIx/Class/DeploymentHandler/WithReasonableDefaults.pm
+++ b/lib/DBIx/Class/DeploymentHandler/WithReasonableDefaults.pm
@@ -24,8 +24,8 @@ around prepare_downgrade => sub {
 
   my $args = shift || {};
 
-  $args->{from_version} ||= $self->database_version;
-  $args->{to_version}   ||= $self->schema_version;
+  $args->{to_version}   ||= $self->database_version;
+  $args->{from_version} ||= $self->schema_version;
   $args->{version_set}  ||= [$args->{from_version}, $args->{to_version}];
 
   $self->$orig($args);
@@ -65,9 +65,9 @@ Defaulted args:
 
 Defaulted args:
 
-  my $from_version = $self->database_version;
-  my $to_version   = $self->schema_version;
-  my $version_set  = [$to_version];
+  my $from_version = $self->schema_version;
+  my $to_version   = $self->data_version;
+  my $version_set  = [$from_version, $to_version];
 
 =head2 install_resultsource