Correctly set the version deployed to the version requested on install

diff --git a/Changes b/Changes
index bf65c2b..01fd586 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,6 +1,8 @@
 Revision history for {{$dist->name}}
 
 {{$NEXT}}
+       - Correctly set the version deployed to the version requested on install
+         instead of just the current schema version
 
 0.002113  2012-05-05 23:09:33 America/Chicago
        - Remove isa check on schema attributes so that you may pass the schema

diff --git a/lib/DBIx/Class/DeploymentHandler/Dad.pm b/lib/DBIx/Class/DeploymentHandler/Dad.pm
index d9e4b27..f06336f 100644 (file)
--- a/lib/DBIx/Class/DeploymentHandler/Dad.pm
+++ b/lib/DBIx/Class/DeploymentHandler/Dad.pm
@@ -51,7 +51,7 @@ sub install {
      my $ddl = $self->deploy({ version=> $version });
 
      $self->add_database_version({
-       version     => $self->to_version,
+       version     => $version,
        ddl         => $ddl,
      });
   });

diff --git a/t/02-instantiation-wo-component.t b/t/02-instantiation-wo-component.t
index b5fee69..0eabb14 100644 (file)
--- a/t/02-instantiation-wo-component.t
+++ b/t/02-instantiation-wo-component.t
@@ -55,6 +55,20 @@ VERSION2: {
   use_ok 'DBICVersion_v2';
   my $s = DBICVersion::Schema->connect(@connection);
   $DBICVersion::Schema::VERSION = 2;
+  subtest 'bug deploying first version' => sub {
+    my $dbh = DBICDHTest::dbh();
+    my @connection = (sub { $dbh }, { ignore_version => 1 });
+    my $s = DBICVersion::Schema->connect(@connection);
+
+    my $handler = DH->new({
+      script_directory => $sql_dir,
+      schema => $s,
+      databases => 'SQLite',
+    });
+    $handler->install({ version => 1 });
+    is($handler->database_version, 1, 'correctly set version to 1');
+  };
+
   ok($s, 'DBICVersion::Schema 2 instantiates correctly');
   my $handler = DH->new({
     script_directory => $sql_dir,