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 c1708bf..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,7 +21,7 @@ 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);
@@ -37,7 +38,7 @@ role SQL::Translator::Parser::DDL::PostgreSQL {
             $schema->add_table($table);
     
             $table->extra({ temporary => 1 }) if $tdata->{'temporary'};
-            $table->comments( $tdata->{'comments'} );
+            $table->comments( [ $tdata->{'comments'}->flatten ]) if $tdata->{comments};
     
             my @fields = sort { $tdata->{'fields'}{ $a }{'order'} <=> $tdata->{'fields'}{ $b }{'order'} } keys %{ $tdata->{'fields'} };
     
@@ -57,10 +58,10 @@ role SQL::Translator::Parser::DDL::PostgreSQL {
                 $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;
                 }
@@ -78,10 +79,11 @@ role SQL::Translator::Parser::DDL::PostgreSQL {
     
             for my $cdata ( @{ $tdata->{'constraints'} || [] } ) {
                 my $constraint;
-                if (uc $cdata->{type} eq 'PRIMARY_KEY') {
+                $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') {
+                } elsif (uc $cdata->{type} eq FOREIGN_KEY) {
                     $constraint = ForeignKey->new({ name => $cdata->{name} || '',
                                                     table => $table,
                                                     reference_table => $cdata->{reference_table},
@@ -103,6 +105,7 @@ role SQL::Translator::Parser::DDL::PostgreSQL {
           $sql =~ s/\A\s+|\s+\z//g;
           my $view = View->new({
             name    => $vinfo->{view_name},
+            fields  => $vinfo->{fields},
             sql     => $sql,
           });