X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FSQL%2FTranslator.pm;h=c1d1afc899983d0b5ed2869937fe4ddf251ce6b4;hb=b11c7cf75750389d0e22c9b70563b11dc45ba955;hp=809624ab4913cf460de1ad950e4df152b2a10c99;hpb=67e5ff532bf1c529ca7129aa058167bb51ea93f3;p=dbsrgits%2FSQL-Translator.git diff --git a/lib/SQL/Translator.pm b/lib/SQL/Translator.pm index 809624a..c1d1afc 100644 --- a/lib/SQL/Translator.pm +++ b/lib/SQL/Translator.pm @@ -1,7 +1,7 @@ package SQL::Translator; # ---------------------------------------------------------------------- -# $Id: Translator.pm,v 1.31 2003-06-16 20:58:10 kycl4rk Exp $ +# $Id: Translator.pm,v 1.46 2003-10-03 20:17:48 dlc Exp $ # ---------------------------------------------------------------------- # Copyright (C) 2003 Ken Y. Clark , # darren chamberlain , @@ -26,13 +26,18 @@ use strict; use vars qw( $VERSION $REVISION $DEFAULT_SUB $DEBUG $ERROR ); use base 'Class::Base'; -$VERSION = '0.02'; -$REVISION = sprintf "%d.%02d", q$Revision: 1.31 $ =~ /(\d+)\.(\d+)/; +require 5.004; + +$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; @@ -43,7 +48,7 @@ use SQL::Translator::Schema; # SQL::Translator instance is the first value ($_[0]), and the stuff # to be parsed is the second value ($_[1]) # ---------------------------------------------------------------------- -$DEFAULT_SUB = sub { $_[1] } unless defined $DEFAULT_SUB; +$DEFAULT_SUB = sub { $_[0]->schema } unless defined $DEFAULT_SUB; # ---------------------------------------------------------------------- # init([ARGS]) @@ -60,7 +65,6 @@ $DEFAULT_SUB = sub { $_[1] } unless defined $DEFAULT_SUB; # ---------------------------------------------------------------------- sub init { my ( $self, $config ) = @_; - # # Set the parser and producer. # @@ -71,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 @@ -193,6 +197,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 +290,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" }; @@ -328,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"); @@ -383,27 +389,38 @@ 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'}; } # ---------------------------------------------------------------------- +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 @@ -511,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 @@ -540,14 +554,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; } @@ -635,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"); + $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; } # ---------------------------------------------------------------------- @@ -677,42 +726,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}; } # ---------------------------------------------------------------------- @@ -786,19 +836,18 @@ SQL::Translator - manipulate structured data definitions (SQL and more) =head1 DESCRIPTION -The SQLFairy project began with the idea of simplifying the task of -converting one database create syntax to another through the use of -Parsers (which understand the source format) and Producers (which -understand the destination format). The idea is that any Parser can -be used with any Producer in the conversion process, so, if you -wanted Postgres-to-Oracle, you would use the Postgres parser and the -Oracle producer. The project has since grown to include parsing -structured data files like Excel spreadsheets and delimited text files -and the production of various documentation aids, such as images, -graphs, POD, and HTML descriptions of the schema, as well as automatic -code generators through the use of Class::DBI. Presently only the -definition parts of SQL are handled (CREATE, ALTER), not the -manipulation of data (INSERT, UPDATE, DELETE). +SQL::Translator is a group of Perl modules that converts +vendor-specific SQL table definitions into other formats, such as +other vendor-specific SQL, ER diagrams, documentation (POD and HTML), +XML, and Class::DBI classes. The main focus of SQL::Translator is +SQL, but parsers exist for other structured data formats, including +Excel spreadsheets and arbitrarily delimited text files. Through the +separation of the code into parsers and producers with an object model +in between, it's possible to combine any parser with any producer, to +plug in custom parsers or producers, or to manipulate the parsed data +via the built-in object model. Presently only the definition parts of +SQL are handled (CREATE, ALTER), not the manipulation of data (INSERT, +UPDATE, DELETE). =head1 CONSTRUCTOR @@ -1054,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 . +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 @@ -1080,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 @@ -1091,5 +1178,5 @@ L, L, L, L, -L +L, L.