general cleanup and regex fixes so that COMMITs actually get filtered out

[dbsrgits/DBIx-Class-DeploymentHandler.git] / lib / DBIx / Class / DeploymentHandler / WithDatabaseToSchemaVersions.pm

diff --git a/lib/DBIx/Class/DeploymentHandler/WithDatabaseToSchemaVersions.pm b/lib/DBIx/Class/DeploymentHandler/WithDatabaseToSchemaVersions.pm
index 9cdba4c..9d307bc 100644 (file)
--- a/lib/DBIx/Class/DeploymentHandler/WithDatabaseToSchemaVersions.pm
+++ b/lib/DBIx/Class/DeploymentHandler/WithDatabaseToSchemaVersions.pm
@@ -1,29 +1,27 @@
 package DBIx::Class::DeploymentHandler::WithDatabaseToSchemaVersions;
 use Moose::Role;
 
-use DBIx::Class::DeploymentHandler::DatabaseToSchemaVersions;
+use DBIx::Class::DeploymentHandler::VersionHandler::DatabaseToSchemaVersions;
 
 use Carp 'carp';
 
 has version_handler => (
-
-# < mst> isa => 'DBIx::Class::DeploymentHandler::SqltDeployMethod',
-# < mst> should be
-# < mst> does => <some role>
-# < mst> and that role should supply those methods
-# < mst> then you can pass handles => <some role> as well
-
-  isa => 'DBIx::Class::DeploymentHandler::DatabaseToSchemaVersions',
-  is  => 'ro',
+  is         => 'ro',
   lazy_build => 1,
-  handles => [qw{ ordered_schema_versions }],
+  does       => 'DBIx::Class::DeploymentHandler::HandlesVersioning',
+  handles    => 'DBIx::Class::DeploymentHandler::HandlesVersioning',
 );
 
 sub _build_version_handler {
   my $self = shift;
-  DBIx::Class::DeploymentHandler::DatabaseToSchemaVersions->new({
-    schema => $self->schema,
-  });
+
+  my $args = {
+    schema          => $self->schema,
+    version_storage => $self->version_storage,
+  };
+
+  $args->{to_version} = $self->to_version if $self->has_to_version;
+  DBIx::Class::DeploymentHandler::VersionHandler::DatabaseToSchemaVersions->new($args);
 }
 
 1;