X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FSQL%2FTranslator%2FSchema.pm;h=100690457fc8ea12e8c517184f1c67baaa92582b;hb=92638f3246feb6a2ce7f61b68086453755918b62;hp=9c190dccffddf35e39c479970bfc36fb8448635a;hpb=2bdef63659f546187a4d1266e88aa66671b228b7;p=dbsrgits%2FSQL-Translator.git

diff --git a/lib/SQL/Translator/Schema.pm b/lib/SQL/Translator/Schema.pm
index 9c190dc..1006904 100644
--- a/lib/SQL/Translator/Schema.pm
+++ b/lib/SQL/Translator/Schema.pm
@@ -26,7 +26,7 @@ returns the database structure.
 
 =cut
 
-use Moo 1.000003;
+use Moo;
 use SQL::Translator::Schema::Constants;
 use SQL::Translator::Schema::Procedure;
 use SQL::Translator::Schema::Table;
@@ -50,22 +50,6 @@ has _order => (is => 'ro', default => quote_sub(q{ +{ map { $_ => 0 } qw/
   /} }),
 );
 
-# FIXME - to be removed, together with the SQL::Translator::Schema::Graph* stuff
-# looks like a remnant of the Turnkey project integration back in 2003-4
-# Appears to be quite dead
-sub as_graph {
-
-    eval { require Class::MakeMethods }
-      or croak 'You need to install the CPAN dependency Class::MakeMethods to use as_graph()';
-
-    require  SQL::Translator::Schema::Graph;
-
-    my $self = shift;
-
-    return SQL::Translator::Schema::Graph->new(
-        translator => $self->translator );
-}
-
 sub as_graph_pm {
 
 =pod
@@ -176,7 +160,7 @@ can be set to 1 to also drop all triggers on the table, default is 0.
     my $cascade = $args{'cascade'};
 
     if ( !exists $self->_tables->{$table_name} ) {
-        return $self->error(qq[Can't drop table: $table_name" doesn't exist]);
+        return $self->error(qq[Can't drop table: "$table_name" doesn't exist]);
     }
 
     my $table = delete $self->_tables->{$table_name};
@@ -268,7 +252,7 @@ object.
 
     if ( !exists $self->_procedures->{$proc_name} ) {
         return $self->error(
-            qq[Can't drop procedure: $proc_name" doesn't exist]);
+            qq[Can't drop procedure: "$proc_name" doesn't exist]);
     }
 
     my $proc = delete $self->_procedures->{$proc_name};
@@ -351,7 +335,7 @@ trigger name or an C<SQL::Translator::Schema::Trigger> object.
 
     if ( !exists $self->_triggers->{$trigger_name} ) {
         return $self->error(
-            qq[Can't drop trigger: $trigger_name" doesn't exist]);
+            qq[Can't drop trigger: "$trigger_name" doesn't exist]);
     }
 
     my $trigger = delete $self->_triggers->{$trigger_name};
@@ -432,7 +416,7 @@ name or an C<SQL::Translator::Schema::View> object.
     }
 
     if ( !exists $self->_views->{$view_name} ) {
-        return $self->error(qq[Can't drop view: $view_name" doesn't exist]);
+        return $self->error(qq[Can't drop view: "$view_name" doesn't exist]);
     }
 
     my $view = delete $self->_views->{$view_name};
@@ -515,7 +499,7 @@ Returns all the procedures as an array or array reference.
     }
     else {
         $self->error('No procedures');
-        return wantarray ? () : undef;
+        return;
     }
 }
 
@@ -569,7 +553,7 @@ Returns all the tables as an array or array reference.
     }
     else {
         $self->error('No tables');
-        return wantarray ? () : undef;
+        return;
     }
 }
 
@@ -587,7 +571,7 @@ Returns a trigger by the name provided.
 
     my $self = shift;
     my $trigger_name = shift or return $self->error('No trigger name');
-    return $self->error(qq[Table "$trigger_name" does not exist])
+    return $self->error(qq[Trigger "$trigger_name" does not exist])
       unless exists $self->_triggers->{$trigger_name};
     return $self->_triggers->{$trigger_name};
 }
@@ -615,7 +599,7 @@ Returns all the triggers as an array or array reference.
     }
     else {
         $self->error('No triggers');
-        return wantarray ? () : undef;
+        return;
     }
 }
 
@@ -661,7 +645,7 @@ Returns all the views as an array or array reference.
     }
     else {
         $self->error('No views');
-        return wantarray ? () : undef;
+        return;
     }
 }