database_events as an array, not arrayref

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

diff --git a/lib/SQL/Translator.pm b/lib/SQL/Translator.pm
index 711bca4..55b555d 100644 (file)
--- a/lib/SQL/Translator.pm
+++ b/lib/SQL/Translator.pm
@@ -1,7 +1,7 @@
 use MooseX::Declare;
 class SQL::Translator {
     use TryCatch;
-    use MooseX::Types::Moose qw(Bool HashRef Str);
+    use MooseX::Types::Moose qw(Bool HashRef Int Str Undef);
     use SQL::Translator::Types qw(DBIHandle Parser Producer Schema);
     use SQL::Translator::Object::Schema;
 
@@ -40,17 +40,20 @@ class SQL::Translator {
     has 'schema' => (
         isa => Schema,
         is => 'rw',
-        default => sub { SQL::Translator::Object::Schema->new }
+        lazy => 1,
+        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 'add_drop_table' => (isa => Bool, is => 'rw', default => 0);
@@ -96,19 +99,62 @@ class SQL::Translator {
     }
 
     method translate(:$data, :$producer?, :$producer_args?, :$parser?, :$parser_args?) {
-        if ($parser) {
+        my $return;
+
+        $parser ||= $self->parser;
+        if (defined $parser) {
             $self->_clear_parser;
             $self->parser($parser);
             $self->parse($data);
-            $self->schema;
-        } elsif ($producer) {
+            $return = $self->schema;
+        }
+
+        $producer ||= $self->producer;
+        if (defined $producer) {
             $self->_clear_producer;
-            $self->schema($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'";
+        }
+    }
 }