more interface cleanup, dont use optional deps while this is not in core

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

diff --git a/lib/DBIx/Class/DeploymentHandler.pm b/lib/DBIx/Class/DeploymentHandler.pm
index b1c525e..ffc4441 100644 (file)
--- a/lib/DBIx/Class/DeploymentHandler.pm
+++ b/lib/DBIx/Class/DeploymentHandler.pm
@@ -6,6 +6,7 @@ require DBIx::Class::Schema;    # loaded for type constraint
 require DBIx::Class::Storage;   # loaded for type constraint
 require DBIx::Class::ResultSet; # loaded for type constraint
 use Carp::Clan '^DBIx::Class::DeploymentHandler';
+use SQL::Translator;
 
 has schema => (
   isa      => 'DBIx::Class::Schema',
@@ -62,6 +63,19 @@ has version_rs => (
   handles    => [qw( is_installed db_version )],
 );
 
+has databases => (
+  # make this coerce from Str
+  isa => 'ArrayRef[Str]',
+  is  => 'ro',
+  default => sub { [qw( MySQL SQLite PostgreSQL )] },
+);
+
+has sqltargs => (
+  isa => 'HashRef',
+  is  => 'ro',
+  default => sub { {} },
+);
+
 method _build_version_rs {
    $self->schema->set_us_up_the_bomb;
    $self->schema->resultset('__VERSION')
@@ -164,14 +178,15 @@ method upgrade_single_step($db_version, $target_version) {
   });
 }
 
-method create_ddl_dir($databases, $version, $dir, $preversion, $sqltargs) {
-  my $schema = $self->schema;
-  if(!$dir || !-d $dir) {
-    carp "No directory given, using ./\n";
+method create_ddl_dir($version, $preversion) {
+  my $schema    = $self->schema;
+  my $databases = $self->databases;
+  my $dir       = $self->upgrade_directory;
+  my $sqltargs  = $self->sqltargs;
+  unless( -d $dir ) {
+    carp "Upgrade directory $dir does not exist, using ./\n";
     $dir = "./";
   }
-  $databases ||= ['MySQL', 'SQLite', 'PostgreSQL'];
-  $databases = [ $databases ] if(ref($databases) ne 'ARRAY');
 
   my $schema_version = $schema->schema_version || '1.x';
   $version ||= $schema_version;
@@ -183,10 +198,6 @@ method create_ddl_dir($databases, $version, $dir, $preversion, $sqltargs) {
     %{$sqltargs || {}}
   };
 
-  unless (DBIx::Class::Optional::Dependencies->req_ok_for ('deploy')) {
-    $self->throw_exception("Can't create a ddl file without " . DBIx::Class::Optional::Dependencies->req_missing_for ('deploy') );
-  }
-
   my $sqlt = SQL::Translator->new( $sqltargs );
 
   $sqlt->parser('SQL::Translator::Parser::DBIx::Class');