PG was choking on a lot of small errors, and some of the translations didn't
[dbsrgits/SQL-Translator.git] / lib / SQL / Translator / Producer / Turnkey.pm
index 8e07f75..bc28737 100644 (file)
@@ -1,50 +1,72 @@
-package Turnkey::Package;
+package Turnkey::Node;
 
 use strict;
 use Class::MakeMethods::Template::Hash (
   new => [ 'new' ],
-  hash => [ qw( many ) ],
-  hash_of_arrays => [ qw( many_via) ],
+  'array_of_objects -class Turnkey::Edge' => [ qw( edges ) ],
+  'array_of_objects -class Turnkey::CompoundEdge' => [ qw( compoundedges ) ],
+  'array_of_objects -class Turnkey::HyperEdge' => [ qw( hyperedges ) ],
+  'hash' => [ qw( many via has) ],
   scalar => [ qw( base name order primary_key primary_key_accessor table) ],
 );
 
 
-#  get_set => [ qw(order base name table primary_key primary_key_accessor) ],
-#  new_with_init => 'new',
-#;
+package Turnkey::Edge;
 
-sub init {
+use strict;
+use Class::MakeMethods::Template::Hash (
+  new => ['new'],
+  scalar => [ qw( type ) ],
+  array => [ qw( traversals ) ],
+  object => [
+                        'thisfield'    => {class => 'SQL::Translator::Schema::Field'},
+                        'thatfield'    => {class => 'SQL::Translator::Schema::Field'},
+                        'thisnode'     => {class => 'Turnkey::Node'},
+                        'thatnode'     => {class => 'Turnkey::Node'},
+
+                       ],
+);
+
+sub flip {
+  my $self = shift;
+  return Turnkey::Edge->new( thisfield => $self->thatfield,
+                                                        thatfield => $self->thisfield,
+                                                        thisnode  => $self->thatnode,
+                                                        thatnode  => $self->thisnode,
+                                                        type => $self->type eq 'import' ? 'export' : 'import'
+                                                  );
 }
 
-1;
 
-package SQL::Translator::Producer::Turnkey;
+package Turnkey::HyperEdge;
 
-# -------------------------------------------------------------------
-# $Id: Turnkey.pm,v 1.2 2003-08-29 05:38:56 allenday Exp $
-# -------------------------------------------------------------------
-# Copyright (C) 2003 Allen Day <allenday@ucla.edu>,
-#                    Brian O'Connor <boconnor@ucla.edu>,
-#                    Ying Zhang <zyolive@yahoo.com>
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; version 2.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307  USA
-# -------------------------------------------------------------------
+use strict;
+use base qw(Turnkey::Edge);
+use Class::MakeMethods::Template::Hash (
+  'array_of_objects -class SQL::Translator::Schema::Field' => [ qw( thisviafield thatviafield thisfield thatfield) ],
+  'array_of_objects -class Turnkey::Node'                  => [ qw( thisnode thatnode ) ],
+  object => [ 'vianode' => {class => 'Turnkey::Node'} ],
+);
+
+
+package Turnkey::CompoundEdge;
+
+use strict;
+use base qw(Turnkey::Edge);
+use Class::MakeMethods::Template::Hash (
+  new => ['new'],
+  object => [
+                        'via'  => {class => 'Turnkey::Node'},
+                       ],
+  'array_of_objects -class Turnkey::Edge' => [ qw( edges ) ],
+);
+
+
+package SQL::Translator::Producer::Turnkey;
 
 use strict;
 use vars qw[ $VERSION $DEBUG ];
-$VERSION = sprintf "%d.%02d", q$Revision: 1.2 $ =~ /(\d+)\.(\d+)/;
+$VERSION = sprintf "%d.%02d", q$Revision: 1.6 $ =~ /(\d+)\.(\d+)/;
 $DEBUG   = 1 unless defined $DEBUG;
 
 use SQL::Translator::Schema::Constants;
@@ -62,236 +84,297 @@ my %CDBI_auto_pkgs = (
 sub produce {
     my $t             = shift;
        my $create        = undef;
-    local $DEBUG      = $t->debug;
     my $no_comments   = $t->no_comments;
     my $schema        = $t->schema;
     my $args          = $t->producer_args;
-    my $db_user       = $args->{'db_user'} || '';
-    my $db_pass       = $args->{'db_pass'} || '';
-    my $main_pkg_name = $args->{'main_pkg_name'} ||
-                           $t->format_package_name('DBI');
-    my $header        = header_comment(__PACKAGE__, "# ");
-    my $parser_type   = ( split /::/, $t->parser_type )[-1];
-    my $from          = $CDBI_auto_pkgs{ $parser_type } || '';
-    my $dsn           = $args->{'dsn'} || sprintf( 'dbi:%s:_',
-                            $CDBI_auto_pkgs{ $parser_type }
-                            ? $CDBI_auto_pkgs{ $parser_type } : $parser_type
-                        );
-    my $sep           = '# ' . '-' x 67;
 
-    #
-    # Identify "link tables" (have only PK and FK fields).
-    #
-    my %linkable;
-    my %linktable;
-       my %packages;
-       my $order;
+       my $parser_type   = (split /::/, $t->parser_type)[-1];
 
+    local $DEBUG      = $t->debug;
 
+       my %meta          = (
+                                                format_fk => $t->format_fk_name,
+                                                template  => $args->{'template'}      || '',
+                                                baseclass => $args->{'main_pkg_name'} || $t->format_package_name('DBI'),
+                                                db_user   => $args->{'db_user'}       || '',
+                                                db_pass   => $args->{'db_pass'}       || '',
+                                                parser    => $t->parser_type,
+                                                producer  => __PACKAGE__,
+                                                dsn       => $args->{'dsn'} || sprintf( 'dbi:%s:_', $CDBI_auto_pkgs{ $parser_type }
+                                                                                                                                ? $CDBI_auto_pkgs{ $parser_type }
+                                                                                                                                : $parser_type
+                                                                                                                          )
+                                                );
+
+
+       #
+       # build package objects
+       #
+       my %nodes;
+       my $order;
        foreach my $table ($schema->get_tables){
+
          die __PACKAGE__." table ".$table->name." doesn't have a primary key!" unless $table->primary_key;
          die __PACKAGE__." table ".$table->name." can't have a composite primary key!" if ($table->primary_key->fields)[1];
 
+         my $node = Turnkey::Node->new();
+         $nodes{ $table->name } = $node;
 
-         my $package = Turnkey::Package->new();
-         $packages{ $package->name } = $package;
-
-         $package->order( ++$order );
-         $package->name( $t->format_package_name($table->name) );
-         $package->base( $main_pkg_name );
-         $package->table( $table );
-         $package->primary_key( ($table->primary_key->fields)[0] );
+         $node->order( ++$order );
+         $node->name( $t->format_package_name($table->name) );
+         $node->base( $meta{'baseclass'} );
+         $node->table( $table );
+         $node->primary_key( ($table->primary_key->fields)[0] );
          # Primary key may have a differenct accessor method name
-         $package->primary_key_accessor(
-                                                                        defined($t->format_pk_name) ? $t->format_pk_name->( $package->name, $package->primary_key )
-                                                                                                    : undef
-                                                                       );
+         $node->primary_key_accessor(
+                                                                 defined($t->format_pk_name)
+                                                                 ? $t->format_pk_name->( $node->name, $node->primary_key )
+                                                                 : undef
+                                                                );
        }
 
-       foreach my $maylink ( $schema->get_tables ){
-         foreach my $left ($schema->get_tables){
-               foreach my $right ($schema->get_tables){
+       foreach my $node (values %nodes){
+         foreach my $field ($node->table->get_fields){
+               next unless $field->is_foreign_key;
+
+               my $that = $nodes{ $field->foreign_key_reference->reference_table };
+               #this means we have an incomplete schema
+               next unless $that;
 
-                 next if $left->name eq $right->name;
+               my $edge = Turnkey::Edge->new(
+                                                                         type => 'import',
+                                                                         thisnode => $node,
+                                                                         thisfield => $field,
+                                                                         thatnode => $that,
+                                                                         thatfield => ($field->foreign_key_reference->reference_fields)[0]
+                                                                        );
 
-                 if( $maylink->can_link($left,$right) ){
 
-                       $lpackage = $packages{$left->name};
-                       $rpackage = $packages{$right->name};
+               $node->has($that->name, $node->has($that->name)+1);
+               $that->many($node->name, $that->many($node->name)+1);
 
-                       $lpackage->many_via($rpackage => $maylink);
-                       $rpackage->many_via($lpackage => $maylink);
-#                      $linktable{ $maylink->name } = $maylink;
+
+               $node->push_edges( $edge );
+               $that->push_edges( $edge->flip );
+         }
+       }
+
+       #
+       # type MM relationships
+       #
+       foreach my $lnode (sort values %nodes){
+         next if $lnode->table->is_data;
+         foreach my $inode1 (sort values %nodes){
+               next if $inode1 eq $lnode;
+
+               my @inode1_imports = grep { $_->type eq 'import' and $_->thatnode eq $inode1 } $lnode->edges;
+               next unless @inode1_imports;
+
+               foreach my $inode2 (sort values %nodes){
+                 my %i = map {$_->thatnode->name => 1} grep { $_->type eq 'import'} $lnode->edges;
+                 if(scalar(keys %i) == 1) {
+                 } else {
+                       last if $inode1 eq $inode2;
                  }
 
+                 next if $inode2 eq $lnode;
+                 my @inode2_imports =  grep { $_->type eq 'import' and $_->thatnode eq $inode2 } $lnode->edges;
+                 next unless @inode2_imports;
+
+                 my $cedge = Turnkey::CompoundEdge->new();
+                 $cedge->via($lnode);
+
+                 $cedge->push_edges( map {$_->flip} grep {$_->type eq 'import' and ($_->thatnode eq $inode1 or $_->thatnode eq $inode2)} $lnode->edges);
+
+                 if(scalar(@inode1_imports) == 1 and scalar(@inode2_imports) == 1){
+                       $cedge->type('one2one');
+
+                       $inode1->via($inode2->name,$inode1->via($inode2->name)+1);
+                       $inode2->via($inode1->name,$inode2->via($inode1->name)+1);
+                 }
+                 elsif(scalar(@inode1_imports)  > 1 and scalar(@inode2_imports) == 1){
+                       $cedge->type('many2one');
+
+                       $inode1->via($inode2->name,$inode1->via($inode2->name)+1);
+                       $inode2->via($inode1->name,$inode2->via($inode1->name)+1);
+                 }
+                 elsif(scalar(@inode1_imports) == 1 and scalar(@inode2_imports)  > 1){
+                       #handled above
+                 }
+                 elsif(scalar(@inode1_imports)  > 1 and scalar(@inode2_imports)  > 1){
+                       $cedge->type('many2many');
+
+                       $inode1->via($inode2->name,$inode1->via($inode2->name)+1);
+                       $inode2->via($inode1->name,$inode2->via($inode1->name)+1);
+                 }
+
+                 $inode1->push_compoundedges($cedge);
+                 $inode2->push_compoundedges($cedge) unless $inode1 eq $inode2;
+
                }
          }
        }
 
     #
-    # Iterate over all tables
+    # create methods
     #
-    for my $table_from ( $schema->get_tables ) {
-         my %linked;
+       foreach my $node_from (values %nodes){
+         next unless $node_from->table->is_data;
+         foreach my $cedge ( $node_from->compoundedges ){
+               my $hyperedge = Turnkey::HyperEdge->new;
 
+               my $node_to;
 
-         next unless $table_from->is_data;
+               foreach my $edge ($cedge->edges){
+                 if($edge->thisnode->name eq $node_from->name){
+                       $hyperedge->vianode($edge->thatnode);
 
-         if($table_from->is_data){
-               foreach my $link ( keys %{ $linkable{ $table_from->name } } ) {
-                 my $linkmethodname;
-
-                       if ( my $fk_xform = $t->format_fk_name ) {
-                         # ADD CALLBACK FOR PLURALIZATION MANGLING HERE
-                         $linkmethodname = $fk_xform->($linkable{$table->name}{$link}->name,
-                                                                                       ($schema->get_table($link)->primary_key->fields)[0]).'s';
-                       } else {
-                         # ADD CALLBACK FOR PLURALIZATION MANGLING HERE
-                         $linkmethodname = $linkable{$table->name}{$link}->name.'_'.
-                               ($schema->get_table($link)->primary_key->fields)[0].'s';
+                       if($edge->thatnode->name ne $cedge->via->name){
+                         $node_to ||= $nodes{ $edge->thatnode->table->name };
                        }
 
-                       my @rk_fields = ();
-                       my @lk_fields = ();
-                       foreach my $field ($linkable{$table->name}{$link}->get_fields) {
-                         next unless $field->is_foreign_key;
+                         $hyperedge->push_thisnode($edge->thisnode);
+                         $hyperedge->push_thisfield($edge->thisfield);
+                         $hyperedge->push_thisviafield($edge->thatfield);
 
-                         next unless(
-                                                 $field->foreign_key_reference->reference_table eq $table->name
-                                                 ||
-                                                 $field->foreign_key_reference->reference_table eq $link
-                                                );
-                         push @lk_fields, ($field->foreign_key_reference->reference_fields)[0]
-                               if $field->foreign_key_reference->reference_table eq $link;
-                         push @rk_fields, $field->name
-                               if $field->foreign_key_reference->reference_table eq $table->name;
-                       }
+                 } else {
 
-                       #if one possible traversal via link table
-                       if (scalar(@rk_fields) == 1 and scalar(@lk_fields) == 1) {
-                         foreach my $rk_field (@rk_fields) {
-                               #push @{ $packages{ $table_pkg_name }{'has_many'}{ $link } },
-                               push @{ $packages{ $package->name }{'has_many'}{$link}{'link_one_one'} },
-                                 "sub ".$linkmethodname." { my \$self = shift; ".
-                                       "return map \$_->".
-                                         ($schema->get_table($link)->primary_key->fields)[0].
-                                               ", \$self->".$linkable{$table->name}{$link}->name.
-                                                 "_".$rk_field." }\n\n";
-                               #push @{ $packages{ $table_pkg_name }{'has_many'}{ $link }{'one_one'} },
-                               #  {link_method_name => $linkmethodname, primary_key_field => ($schema->get_table($link)->primary_key->fields)[0],
-                               #   table_name => $linkable{$table_name}{$link}->name, rk_field => $rk_field};
-                         }
-                         #else there is more than one way to traverse it.  ack!
-                         #let's treat these types of link tables as a many-to-one (easier)
-                         #
-                         #NOTE: we need to rethink the link method name, as the cardinality
-                         #has shifted on us.
-                       } elsif (scalar(@rk_fields) == 1) {
-                         foreach my $rk_field (@rk_fields) {
-                               # ADD CALLBACK FOR PLURALIZATION MANGLING HERE
-                               #push @{ $packages{ $table_pkg_name }{'has_many'}{ $link } },
-                               push @{ $packages{ $package->name }{'has_many'}{ $link }{'link_many_one'} },
-                                 "sub " . $linkable{$table->name}{$link}->name .
-                                       "s { my \$self = shift; return \$self->" .
-                                         $linkable{$table->name}{$link}->name . "_" .
-                                               $rk_field . "(\@_) }\n\n";
-                               #push @{ $packages{ $table_pkg_name }{'has_many'}{ $link }{'many_one'} },
-                               #  {
-                               #    table_name => $linkable{$table_name}{$link}->name, rk_field => $rk_field
-                               #  };
-                         }
-                       } elsif (scalar(@lk_fields) == 1) {
-                         #these will be taken care of on the other end...
-                       } else {
-                         #many many many.  need multiple iterations here, data structure revision
-                         #to handle N FK sources.  This code has not been tested and likely doesn't
-                         #work here
-                         foreach my $rk_field (@rk_fields) {
-                               # ADD CALLBACK FOR PLURALIZATION MANGLING HERE
-                               #push @{ $packages{ $table_pkg_name }{'has_many'}{ $link } },
-                               push @{ $packages{ $package->name }{'has_many'}{ $link }{'link_many_many'} },
-                                 "sub " . $linkable{$table->name}{$link}->name . "_" . $rk_field .
-                                       "s { my \$self = shift; return \$self->" .
-                                         $linkable{$table->name}{$link}->name . "_" .
-                                               $rk_field . "(\@_) }\n\n";
-                               #push @{ $packages{ $table_pkg_name }{'has_many'}{ $link }{'many_many'} },
-                               #  {
-                               #   table_name => $linkable{$table_name}{$link}->name, rk_field => $rk_field
-                               #  };
-                         }
+                       if($edge->thisnode->name ne $cedge->via->name){
+                         $node_to ||= $nodes{ $edge->thisnode->table->name };
                        }
+
+                         $hyperedge->push_thatnode($edge->thisnode);
+                         $hyperedge->push_thatfield($edge->thisfield);
+                         $hyperedge->push_thatviafield($edge->thatfield);
                  }
-        }
-
-
-        #
-        # Use foreign keys to set up "has_a/has_many" relationships.
-        #
-        foreach my $field ( $table->get_fields ) {
-            if ( $field->is_foreign_key ) {
-                my $table_name = $table->name;
-                my $field_name = $field->name;
-                my $fk_method  = $t->format_fk_name($table_name, $field_name);
-                my $fk         = $field->foreign_key_reference;
-                my $ref_table  = $fk->reference_table;
-                my $ref_pkg    = $t->format_package_name($ref_table);
-                my $ref_field  = ($fk->reference_fields)[0];
-
-                push @{ $packages{ $package->name }{'has_a'} },
-                    $package->name."->has_a( $field_name => '$ref_pkg');\n".
-                    "sub $fk_method { return shift->$field_name }\n\n"
-                ;
-                               
-                               
-                #
-                # If this table "has a" to the other, then it follows 
-                # that the other table "has many" of this one, right?
-                #
-                               # No... there is the possibility of 1-1 cardinality
-
-                               #if there weren't M-M relationships via the has_many
-                               #being set up here, create nice pluralized method alias
-                               #rather for user as alt. to ugly tablename_fieldname name
-                               if(! $packages{ $ref_pkg }{ 'has_many' }{ $table->name } ){
-                                 # ADD CALLBACK FOR PLURALIZATION MANGLING HERE
-                                 #push @{ $packages{ $ref_pkg }{'has_many'}{ $table_name } },
-                               #       "sub $table_name\s {\n    return shift->$table_name\_$field_name\n}\n\n";
-                                 push @{ $packages{ $ref_pkg }{'has_many'}{ $table->name }{'fk_pluralized'} },
-                                       { table_name => $table->name, field_name => $field_name };
-
-                               #else ugly
-                               } else {
-                               }
-
-                               #push @{ $packages{ $ref_pkg }{'has_many'}{ $table_name } },
-                               #  "$ref_pkg->has_many(\n    '${table_name}_${field_name}', ".
-                               #  "'$table_pkg_name' => '$field_name'\n);\n\n";
-                               push @{ $packages{ $ref_pkg }{'has_many'}{ $table_name }{pluralized} },
-                                 { ref_pkg => $ref_pkg, table_pkg_name => $package->name, table_name => $table->name, field_name => $field_name };
-            }
                }
-       }
 
-       my %metadata;
-       $metadata{"packages"} = \%packages;
-       $metadata{"linkable"} = \%linkable;
-       return(translateForm($t, \%metadata));
+                  if($hyperedge->count_thisnode == 1 and $hyperedge->count_thatnode == 1){ $hyperedge->type('one2one')   }
+               elsif($hyperedge->count_thisnode  > 1 and $hyperedge->count_thatnode == 1){ $hyperedge->type('many2one')  }
+               elsif($hyperedge->count_thisnode == 1 and $hyperedge->count_thatnode  > 1){ $hyperedge->type('one2many')  }
+               elsif($hyperedge->count_thisnode  > 1 and $hyperedge->count_thatnode  > 1){ $hyperedge->type('many2many') }
+
+#warn $node_from->name ."\t". $node_to->name ."\t". $hyperedge->type ."\t". $hyperedge->vianode->name;
+
+               $node_from->push_hyperedges($hyperedge);
+         }
+       }
+
+       $meta{"nodes"} = \%nodes;
+       return(translateForm($t, \%meta));
 }
 
 ###########################################
 # Here documents for the tt2 templates    #
 ###########################################
 
+my $turnkey_dbi_tt2 = <<EOF;
+[% MACRO printPackage(node) BLOCK %]
+# --------------------------------------------
+
+package [% node.name %];
+use base '[% node.base %]';
+use Class::DBI::Pager;
+
+[% node.name %]->set_up_table('[% node.table.name %]');
+[% printPKAccessors(node.primary_key, node.table.name) %]
+[% printHasA(node.edges, node) %]
+[% printHasMany(node.edges, node) %]
+[% printHasCompound(node.compoundedges, node.hyperedges, node.name) %]
+[% END %]
+
+[% MACRO printPKAccessors(array, name) BLOCK %]
+#
+# Primary key accessors
+#
+[% FOREACH item = array %]
+sub id { shift->[% item %] }
+sub [% name %] { shift->[% item %] }
+[% END %]
+[% END %]
+
+[% MACRO printHasA(edges, name) BLOCK %]
+#
+# Has A
+#
+[% FOREACH edge = edges %]
+  [%- IF edge.type == 'import' -%]
+[% node.name %]->has_a([% edge.thisfield.name %] => '[% edge.thatnode.name %]');
+    [%- IF node.has(edge.thatnode.name) < 2 %]
+sub [% edge.thatnode.table.name %] { return shift->[% edge.thisfield.name %] }
+    [%- ELSE %]
+sub [% format_fk(edge.thisnode.table.name,edge.thisfield.name) %] { return shift->[% edge.thisfield.name %] }
+    [%- END %]
+  [%- END %]
+[% END %]
+[% END %]
+
+[% MACRO printHasMany(edges, node) BLOCK %]
+#
+# Has Many
+#
+[% FOREACH edge = edges %]
+  [%- IF edge.type == 'export' -%]
+[% node.name %]->has_many([% edge.thatnode.table.name %]_[% edge.thatfield.name %], '[% edge.thatnode.name %]' => '[% edge.thatfield.name %]');
+    [%- IF node.via(edge.thatnode.name) >= 1 %]
+sub [% edge.thatnode.table.name %]_[% format_fk(edge.thatnode.table.name,edge.thatfield.name) %]s { return shift->[% edge.thatnode.table.name %]_[% edge.thatfield.name %] }
+    [%- ELSIF edge.thatnode.table.is_data %]
+sub [% edge.thatnode.table.name %]s { return shift->[% edge.thatnode.table.name %]_[% edge.thatfield.name %] }
+    [%- END %]
+  [%- END %]
+[% END %]
+[% END %]
+
+[% MACRO printHasCompound(cedges,hedges,name) BLOCK %]
+#
+# Has Compound Many
+#
+[% FOREACH cedge = cedges %]
+[% FOREACH edge = cedge.edges %]
+  [%- NEXT IF edge.thisnode.name != name -%]
+sub [% cedge.via.table.name %]_[% format_fk(edge.thatnode.table.name,edge.thatfield.name) %]s { return shift->[% cedge.via.table.name %]_[% edge.thatfield.name %] }
+[% END %]
+[% END %]
+[% FOREACH h = hedges %]
+  [%- NEXT IF h.thisnode.name != name -%]
+  [%- IF h.type == 'one2one' %]
+1sub [% h.thatnode.table.name %]s { my \$self = shift; return map \$_->[% h.thatviafield.name %], \$self->[% h.vianode.table.name %]_[% h.thisviafield.name %] }
+  [%- ELSIF h.type == 'one2many' %]
+2
+  [%- ELSIF h.type == 'many2one' %]
+3sub [% h.thatnode.table.name %]s { my \$self = shift; return map \$_->[% h.thatviafield.name %], \$self->[% h.vianode.table.name %]_[% h.thisviafield.name %] }
+  [%- ELSIF h.type == 'many2many' %]
+4
+  [%- END %]
+[% END %]
+[% END %]
+
+[% MACRO printList(array) BLOCK %][% FOREACH item = array %][% item %] [% END %][% END %]
+package [% baseclass %];
+
+# Created by SQL::Translator::Producer::Turnkey
+# Template used: classdbi
+
+use strict;
+use base qw(Class::DBI::Pg);
+
+Durian::Model::DBI->set_db('Main', '[% db_str  %]', '[% db_user %]', '[% db_pass %]');
+
+[% FOREACH node = nodes %]
+    [% printPackage(node.value) %]
+[% END %]
+EOF
+
 my $turnkey_atom_tt2 = <<'EOF';
 [% ###### DOCUMENT START ###### %]
 
-[% FOREACH package = linkable %]
+[% FOREACH node = linkable %]
 
 ##############################################
 
-package Durian::Atom::[% package.key FILTER ucfirst %];
+package Durian::Atom::[% node.key FILTER ucfirst %];
 
-[% pname = package.key FILTER ucfirst%]
+[% pname = node.key FILTER ucfirst%]
 [% pkey = "Durian::Model::${pname}" %]
 
 use base qw(Durian::Atom);
@@ -306,7 +389,7 @@ sub render {
        my $dbobject = shift;
     # Assumption here that if it's not rendering on it's own dbobject
     # then it's a list. This will be updated when AtomLists are implemented -boconnor
-       if(ref($dbobject) eq 'Durian::Model::[% package.key FILTER ucfirst %]') {
+       if(ref($dbobject) eq 'Durian::Model::[% node.key FILTER ucfirst %]') {
                return(_render_record($dbobject));
        }
        else { return(_render_list($dbobject)); }
@@ -317,7 +400,7 @@ sub _render_record {
        my @output = ();
        my $row = {};
        my $field_hash = {};
-       [% FOREACH field = packages.$pkey.columns_essential %]
+       [% FOREACH field = nodes.$pkey.columns_essential %]
        $field_hash->{[% field %]} = $dbobject->[% field %]();
     [% END %]
        $row->{data} = $field_hash;
@@ -329,12 +412,12 @@ sub _render_record {
 sub _render_list {
        my $dbobject = shift;
        my @output = ();
-       my @objects = $dbobject->[% package.key %]s;
+       my @objects = $dbobject->[% node.key %]s;
        foreach my $object (@objects)
     {
                my $row = {};
            my $field_hash = {};
-         [% FOREACH field = packages.$pkey.columns_essential %]
+         [% FOREACH field = nodes.$pkey.columns_essential %]
                $field_hash->{[% field %]} = $object->[% field %]();
          [% END %]
                $row->{data} = $field_hash;
@@ -353,93 +436,6 @@ sub head {
 [% END %]
 EOF
 
-my $turnkey_dbi_tt2 = <<EOF;
-[% #######  MACRO START ###### %]
-
-[% MACRO printPackage(package) BLOCK %]
-# --------------------------------------------
-package [% package.pkg_name %];
-use base '[% package.base %]';
-use Class::DBI::Pager;
-
-[% package.pkg_name %]->set_up_table('[% package.table %]');
-[% package.pkg_name %]->columns(Primary => qw/[% printList(package.columns_primary) %]/);
-[% package.pkg_name %]->columns(Essential => qw/[% printList(package.columns_essential) %]/);
-
-[% printPKAccessors(package.columns_primary, package.table) %]
-[% printHasMany(package.has_many, package.table) %]
-[% printHasA(package.has_a, package.pkg_name) %]
-
-[% END %]
-
-[% MACRO printPKAccessors(array, name) BLOCK %]
-#
-# Primary key accessor
-#
-[% FOREACH item = array %]
-sub [% name %] {
-  shift->[% item %];
-}
-[% END %]
-[% END %]
-
-[% MACRO printHasMany(hash, name) BLOCK %]
-#
-# Has Many
-#
-[% FOREACH group = hash %][% FOREACH item = group.value %][% FOREACH arr = item.value %]
-# Key: [% group.key %]
-# Relationship: [% item.key %]
-  [% IF item.key == 'fk_pluralized' %]
-sub [% arr.table_name -%]s {
-      return shift->[% arr.table_name %]_[% arr.field_name %]
-       };
-  [% ELSIF item.key == 'pluralized' %]
-[% arr.ref_pkg %]->has_many('[% arr.table_name %]_[% arr.field_name %]', '[% arr.table_pkg_name %]' => '[% arr.field_name %]');
-  [% ELSIF item.key == 'link_one_one' %]
-    [% FOREACH line = item.value %]
-[% line %]
-    [% END %]
-  [% ELSIF item.key == 'link_many_one' %]
-    [% FOREACH line = item.value %]
-[% line %]
-    [% END %]
-  [% ELSIF item.key == 'link_many_many' %]
-    [% FOREACH line = item.value %]
-[% line %]
-    [% END %]
-  [% END %]
-
-[% END %][% END %][% END %][% END %]
-
-[% MACRO printHasA(hash, pkg_name) BLOCK %]
-#
-# Has A
-#
-[% #name %]
-[% FOREACH item = hash %][% item %]
-[% END %][% END %]
-
-[% MACRO printList(array) BLOCK %][% FOREACH item = array %][% item %] [% END %][% END %]
-
-
-[% ###### DOCUMENT START ###### %]
-
-package Durian::Model::DBI;
-
-# Created by SQL::Translator::Producer::ClassDBI
-# Template used AutoDBI.tt2
-
-use strict;
-use base qw(Class::DBI::Pg);
-
-Durian::Model::DBI->set_db('Main', '[% db_str  %]', '[% db_user %]', '[% db_pass %]');
-
-[% FOREACH package = packages %]
-    [% printPackage(package.value) %]
-[% END %]
-EOF
-
 my $turnkey_xml_tt2 = <<EOF;
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE Durian SYSTEM "Durian.dtd">
@@ -454,8 +450,8 @@ my $turnkey_xml_tt2 = <<EOF;
   </container>
 
 <!-- Atom Classes -->
-[% FOREACH package = linkable %]
-  <atom class="Durian::Atom::[% package.key FILTER ucfirst %]"  name="[% package.key FILTER ucfirst %]" xlink:label="[% package.key FILTER ucfirst %]Atom"/>
+[% FOREACH node = linkable %]
+  <atom class="Durian::Atom::[% node.key FILTER ucfirst %]"  name="[% node.key FILTER ucfirst %]" xlink:label="[% node.key FILTER ucfirst %]Atom"/>
 [%- END -%]
 
 <!-- Atom Bindings -->
@@ -529,24 +525,24 @@ my $turnkey_template_tt2 = <<'EOF';
   <!-- end panel: [% panel.label %] -->
 [% END %]
 [% MACRO renderatom(atom, dbobject) SWITCH atom.name %]
-  [- FOREACH package = linkable -]
-    [% CASE '[- package.key FILTER ucfirst -]' %]
-      [% render[- package.key FILTER ucfirst -]Atom(atom.render(dbobject)) %]
+  [- FOREACH node = linkable -]
+    [% CASE '[- node.key FILTER ucfirst -]' %]
+      [% render[- node.key FILTER ucfirst -]Atom(atom.render(dbobject)) %]
   [- END -]
     [% CASE DEFAULT %]
       [% renderlist(atom.render(dbobject)) %]
 [% END %]
-[- FOREACH package = linkable -]
-[% MACRO render[- package.key FILTER ucfirst -]Atom(lstArr) BLOCK %]
+[- FOREACH node = linkable -]
+[% MACRO render[- node.key FILTER ucfirst -]Atom(lstArr) BLOCK %]
   [% FOREACH record = lstArr %]
     [% fields = record.data %]
-    [- pname = package.key FILTER ucfirst -]
+    [- pname = node.key FILTER ucfirst -]
     [- pkey = "Durian::Model::${pname}" -]
-    [- FOREACH field = packages.$pkey.columns_essential -]
+    [- FOREACH field = nodes.$pkey.columns_essential -]
       <tr><td><b>[- field -]</b></td><td>[% fields.[- field -] %]</td></tr>
     [- END -]
     [% id = record.id %]
-    <tr><td><a href="?id=[% id %];class=Durian::Model::[- package.key FILTER ucfirst -]">Link</a></td><td></td></tr>
+    <tr><td><a href="?id=[% id %];class=Durian::Model::[- node.key FILTER ucfirst -]">Link</a></td><td></td></tr>
   [% END %]
 [% END %]
 [- END -]
@@ -557,12 +553,14 @@ my $turnkey_template_tt2 = <<'EOF';
 [% END %]
 EOF
 
+
 sub translateForm
 {
   my $t = shift;
-  my $output = shift;
+  my $meta = shift;
+#  my $output = shift;
   my $args = $t->producer_args;
-  my $tt2     = $args->{'template'};
+  my $tt2     = $meta->{'template'};
   my $tt2Ref;
 
      if ($tt2 eq 'atom')     { $tt2Ref = \$turnkey_atom_tt2;     }
@@ -571,14 +569,6 @@ sub translateForm
   elsif ($tt2 eq 'template') { $tt2Ref = \$turnkey_template_tt2; }
   else                       { die __PACKAGE__." didn't recognize your template option: $tt2" }
 
-  my $vars = {
-                               packages  => $output->{packages},
-                           linkable  => $output->{linkable},
-                           linktable => $output->{linktable},
-                           db_str    => $args->{db_str},
-                           db_user   => $args->{db_user},
-                           db_pass   => $args->{db_pass},
-  };
   my $config = {
       EVAL_PERL    => 1,               # evaluate Perl code blocks
   };
@@ -589,7 +579,7 @@ sub translateForm
   my $result;
   # specify input filename, or file handle, text reference, etc.
   # process input template, substituting variables
-  $template->process($tt2Ref, $vars, \$result) || die $template->error();
+  $template->process($tt2Ref, $meta, \$result) || die $template->error();
   return($result);
 }
 
@@ -601,22 +591,18 @@ sub translateForm
 
 =head1 NAME
 
-SQL::Translator::Producer::ClassDBI - create Class::DBI classes from schema
+SQL::Translator::Producer::Turnkey - create Turnkey classes from schema
 
 =head1 SYNOPSIS
 
-Use this producer as you would any other from SQL::Translator.  See
-L<SQL::Translator> for details.
+Creates output for use with the Turnkey project.
+
+=head1 SEE ALSO
 
-This package utilizes SQL::Translator\'s formatting methods
-format_package_name(), format_pk_name(), format_fk_name(), and
-format_table_name() as it creates classes, one per table in the schema
-provided.  An additional base class is also created for database connectivity
-configuration.  See L<Class::DBI> for details on how this works.
+L<http://turnkey.sourceforge.net>.
 
 =head1 AUTHORS
 
 Allen Day E<lt>allenday@ucla.eduE<gt>
 Ying Zhang E<lt>zyolive@yahoo.comE<gt>,
-Ken Y. Clark E<lt>kclark@cpan.orgE<gt>,
-Brian O\'Connor E<lt>brian.oconnor@excite.comE<gt>.
+Brian O'Connor E<lt>brian.oconnor@excite.comE<gt>.