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 21026db..833c91c 100644 (file)
--- a/lib/SQL/Translator.pm
+++ b/lib/SQL/Translator.pm
@@ -1,6 +1,6 @@
 use MooseX::Declare;
 class SQL::Translator {
-    use TryCatch;
+    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);
@@ -62,11 +62,16 @@ class SQL::Translator {
         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);
@@ -78,6 +83,11 @@ class SQL::Translator {
         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';
     
@@ -112,6 +122,7 @@ class SQL::Translator {
         my $return;
 
         $self->_clear_schema if defined $parser;
+        $data ||= $self->data;
 
         $parser ||= $self->parser unless $self->has_parser;
         if (defined $parser) {