All Schema objects now have an extra attribute. Added parsing support (and

[dbsrgits/SQL-Translator.git] / lib / SQL / Translator / Schema.pm

diff --git a/lib/SQL/Translator/Schema.pm b/lib/SQL/Translator/Schema.pm
index 02962d2..576526a 100644 (file)
--- a/lib/SQL/Translator/Schema.pm
+++ b/lib/SQL/Translator/Schema.pm
@@ -1,9 +1,9 @@
 package SQL::Translator::Schema;
 
 # ----------------------------------------------------------------------
-# $Id: Schema.pm,v 1.11 2003-10-08 18:30:15 phrrngtn Exp $
+# $Id: Schema.pm,v 1.20 2004-11-05 13:19:31 grommit Exp $
 # ----------------------------------------------------------------------
-# Copyright (C) 2003 Ken Y. Clark <kclark@cpan.org>
+# Copyright (C) 2002-4 SQLFairy Authors
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as
@@ -43,24 +43,22 @@ returns the database structure.
 =cut
 
 use strict;
-use Class::Base;
 use SQL::Translator::Schema::Constants;
 use SQL::Translator::Schema::Procedure;
 use SQL::Translator::Schema::Table;
 use SQL::Translator::Schema::Trigger;
 use SQL::Translator::Schema::View;
-use SQL::Translator::Schema::Procedure;
-
+use SQL::Translator::Schema::Graph;
 use SQL::Translator::Utils 'parse_list_arg';
 
-
-use base 'Class::Base';
+use base 'SQL::Translator::Schema::Object';
 use vars qw[ $VERSION $TABLE_ORDER $VIEW_ORDER $TRIGGER_ORDER $PROC_ORDER ];
 
-$VERSION = sprintf "%d.%02d", q$Revision: 1.11 $ =~ /(\d+)\.(\d+)/;
+$VERSION = sprintf "%d.%02d", q$Revision: 1.20 $ =~ /(\d+)\.(\d+)/;
 
 # ----------------------------------------------------------------------
-sub init {
+
+__PACKAGE__->_attributes( qw/name database translator/ );
 
 =pod
 
@@ -68,16 +66,16 @@ sub init {
 
 Object constructor.
 
-  my $schema   =  SQL::Translator->new(
+  my $schema   =  SQL::Translator::Schema->new(
       name     => 'Foo',
       database => 'MySQL',
   );
 
 =cut
 
-    my ( $self, $config ) = @_;
-    $self->params( $config, qw[ name database ] ) || return undef;
-    return $self;
+sub as_graph {
+  my($self) = @_;
+  return SQL::Translator::Schema::Graph->new(translator => $self->translator);
 }
 
 # ----------------------------------------------------------------------
@@ -114,7 +112,8 @@ not be created.
     }
 
     $table->order( ++$TABLE_ORDER );
-    my $table_name = $table->name or return $self->error('No table name');
+    # We know we have a name as the Table->new above errors if none given.
+    my $table_name = $table->name;
 
     if ( defined $self->{'tables'}{ $table_name } ) {
         return $self->error(qq[Can't create table: "$table_name" exists]);
@@ -271,53 +270,6 @@ not be created.
 }
 
 # ----------------------------------------------------------------------
-sub add_procedure {
-
-=pod
-
-=head2 add_procedure
-
-Add a procedure object.  Returns the new
-SQL::Translator::Schema::Procedure object.  The "name" parameter is
-required.  If you try to create a procedure with the same name as an
-existing procedure, you will get an error and the procedure will not
-be created.
-
-  my $p1 = $schema->add_procedure( name => 'foo' );
-  my $p2 = SQL::Translator::Schema::Procedure->new( name => 'bar' );
-  $p2    = $schema->add_procedure( $p2 ) or die $schema->error;
-
-=cut
-
-    my $self        = shift;
-    my $procedure_class = 'SQL::Translator::Schema::Procedure';
-    my $procedure;
-
-    if ( UNIVERSAL::isa( $_[0], $procedure_class ) ) {
-        $procedure= shift;
-        $procedure->schema( $self );
-    }
-    else {
-        my %args = @_;
-        return $self->error('No procedure name') unless $args{'name'};
-        $args{'schema'} = $self;
-        $procedure = $procedure_class->new( \%args ) or return $procedure_class->error;
-    }
-
-    my $procedure_name = $procedure->name or return $self->error('No procedure name');
-
-    if ( defined $self->{'procedures'}{ $procedure_name } ) { 
-        return $self->error(qq[Can't create procedure: "$procedure_name" exists]);
-    }
-    else {
-        $self->{'procedures'}{ $procedure_name } = $procedure;
-    }
-
-    return $procedure;
-}
-
-
-# ----------------------------------------------------------------------
 sub database {
 
 =pod
@@ -555,53 +507,6 @@ Returns all the views as an array or array reference.
     }
 }
 
-
-
-# ----------------------------------------------------------------------
-sub get_procedure {
-
-=pod
-
-=head2 get_procedure
-
-Returns a procedure by the name provided.
-
-  my $view = $schema->get_procedure('foo');
-
-=cut
-
-    my $self      = shift;
-    my $procedure_name = shift or return $self->error('No procedure name');
-    return $self->error('Procedure "$procedure_name" does not exist') unless
-        exists $self->{'procedures'}{ $procedure_name };
-    return $self->{'procedures'}{ $procedure_name };
-}
-
-# ----------------------------------------------------------------------
-sub get_procedures {
-
-=pod
-
-=head2 get_procedures
-
-Returns all the procedures as an array or array reference.
-
-  my @procedures = $schema->get_procedures;
-
-=cut
-
-    my $self  = shift;
-    my @procedures = values %{ $self->{'procedures'} };
-
-    if ( @procedures ) {
-        return wantarray ? @procedures : \@procedures;
-    }
-    else {
-        $self->error('No procedures');
-        return wantarray ? () : undef;
-    }
-}
-
 # ----------------------------------------------------------------------
 sub make_natural_joins {
 
@@ -693,6 +598,18 @@ Get or set the schema's name.  (optional)
     return $self->{'name'} || '';
 }
 
+=head2 translator
+
+get the SQL::Translator instance that instatiated me
+
+=cut
+
+sub translator {
+    my $self = shift;
+    $self->{'translator'} = shift if @_;
+    return $self->{'translator'};
+}
+
 # ----------------------------------------------------------------------
 sub DESTROY {
     my $self = shift;