use Try::Tiny instead of TryCatch

[dbsrgits/SQL-Translator-2.0-ish.git] / lib / SQL / Translator.pm

diff --git a/lib/SQL/Translator.pm b/lib/SQL/Translator.pm
index 72541f9..833c91c 100644 (file)
--- a/lib/SQL/Translator.pm
+++ b/lib/SQL/Translator.pm
@@ -1,20 +1,24 @@
 use MooseX::Declare;
 class SQL::Translator {
-    use TryCatch;
-    use MooseX::Types::Moose qw(Bool HashRef Str);
+    use Try::Tiny;
+    use MooseX::Types::Moose qw(Bool HashRef Int Str Undef);
+    use MooseX::Aliases;
     use SQL::Translator::Types qw(DBIHandle Parser Producer Schema);
     use SQL::Translator::Object::Schema;
 
+    our $VERSION = '0.001';
+    $VERSION = eval $VERSION;
+
     has 'parser' => (
         isa => Str,
         is => 'rw',
-        init_arg => 'from',
+        alias => 'from',
     );
     
     has 'producer' => (
         isa => Str,
         is => 'rw',
-        init_arg => 'to',
+        alias => 'to',
     );
     
     has '_parser' => (
@@ -22,6 +26,7 @@ class SQL::Translator {
         is => 'rw',
         lazy_build => 1,
         handles => [ qw(parse) ],
+        predicate => 'has_parser',
     );
     
     has '_producer' => (
@@ -29,6 +34,7 @@ class SQL::Translator {
         is => 'rw',
         lazy_build => 1,
         handles => [ qw(produce) ],
+        predicate => 'has_producer',
     );
     
     has 'dbh' => (
@@ -41,28 +47,47 @@ class SQL::Translator {
         isa => Schema,
         is => 'rw',
         lazy => 1,
+        clearer => '_clear_schema',
         default => sub { SQL::Translator::Object::Schema->new },
     );
 
     has 'parser_args' => (
         isa => HashRef,
         is => 'rw',
+        predicate => 'has_parser_args',
     );
 
     has 'producer_args' => (
         isa => HashRef,
         is => 'rw',
+        predicate => 'has_producer_args',
+    );
+
+    has 'data' => (
+        isa => Str,
+        is => 'rw',
     );
     
+    has 'version' => (isa => Str, is => 'ro', default => $VERSION);
     has 'add_drop_table' => (isa => Bool, is => 'rw', default => 0);
     has 'no_comments' => (isa => Bool, is => 'rw', default => 0);
-    has 'show_warnings' => (isa => Bool, is => 'rw', default => 1);
+    has 'show_warnings' => (isa => Bool, is => 'rw', default => 0);
     has 'trace' => (isa => Bool, is => 'rw', default => 0);
     has 'quote_table_names' => (isa => Bool, is => 'rw', default => 0);
     has 'quote_field_names' => (isa => Bool, is => 'rw', default => 0);
-    has 'version' => (isa => Str, is => 'rw');
     has 'filename' => (isa => Str, is => 'rw');
 
+    has '_producer_mapping' => (
+        isa => HashRef,
+        is => 'ro',
+        default => sub { { MySQL => 'SQL::MySQL', SQLite => 'SQL::SQLite', PostgreSQL => 'SQL::PostgreSQL', XML => 'XML', YAML => 'YAML' } }
+    );
+
+    has 'error' => (
+        is => 'rw',
+        isa => Str,
+    );
+
     method _build__parser {
         my $class = 'SQL::Translator::Parser';
     
@@ -79,16 +104,13 @@ class SQL::Translator {
     }
     
     method _build__producer {
+        my $mapping = $self->_producer_mapping;
+
         my $class = 'SQL::Translator::Producer';
-        my $role = $class . '::' . $self->producer;
+        my $role = $class . '::' . $mapping->{$self->producer};
 
         Class::MOP::load_class($class);
-        try {
-            Class::MOP::load_class($role)
-        } catch ($e) {
-            $role = $class . '::SQL::' . $self->producer;
-            Class::MOP::load_class($role)
-        }
+        Class::MOP::load_class($role);
     
         my $producer = $class->new({ translator => $self });
         $role->meta->apply($producer);
@@ -97,19 +119,65 @@ class SQL::Translator {
     }
 
     method translate(:$data, :$producer?, :$producer_args?, :$parser?, :$parser_args?) {
-        if ($parser) {
+        my $return;
+
+        $self->_clear_schema if defined $parser;
+        $data ||= $self->data;
+
+        $parser ||= $self->parser unless $self->has_parser;
+        if (defined $parser) {
             $self->_clear_parser;
             $self->parser($parser);
             $self->parse($data);
-            $self->schema;
-        } elsif ($producer) {
+            $return = $self->schema;
+        }
+
+        $producer ||= $self->producer unless $self->has_producer;
+        if (defined $producer) {
             $self->_clear_producer;
-            $self->parse($data) if $data;
             $self->producer($producer);
-            $self->produce;
+            $return = $self->produce;
         }
+
+        return $return;
     }
 
     method parser_type { return $self->parser }
     method producer_type { return $self->producer }
+
+    method engine_version(Int|Str|Undef $v, Str $target = 'perl') {
+        return undef unless $v;
+
+        my @vers;
+
+        # X.Y.Z style 
+        if ( $v =~ / ^ (\d+) \. (\d{1,3}) (?: \. (\d{1,3}) )? $ /x ) {
+            push @vers, $1, $2, $3;
+        }
+
+        # XYYZZ (mysql) style 
+        elsif ( $v =~ / ^ (\d) (\d{2}) (\d{2}) $ /x ) {
+            push @vers, $1, $2, $3;
+        }
+
+        # XX.YYYZZZ (perl) style or simply X 
+        elsif ( $v =~ / ^ (\d+) (?: \. (\d{3}) (\d{3}) )? $ /x ) {
+            push @vers, $1, $2, $3;
+        }
+        else {
+            #how do I croak sanely here?
+            die "Unparseable MySQL version '$v'";
+        }
+
+        if ($target eq 'perl') {
+            return sprintf ('%d.%03d%03d', map { $_ || 0 } (@vers) );
+        }
+        elsif ($target eq 'mysql') {
+            return sprintf ('%d%02d%02d', map { $_ || 0 } (@vers) );
+        }
+        else {
+            #how do I croak sanely here?
+            die "Unknown version target '$target'";
+        }
+    }
 }