X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FSQL%2FTranslator.pm;h=96a8d5dd9e78919d0d35dfa7beaec0f743a9534d;hb=841a3f1a241cff7e2f9fbc1bdc1e84aaa0f10909;hp=531a8fa88848cdd02b13cd1bac472c4204e485de;hpb=05a56b57a95b57344d07991f6137fd7fa5d951db;p=dbsrgits%2FSQL-Translator.git diff --git a/lib/SQL/Translator.pm b/lib/SQL/Translator.pm index 531a8fa..96a8d5d 100644 --- a/lib/SQL/Translator.pm +++ b/lib/SQL/Translator.pm @@ -1,7 +1,7 @@ package SQL::Translator; # ---------------------------------------------------------------------- -# $Id: Translator.pm,v 1.33 2003-06-19 20:44:26 dlc Exp $ +# $Id: Translator.pm,v 1.42 2003-08-21 18:12:56 kycl4rk Exp $ # ---------------------------------------------------------------------- # Copyright (C) 2003 Ken Y. Clark , # darren chamberlain , @@ -26,13 +26,17 @@ use strict; use vars qw( $VERSION $REVISION $DEFAULT_SUB $DEBUG $ERROR ); use base 'Class::Base'; +require 5.004; + $VERSION = '0.02'; -$REVISION = sprintf "%d.%02d", q$Revision: 1.33 $ =~ /(\d+)\.(\d+)/; +$REVISION = sprintf "%d.%02d", q$Revision: 1.42 $ =~ /(\d+)\.(\d+)/; $DEBUG = 0 unless defined $DEBUG; $ERROR = ""; use Carp qw(carp); +use Data::Dumper; +use Class::Base; use File::Spec::Functions qw(catfile); use File::Basename qw(dirname); use IO::Dir; @@ -60,7 +64,6 @@ $DEFAULT_SUB = sub { $_[0]->schema } unless defined $DEFAULT_SUB; # ---------------------------------------------------------------------- sub init { my ( $self, $config ) = @_; - # # Set the parser and producer. # @@ -193,6 +196,7 @@ sub producer { # passed a string containing no "::"; relative package name else { + $producer =~ s/-/::/g; my $Pp = sprintf "SQL::Translator::Producer::$producer"; load($Pp) or die "Can't load $Pp: $@"; $self->{'producer'} = \&{ "$Pp\::produce" }; @@ -285,6 +289,7 @@ sub parser { # passed a string containing no "::"; relative package name else { + $parser =~ s/-/::/g; my $Pp = "SQL::Translator::Parser::$parser"; load( $Pp ) or die "Can't load $Pp: $@"; $self->{'parser'} = \&{ "$Pp\::parse" }; @@ -404,6 +409,17 @@ sub data { } # ---------------------------------------------------------------------- +sub reset { +# +# Deletes the existing Schema object so that future calls to translate +# don't append to the existing. +# + my $self = shift; + $self->{'schema'} = undef; + return 1; +} + +# ---------------------------------------------------------------------- sub schema { # # Returns the SQL::Translator::Schema object @@ -540,14 +556,18 @@ sub translate { # the future, each of these might happen in a Safe environment, # depending on how paranoid we want to be. # ---------------------------------------------------------------- - eval { $parser_output = $parser->($self, $$data) }; - if ($@ || ! $parser_output) { - my $msg = sprintf "translate: Error with parser '%s': %s", - $parser_type, ($@) ? $@ : " no results"; - return $self->error($msg); + unless ( defined $self->{'schema'} ) { + eval { $parser_output = $parser->($self, $$data) }; + if ($@ || ! $parser_output) { + my $msg = sprintf "translate: Error with parser '%s': %s", + $parser_type, ($@) ? $@ : " no results"; + return $self->error($msg); + } } - if ( $self->validate ) { + $self->debug("Schema =\n", Dumper($self->schema), "\n"); + + if ($self->validate) { my $schema = $self->schema; return $self->error('Invalid schema') unless $schema->is_valid; } @@ -644,7 +664,7 @@ sub _list { my $path = catfile "SQL", "Translator", $uctype; for (@INC) { my $dir = catfile $_, $path; - $self->debug("_list_${type}s searching $dir"); + $self->debug("_list_${type}s searching $dir\n"); next unless -d $dir; my $dh = IO::Dir->new($dir); @@ -677,42 +697,43 @@ sub load { # ---------------------------------------------------------------------- sub format_table_name { - my $self = shift; - my $sub = shift; - $self->{'_format_table_name'} = $sub if ref $sub eq 'CODE'; - return $self->{'_format_table_name'}->( $sub, @_ ) - if defined $self->{'_format_table_name'}; - return $sub; + return shift->_format_name('_format_table_name', @_); } # ---------------------------------------------------------------------- sub format_package_name { - my $self = shift; - my $sub = shift; - $self->{'_format_package_name'} = $sub if ref $sub eq 'CODE'; - return $self->{'_format_package_name'}->( $sub, @_ ) - if defined $self->{'_format_package_name'}; - return $sub; + return shift->_format_name('_format_package_name', @_); } # ---------------------------------------------------------------------- sub format_fk_name { - my $self = shift; - my $sub = shift; - $self->{'_format_fk_name'} = $sub if ref $sub eq 'CODE'; - return $self->{'_format_fk_name'}->( $sub, @_ ) - if defined $self->{'_format_fk_name'}; - return $sub; + return shift->_format_name('_format_fk_name', @_); } # ---------------------------------------------------------------------- sub format_pk_name { + return shift->_format_name('_format_pk_name', @_); +} + +# ---------------------------------------------------------------------- +# The other format_*_name methods rely on this one. It optionally +# accepts a subroutine ref as the first argument (or uses an identity +# sub if one isn't provided or it doesn't already exist), and applies +# it to the rest of the arguments (if any). +# ---------------------------------------------------------------------- +sub _format_name { my $self = shift; - my $sub = shift; - $self->{'_format_pk_name'} = $sub if ref $sub eq 'CODE'; - return $self->{'_format_pk_name'}->( $sub, @_ ) - if defined $self->{'_format_pk_name'}; - return $sub; + my $field = shift; + my @args = @_; + + if (ref($args[0]) eq 'CODE') { + $self->{$field} = shift @args; + } + elsif (! exists $self->{$field}) { + $self->{$field} = sub { return shift }; + } + + return @args ? $self->{$field}->(@args) : $self->{$field}; } # ---------------------------------------------------------------------- @@ -1053,13 +1074,46 @@ producing. =head1 AUTHORS -Ken Y. Clark, Ekclark@cpan.orgE, -darren chamberlain Edarren@cpan.orgE, -Chris Mungall Ecjm@fruitfly.orgE, -Allen Day Eallenday@users.sourceforge.netE, -Sam Angiuoli Eangiuoli@users.sourceforge.netE, -Ying Zhang Ezyolive@yahoo.comE, -Mike Mellilo . +The following people have contributed to the SQLFairy project: + +=over 4 + +=item * Mark Addison + +=item * Sam Angiuoli + +=item * Darren Chamberlain + +=item * Ken Y. Clark + +=item * Allen Day + +=item * Paul Harrington + +=item * Mikey Melillo + +=item * Chris Mungall + +=item * Ross Smith II + +=item * Gudmundur A. Thorisson + +=item * Chris To + +=item * Jason Williams + +=item * Ying Zhang + +=back + +If you would like to contribute to the project, you can send patches +to the developers mailing list: + + sqlfairy-developers@lists.sourceforge.net + +Or send us a message (with your Sourceforge username) asking to be +added to the project and what you'd like to contribute. + =head1 COPYRIGHT @@ -1079,7 +1133,12 @@ USA =head1 BUGS -Please use http://rt.cpan.org/ for reporting bugs. +Please use L for reporting bugs. + +=head1 PRAISE + +If you find this module useful, please use +L to rate it. =head1 SEE ALSO @@ -1090,5 +1149,5 @@ L, L, L, L, -L +L, L.