X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FSQL%2FTranslator.pm;h=c1d1afc899983d0b5ed2869937fe4ddf251ce6b4;hb=b11c7cf75750389d0e22c9b70563b11dc45ba955;hp=a50fa5f017173d4bc5bda8f8ff59236a07fe8008;hpb=af05a25f8b28362e6952551e60c92642962cbd75;p=dbsrgits%2FSQL-Translator.git diff --git a/lib/SQL/Translator.pm b/lib/SQL/Translator.pm index a50fa5f..c1d1afc 100644 --- a/lib/SQL/Translator.pm +++ b/lib/SQL/Translator.pm @@ -1,7 +1,7 @@ package SQL::Translator; # ---------------------------------------------------------------------- -# $Id: Translator.pm,v 1.41 2003-08-20 22:19:14 kycl4rk Exp $ +# $Id: Translator.pm,v 1.46 2003-10-03 20:17:48 dlc Exp $ # ---------------------------------------------------------------------- # Copyright (C) 2003 Ken Y. Clark , # darren chamberlain , @@ -28,14 +28,16 @@ use base 'Class::Base'; require 5.004; -$VERSION = '0.02'; -$REVISION = sprintf "%d.%02d", q$Revision: 1.41 $ =~ /(\d+)\.(\d+)/; +$VERSION = '0.03'; +$REVISION = sprintf "%d.%02d", q$Revision: 1.46 $ =~ /(\d+)\.(\d+)/; $DEBUG = 0 unless defined $DEBUG; $ERROR = ""; use Carp qw(carp); +use Data::Dumper; use Class::Base; +use File::Find; use File::Spec::Functions qw(catfile); use File::Basename qw(dirname); use IO::Dir; @@ -73,13 +75,13 @@ sub init { $self->parser ($config->{'parser'} || $config->{'from'} || $DEFAULT_SUB); $self->producer($config->{'producer'} || $config->{'to'} || $DEFAULT_SUB); - # - # Set up callbacks for formatting of pk,fk,table,package names in producer - # - $self->format_table_name($config->{'format_table_name'}); - $self->format_package_name($config->{'format_package_name'}); - $self->format_fk_name($config->{'format_fk_name'}); - $self->format_pk_name($config->{'format_pk_name'}); + # + # Set up callbacks for formatting of pk,fk,table,package names in producer + # + $self->format_table_name($config->{'format_table_name'}); + $self->format_package_name($config->{'format_package_name'}); + $self->format_fk_name($config->{'format_fk_name'}); + $self->format_pk_name($config->{'format_pk_name'}); # # Set the parser_args and producer_args @@ -332,9 +334,9 @@ sub filename { if (-d $filename) { my $msg = "Cannot use directory '$filename' as input source"; return $self->error($msg); - } elsif (ref($filename) eq 'ARRAY') { - $self->{'filename'} = $filename; - $self->debug("Got array of files: ".join(', ',@$filename)."\n"); + } elsif (ref($filename) eq 'ARRAY') { + $self->{'filename'} = $filename; + $self->debug("Got array of files: ".join(', ',@$filename)."\n"); } elsif (-f _ && -r _) { $self->{'filename'} = $filename; $self->debug("Got filename: '$self->{'filename'}'\n"); @@ -387,21 +389,21 @@ sub data { local $/; my $data; - my @files = ref($filename) eq 'ARRAY' ? @$filename : ($filename); + my @files = ref($filename) eq 'ARRAY' ? @$filename : ($filename); - foreach my $file (@files) { - unless (open FH, $file) { - return $self->error("Can't read file '$file': $!"); - } + foreach my $file (@files) { + unless (open FH, $file) { + return $self->error("Can't read file '$file': $!"); + } - $data .= ; + $data .= ; - unless (close FH) { - return $self->error("Can't close file '$file': $!"); - } - } + unless (close FH) { + return $self->error("Can't close file '$file': $!"); + } + } - $self->{'data'} = \$data; + $self->{'data'} = \$data; } return $self->{'data'}; @@ -526,9 +528,6 @@ sub translate { # Get the data. # ---------------------------------------------------------------- my $data = $self->data; - unless (ref($data) eq 'SCALAR' and length $$data) { - return $self->error("Empty data file!"); - } # ---------------------------------------------------------------- # Local reference to the parser subroutine @@ -564,6 +563,8 @@ sub translate { } } + $self->debug("Schema =\n", Dumper($self->schema), "\n"); + if ($self->validate) { my $schema = $self->schema; return $self->error('Invalid schema') unless $schema->is_valid; @@ -652,26 +653,57 @@ sub _args { # _list($type) # ---------------------------------------------------------------------- sub _list { - my $self = shift; - my $type = shift || return (); + my $self = shift; + my $type = shift || return (); my $uctype = ucfirst lc $type; - my %found; + # + # First find all the directories where SQL::Translator + # parsers or producers (the "type") appear to live. + # load("SQL::Translator::$uctype") or return (); my $path = catfile "SQL", "Translator", $uctype; + my @dirs; for (@INC) { my $dir = catfile $_, $path; $self->debug("_list_${type}s searching $dir\n"); next unless -d $dir; - - my $dh = IO::Dir->new($dir); - for (grep /\.pm$/, $dh->read) { - s/\.pm$//; - $found{ join "::", "SQL::Translator::$uctype", $_ } = 1; - } + push @dirs, $dir; } - return keys %found; + # + # Now use File::File::find to look recursively in those + # directories for all the *.pm files, then present them + # with the slashes turned into dashes. + # + my %found; + find( + sub { + if ( -f && m/\.pm$/ ) { + my $mod = $_; + $mod =~ s/\.pm$//; + my $cur_dir = $File::Find::dir; + my $base_dir = catfile 'SQL', 'Translator', $uctype; + + # + # See if the current directory is below the base directory. + # + if ( $cur_dir =~ m/$base_dir(.*)/ ) { + $cur_dir = $1; + $cur_dir =~ s!^/!!; # kill leading slash + $cur_dir =~ s!/!-!g; # turn other slashes into dashes + } + else { + $cur_dir = ''; + } + + $found{ join '-', map { $_ || () } $cur_dir, $mod } = 1; + } + }, + @dirs + ); + + return sort { lc $a cmp lc $b } keys %found; } # ---------------------------------------------------------------------- @@ -1071,13 +1103,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 Emmelillo@users.sourceforge.netE. +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 @@ -1097,7 +1162,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 @@ -1108,5 +1178,5 @@ L, L, L, L, -L +L, L.