X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FSQL%2FTranslator%2FSchema.pm;h=efa5bda02f8f588bc18849f3a1f1ce5bd3a52643;hb=a0e61cf67588b6d2f2c5bd002cc905bc4d9f1ef0;hp=81e1afdcf29dd5dd599a91cb5b7d5db35865bda5;hpb=111ead32441254433fc358d8e49b514879b23350;p=dbsrgits%2FSQL-Translator.git diff --git a/lib/SQL/Translator/Schema.pm b/lib/SQL/Translator/Schema.pm index 81e1afd..efa5bda 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; @@ -160,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}; @@ -252,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}; @@ -335,7 +335,7 @@ trigger name or an C 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}; @@ -416,7 +416,7 @@ name or an C 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}; @@ -499,7 +499,7 @@ Returns all the procedures as an array or array reference. } else { $self->error('No procedures'); - return wantarray ? () : undef; + return; } } @@ -553,7 +553,7 @@ Returns all the tables as an array or array reference. } else { $self->error('No tables'); - return wantarray ? () : undef; + return; } } @@ -571,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}; } @@ -599,7 +599,7 @@ Returns all the triggers as an array or array reference. } else { $self->error('No triggers'); - return wantarray ? () : undef; + return; } } @@ -645,7 +645,7 @@ Returns all the views as an array or array reference. } else { $self->error('No views'); - return wantarray ? () : undef; + return; } } @@ -655,14 +655,14 @@ sub make_natural_joins { =head2 make_natural_joins -Creates foriegn key relationships among like-named fields in different +Creates foreign key relationships among like-named fields in different tables. Accepts the following arguments: =over 4 =item * join_pk_only -A True or False argument which determins whether or not to perform +A True or False argument which determines whether or not to perform the joins from primary keys to fields of the same name in other tables =item * skip_fields