X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=dbsrgits%2FDBIx-Class-DeploymentHandler.git;a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FDeploymentHandler%2FDeployMethod%2FSQL%2FTranslator.pm;h=92e4102ca9043eea824613bd08bf94e2e4728910;hp=7bcc1f897b5de61383ae310814badd59509883f2;hb=284cda869f0db54bac1891cfb52187bccf97d36f;hpb=76d311e71dd647d82d18271d12e86baf11f5e525 diff --git a/lib/DBIx/Class/DeploymentHandler/DeployMethod/SQL/Translator.pm b/lib/DBIx/Class/DeploymentHandler/DeployMethod/SQL/Translator.pm index 7bcc1f8..92e4102 100644 --- a/lib/DBIx/Class/DeploymentHandler/DeployMethod/SQL/Translator.pm +++ b/lib/DBIx/Class/DeploymentHandler/DeployMethod/SQL/Translator.pm @@ -168,32 +168,12 @@ method _deployment_statements { data => $schema, ); -#< frew> now note that deploy in the same file calls deployment_statements -#< ribasushi> right -#< frew> ALWAYS in array context -#< ribasushi> right, that's the only way -#< ribasushi> but create_ddl_dir -#< ribasushi> calls in scalar -#< ribasushi> because this is how you get stuff writable to a file -#< ribasushi> in list you get individual statements for dbh->do -#< frew> right -#< frew> ok... -#< frew> so for *me* I need it *always* in scalar -#< frew> because I *only* use it to generate the file -#< ribasushi> correct - my @ret; - my $wa = wantarray; - if ($wa) { - @ret = $tr->translate; - } - else { - $ret[0] = $tr->translate; - } + my $ret = $tr->translate; $schema->throw_exception( 'Unable to produce deployment statements: ' . $tr->error) - unless (@ret && defined $ret[0]); + unless defined $ret; - return $wa ? @ret : $ret[0]; + return $ret; } sub _deploy {