X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FDeploymentHandler%2FDeployMethod%2FSQL%2FTranslator.pm;h=59b47b6119974c85e21f17e1fb25e605a9c39e8f;hb=a976d6e46695d7015239ee4c30cb3708f4ce7942;hp=7a0d7e93cba61469f875fa7fc297e4c6eb7c53e6;hpb=fe048ee301e219d737307f2b30e3bd88a7128df6;p=dbsrgits%2FDBIx-Class-DeploymentHandler.git

diff --git a/lib/DBIx/Class/DeploymentHandler/DeployMethod/SQL/Translator.pm b/lib/DBIx/Class/DeploymentHandler/DeployMethod/SQL/Translator.pm
index 7a0d7e9..59b47b6 100644
--- a/lib/DBIx/Class/DeploymentHandler/DeployMethod/SQL/Translator.pm
+++ b/lib/DBIx/Class/DeploymentHandler/DeployMethod/SQL/Translator.pm
@@ -1,15 +1,14 @@
 package DBIx::Class::DeploymentHandler::DeployMethod::SQL::Translator;
-use Moose;
+use Moo;
 
 # ABSTRACT: Manage your SQL and Perl migrations in nicely laid out directories
 
+use Sub::Quote 'quote_sub';
+use MooX::Types::MooseLike::Base qw(ArrayRef Bool HashRef Str);
+
 use autodie;
 use Carp qw( carp croak );
-use DBIx::Class::DeploymentHandler::Logger;
-use Log::Contextual qw(:log :dlog), -package_logger =>
-  DBIx::Class::DeploymentHandler::Logger->new({
-    env_prefix => 'DBICDH'
-  });
+use DBIx::Class::DeploymentHandler::LogImporter qw(:log :dlog);
 use Context::Preserve;
 
 use Try::Tiny;
@@ -17,8 +16,7 @@ use Try::Tiny;
 use SQL::Translator;
 require SQL::Translator::Diff;
 
-require DBIx::Class::Storage;   # loaded for type constraint
-use DBIx::Class::DeploymentHandler::Types;
+use DBIx::Class::DeploymentHandler::Types 'Storage';
 
 use File::Path 'mkpath';
 use File::Spec::Functions;
@@ -26,15 +24,13 @@ use File::Spec::Functions;
 with 'DBIx::Class::DeploymentHandler::HandlesDeploy';
 
 has ignore_ddl => (
-  isa      => 'Bool',
+  isa      => Bool,
   is       => 'ro',
-  default  => undef,
 );
 
 has force_overwrite => (
-  isa      => 'Bool',
+  isa      => Bool,
   is       => 'ro',
-  default  => undef,
 );
 
 has schema => (
@@ -43,9 +39,9 @@ has schema => (
 );
 
 has storage => (
-  isa        => 'DBIx::Class::Storage',
+  isa        => Storage,
   is         => 'ro',
-  lazy_build => 1,
+  builder    => '_build_storage',
 );
 
 sub _build_storage {
@@ -56,34 +52,40 @@ sub _build_storage {
 }
 
 has sql_translator_args => (
-  isa => 'HashRef',
+  isa => HashRef,
   is  => 'ro',
-  default => sub { {} },
+  default => quote_sub(q( {} )),
 );
+
 has script_directory => (
-  isa      => 'Str',
+  isa      => Str,
   is       => 'ro',
-  required => 1,
-  default  => 'sql',
+  default  => quote_sub(q{ 'sql' }),
 );
 
 has databases => (
-  coerce  => 1,
-  isa     => 'DBIx::Class::DeploymentHandler::Databases',
   is      => 'ro',
-  default => sub { [qw( MySQL SQLite PostgreSQL )] },
+  #isa     => ArrayRef[Str],
+  #coerce  => quote_sub(q{
+     #if (ref(\$_[0]) eq 'SCALAR') {
+        #return [$_[0]]
+     #} else {
+        #return $_[0]
+     #}
+  #}),
+  default => quote_sub(q{ [qw( MySQL SQLite PostgreSQL )] }),
 );
 
 has txn_wrap => (
   is => 'ro',
-  isa => 'Bool',
-  default => 1,
+  isa => Bool,
+  default => quote_sub(q{ 1 }),
 );
 
 has schema_version => (
   is => 'ro',
-  isa => 'Str',
-  lazy_build => 1,
+  isa => Str,
+  builder => '_build_schema_version',
 );
 
 # this will probably never get called as the DBICDH
@@ -514,7 +516,7 @@ sub _prepare_install {
   my $from_file = shift;
   my $to_file   = shift;
   my $dir       = $self->script_directory;
-  my $databases = $self->databases;
+  my $databases = ref $self->databases ? $self->databases : [$self->databases];
   my $version   = $self->schema_version;
 
   foreach my $db (@$databases) {
@@ -628,7 +630,7 @@ sub _coderefs_per_files {
 sub _prepare_changegrade {
   my ($self, $from_version, $to_version, $version_set, $direction) = @_;
   my $schema    = $self->schema;
-  my $databases = $self->databases;
+  my $databases = ref $self->databases ? $self->databases : [$self->databases];
   my $dir       = $self->script_directory;
 
   my $schema_version = $self->schema_version;