add constraints after all tables are added

[dbsrgits/SQL-Translator-2.0-ish.git] / lib / SQL / Translator / Parser / DDL / MySQL.pm

diff --git a/lib/SQL/Translator/Parser/DDL/MySQL.pm b/lib/SQL/Translator/Parser/DDL/MySQL.pm
index 1ec752a..2a23fda 100644 (file)
--- a/lib/SQL/Translator/Parser/DDL/MySQL.pm
+++ b/lib/SQL/Translator/Parser/DDL/MySQL.pm
@@ -70,7 +70,7 @@ role SQL::Translator::Parser::DDL::MySQL {
                 $field->comments($fdata->{comments});
                 $table->add_column($field);
     
-                $table->primary_key( $field->name ) if $fdata->{'is_primary_key'};
+                $field->is_primary_key(1) if $fdata->{is_primary_key};
 
                 my %extra;
                 for my $qual ( qw[ binary unsigned zerofill list collate ],
@@ -126,7 +126,26 @@ role SQL::Translator::Parser::DDL::MySQL {
                 }
                 $table->options( \@cleaned_options ); # or die $table->error;
             }
+        }
+        
+        for my $proc_name ( keys %{ $result->{procedures} } ) {
+            my $procedure = Procedure->new({ name  => $proc_name,
+                                             owner => $result->{procedures}->{$proc_name}->{owner},
+                                             sql   => $result->{procedures}->{$proc_name}->{sql}
+            });
+            $schema->add_procedure($procedure);
+        }
     
+        for my $view_name ( keys %{ $result->{'views'} } ) {
+            my $view = View->new({ 
+                name => $view_name,
+                sql  => $result->{'views'}->{$view_name}->{sql},
+            });
+            $schema->add_view($view);
+        }
+        for my $table_name (@tables) {
+            my $table = $schema->get_table($table_name);
+            my $tdata = $result->{tables}{ $table_name };
             for my $cdata ( @{ $tdata->{constraints} || [] } ) {
                 my $constraint;
                 if (uc $cdata->{type} eq 'PRIMARY_KEY') {
@@ -136,7 +155,7 @@ role SQL::Translator::Parser::DDL::MySQL {
                     $constraint = ForeignKey->new({ name => $cdata->{name} || '',
                                                     table => $table,
                                                     reference_table => $cdata->{reference_table},
-                                                    reference_columns => $cdata->{reference_fields},
+                                                    defined $cdata->{reference_fields} ? (reference_columns => $cdata->{reference_fields}) : (),
                                                     on_delete => $cdata->{on_delete} || $cdata->{on_delete_do},
                                                     on_update => $cdata->{on_update} || $cdata->{on_update_do} });
                     $table->get_column($_)->is_foreign_key(1) for @{$cdata->{fields}};
@@ -148,22 +167,6 @@ role SQL::Translator::Parser::DDL::MySQL {
                 $table->add_constraint($constraint);
             }
         }
-        
-        for my $proc_name ( keys %{ $result->{procedures} } ) {
-            my $procedure = Procedure->new({ name  => $proc_name,
-                                             owner => $result->{procedures}->{$proc_name}->{owner},
-                                             sql   => $result->{procedures}->{$proc_name}->{sql}
-            });
-            $schema->add_procedure($procedure);
-        }
-    
-        for my $view_name ( keys %{ $result->{'views'} } ) {
-            my $view = View->new({ 
-                name => $view_name,
-                sql  => $result->{'views'}->{$view_name}->{sql},
-            });
-            $schema->add_view($view);
-        }
         return 1;
     }
 }