fix view generation

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

diff --git a/lib/SQL/Translator/Parser/DDL/PostgreSQL.pm b/lib/SQL/Translator/Parser/DDL/PostgreSQL.pm
index d73412c..f4a29c1 100644 (file)
--- a/lib/SQL/Translator/Parser/DDL/PostgreSQL.pm
+++ b/lib/SQL/Translator/Parser/DDL/PostgreSQL.pm
@@ -2,6 +2,7 @@ use MooseX::Declare;
 role SQL::Translator::Parser::DDL::PostgreSQL {
     use MooseX::Types::Moose qw(Str);
     use MooseX::MultiMethods;
+    use Moose::Autobox;
     use SQL::Translator::Constants qw(:sqlt_types :sqlt_constants);
     use SQL::Translator::Types qw(Schema);
     use aliased 'SQL::Translator::Object::Column';
@@ -20,15 +21,15 @@ role SQL::Translator::Parser::DDL::PostgreSQL {
     
         unless (defined $parser) {
             return $translator->error("Error instantiating Parse::RecDescent ".
-                "instance: Bad grammer");
+                "instance: Bad grammar");
         }
     
         my $result = $parser->startrule($data);
         die "Parse failed.\n" unless defined $result;
-    
+
         my $schema = $translator->schema;
         my @tables = 
-sort { ( $result->{tables}{ $a }{'order'} || 0 ) <=> ( $result->{tables}{ $b }{'order'} || 0 ) }
+         sort { ( $result->{tables}{ $a }{'order'} || 0 ) <=> ( $result->{tables}{ $b }{'order'} || 0 ) }
          keys %{ $result->{tables} };
     
         for my $table_name ( @tables ) {
@@ -36,8 +37,8 @@ sort { ( $result->{tables}{ $a }{'order'} || 0 ) <=> ( $result->{tables}{ $b }{'
             my $table = Table->new({ name => $tdata->{table_name}, schema => $schema });
             $schema->add_table($table);
     
-            $table->extra(temporary => 1) if $tdata->{'temporary'};
-            $table->comments( $tdata->{'comments'} );
+            $table->extra({ temporary => 1 }) if $tdata->{'temporary'};
+            $table->comments( [ $tdata->{'comments'}->flatten ]) if $tdata->{comments};
     
             my @fields = sort { $tdata->{'fields'}{ $a }{'order'} <=> $tdata->{'fields'}{ $b }{'order'} } keys %{ $tdata->{'fields'} };
     
@@ -50,17 +51,17 @@ sort { ( $result->{tables}{ $a }{'order'} || 0 ) <=> ( $result->{tables}{ $b }{'
                     sql_data_type     => $self->data_type_mapping->{$fdata->{data_type}} || -999999,
                     size              => $fdata->{'size'},
                     default_value     => $fdata->{'default'},
-                    is_auto_increment => $fdata->{'is_auto_increment'},
+                    is_auto_increment => $fdata->{'is_auto_increment'}, 
                     is_nullable       => $fdata->{'is_nullable'},
-                    comments          => $fdata->{'comments'},
                     table             => $table,
                 });
+                $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};
     
                 for my $cdata ( @{ $fdata->{constraints} } ) {
-                    next unless $cdata->{type} eq 'foreign_key';
+                    next unless lc $cdata->{type} eq 'foreign_key';
                     $cdata->{fields} ||= [ $field->name ];
                     push @{ $tdata->{constraints} }, $cdata;
                 }
@@ -77,18 +78,24 @@ sort { ( $result->{tables}{ $a }{'order'} || 0 ) <=> ( $result->{tables}{ $b }{'
             }
     
             for my $cdata ( @{ $tdata->{'constraints'} || [] } ) {
-                my $constraint = Constraint->new({
-                    name             => $cdata->{name},
-                    type             => $cdata->{type},
-                    fields           => $cdata->{fields},
-                    reference_table  => $cdata->{reference_table},
-                    reference_fields => $cdata->{reference_fields},
-                    match_type       => $cdata->{match_type} || '',
-                    on_delete        => $cdata->{on_delete} || $cdata->{on_delete_do},
-                    on_update        => $cdata->{on_update} || $cdata->{on_update_do},
-                    expression       => $cdata->{expression},
-                    table            => $table,
-                });
+                my $constraint;
+                $cdata->{type} =~ s/_/ /g;
+                if (uc $cdata->{type} eq PRIMARY_KEY) {
+                    $constraint = PrimaryKey->new({ name => $cdata->{name} || '', table => $table });
+                    $table->get_column($_)->is_primary_key(1) for @{$cdata->{fields}};
+                } elsif (uc $cdata->{type} eq FOREIGN_KEY) {
+                    $constraint = ForeignKey->new({ name => $cdata->{name} || '',
+                                                    table => $table,
+                                                    reference_table => $cdata->{reference_table},
+                                                    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}};
+                    $table->get_column($_)->foreign_key_reference($constraint) for @{$cdata->{fields}};
+                } else {
+                    $constraint = Constraint->new({ name => $cdata->{name} || '', type => uc $cdata->{type}, table => $table });
+                }
+                $constraint->add_column($table->get_column($_)) for @{$cdata->{fields}};
                 $table->add_constraint($constraint);
             }
         }
@@ -98,6 +105,7 @@ sort { ( $result->{tables}{ $a }{'order'} || 0 ) <=> ( $result->{tables}{ $b }{'
           $sql =~ s/\A\s+|\s+\z//g;
           my $view = View->new({
             name    => $vinfo->{view_name},
+            fields  => $vinfo->{fields},
             sql     => $sql,
           });