Revert my previous changes (rev 1722 reverted back to rev 1721)

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

diff --git a/lib/SQL/Translator/Schema/Graph.pm b/lib/SQL/Translator/Schema/Graph.pm
index 537ed6d..897e535 100644 (file)
--- a/lib/SQL/Translator/Schema/Graph.pm
+++ b/lib/SQL/Translator/Schema/Graph.pm
@@ -2,7 +2,10 @@ package SQL::Translator::Schema::Graph;
 
 use strict;
 
+use base 'Class::Base';
+
 use Data::Dumper;
+local $Data::Dumper::Maxdepth = 3;
 
 use SQL::Translator::Schema::Graph::Node;
 use SQL::Translator::Schema::Graph::Edge;
@@ -19,15 +22,18 @@ use constant HyperEdge => 'SQL::Translator::Schema::Graph::HyperEdge';
 use Class::MakeMethods::Template::Hash (
   'new --and_then_init' => 'new',
   object => [
-                        'translator' => {class => 'SQL::Translator'},
-                       ],
+   'translator' => {class => 'SQL::Translator'},
+  ],
   'hash' => [ qw( node ) ],
-  'scalar' => [ qw( baseclass ) ],
   'number --counter' => [ qw( order ) ],
 );
 
+use vars qw/$DEBUG/;
+$DEBUG = 0 unless defined $DEBUG;
+
 sub init {
   my $self = shift;
+
   #
   # build package objects
   #
@@ -44,7 +50,6 @@ sub init {
 
        $node->order($self->order_incr());
        $node->name( $self->translator->format_package_name($table->name) );
-       $node->base( $self->baseclass );
        $node->table( $table );
        $node->primary_key( ($table->primary_key->fields)[0] );
 
@@ -80,11 +85,15 @@ sub init {
          $that->many($node->name, $that->many($node->name)+1);
 
          $that->edgecount($node->name, $that->edgecount($node->name)+1);
-#warn $node->name . "\t" . $that->edgecount($node->name);
+
+          #warn "\t" . $node->name . "\t" . $node->edgecount($that->name);
          $node->push_edges( $edge );
          $that->push_edges( $edge->flip );
       }
        }
+
+    #warn Dumper($node->edgecount());
+    #warn "*****";
   }
 
   #
@@ -151,12 +160,98 @@ sub init {
                  $inode1->via($inode2->name,$inode1->via($inode2->name)+1);
                  $inode2->via($inode1->name,$inode2->via($inode1->name)+1);
                }
+#warn Dumper($cedge);
 
                $inode1->push_compoundedges($cedge);
                $inode2->push_compoundedges($cedge) unless $inode1 eq $inode2;
+#        if($inode1->name ne $inode2->name){
+#          my $flipped_cedge = $cedge;
+#          foreach my $flipped_cedge_edge ($flipped_cedge->edges){
+#            warn Dumper $flipped_cedge_edge;
+#            warn "\t". Dumper $flipped_cedge_edge->flip;
+#          }
+#        }
          }
        }
   }
+
+  my $graph = $self; #hack
+
+  #
+  # create methods
+  #
+  # this code needs to move to Graph.pm
+  foreach my $node_from ($graph->node_values) {
+
+    next unless $node_from->table->is_data or !$node_from->table->is_trivial_link;
+
+    foreach my $cedge ( $node_from->compoundedges ) {
+
+      my $hyperedge = SQL::Translator::Schema::Graph::HyperEdge->new();
+
+      my $node_to;
+      foreach my $edge ($cedge->edges) {
+        if ($edge->thisnode->name eq $node_from->name) {
+          $hyperedge->vianode($edge->thatnode);
+
+          if ($edge->thatnode->name ne $cedge->via->name) {
+            $node_to ||= $graph->node($edge->thatnode->table->name);
+          }
+
+          $hyperedge->push_thisnode($edge->thisnode);
+          $hyperedge->push_thisfield($edge->thisfield);
+          $hyperedge->push_thisviafield($edge->thatfield);
+
+        } else {
+          if ($edge->thisnode->name ne $cedge->via->name) {
+            $node_to ||= $graph->node($edge->thisnode->table->name);
+          }
+          $hyperedge->push_thatnode($edge->thisnode);
+          $hyperedge->push_thatfield($edge->thisfield);
+          $hyperedge->push_thatviafield($edge->thatfield);
+        }
+        $self->debug($edge->thisfield->name);
+        $self->debug($edge->thatfield->name);
+      }
+
+      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');
+      }
+
+      $self->debug($_) foreach sort keys %::SQL::Translator::Schema::Graph::HyperEdge::;
+
+      #node_to won't always be defined b/c of multiple edges to a single other node
+      if (defined($node_to)) {
+        $self->debug($node_from->name);
+        $self->debug($node_to->name);
+
+        if (scalar($hyperedge->thisnode) > 1) {
+          $self->debug($hyperedge->type ." via ". $hyperedge->vianode->name);
+          my $i = 0;
+          foreach my $thisnode ( $hyperedge->thisnode ) {
+            $self->debug($thisnode->name .' '.
+                        $hyperedge->thisfield_index(0)->name .' -> '.
+                        $hyperedge->thisviafield_index($i)->name .' '.
+                        $hyperedge->vianode->name .' '.
+                        $hyperedge->thatviafield_index(0)->name .' <- '.
+                        $hyperedge->thatfield_index(0)->name .' '.
+                        $hyperedge->thatnode_index(0)->name ."\n"
+                       );
+            $i++;
+          }
+        }
+        #warn Dumper($hyperedge) if $hyperedge->type eq 'many2many';
+        $node_from->push_hyperedges($hyperedge);
+      }
+    }
+  }
+
 }
 
 1;