X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FSQL%2FTranslator%2FParser%2FPostgreSQL.pm;h=af1e3935ef099757befdc100a3c936af9d2b8aa0;hb=840447a59faddb3c53b86dcee3a155aaa9fd631a;hp=cb497af6011d65f9efebb048ce2f1ab17250458f;hpb=782b5a43519d2713171767f74a544fe9892542ea;p=dbsrgits%2FSQL-Translator.git

diff --git a/lib/SQL/Translator/Parser/PostgreSQL.pm b/lib/SQL/Translator/Parser/PostgreSQL.pm
index cb497af..af1e393 100644
--- a/lib/SQL/Translator/Parser/PostgreSQL.pm
+++ b/lib/SQL/Translator/Parser/PostgreSQL.pm
@@ -1,8 +1,6 @@
 package SQL::Translator::Parser::PostgreSQL;
 
 # -------------------------------------------------------------------
-# $Id$
-# -------------------------------------------------------------------
 # Copyright (C) 2002-2009 SQLFairy Authors
 #
 # This program is free software; you can redistribute it and/or
@@ -108,7 +106,7 @@ View table:
 
 use strict;
 use vars qw[ $DEBUG $VERSION $GRAMMAR @EXPORT_OK ];
-$VERSION = '1.99';
+$VERSION = '1.59';
 $DEBUG   = 0 unless defined $DEBUG;
 
 use Data::Dumper;
@@ -123,12 +121,9 @@ $::RD_ERRORS = 1; # Make sure the parser dies when it encounters an error
 $::RD_WARN   = 1; # Enable warnings. This will warn on unused rules &c.
 $::RD_HINT   = 1; # Give out hints to help fix problems.
 
-my $parser; # should we do this?  There's no programmic way to 
-            # change the grammar, so I think this is safe.
-
 $GRAMMAR = q!
 
-{ my ( %tables, $table_order, $field_order, @table_comments) }
+{ my ( %tables, @views, $table_order, $field_order, @table_comments) }
 
 #
 # The "eofile" rule makes the parser fail if any "statement" rule
@@ -136,7 +131,7 @@ $GRAMMAR = q!
 # won't cause the failure needed to know that the parse, as a whole,
 # failed. -ky
 #
-startrule : statement(s) eofile { \%tables }
+startrule : statement(s) eofile { { tables => \%tables, views => \@views } }
 
 eofile : /^\Z/
    
@@ -163,9 +158,9 @@ connect : /^\s*\\\connect.*\n/
 
 set : /set/i /[^;]*/ ';'
 
-revoke : /revoke/i WORD(s /,/) /on/i TABLE(?) table_name /from/i name_with_opt_quotes(s /,/) ';'
+revoke : /revoke/i WORD(s /,/) /on/i TABLE(?) table_id /from/i name_with_opt_quotes(s /,/) ';'
     {
-        my $table_info  = $item{'table_name'};
+        my $table_info  = $item{'table_id'};
         my $schema_name = $table_info->{'schema_name'};
         my $table_name  = $table_info->{'table_name'};
         push @{ $tables{ $table_name }{'permissions'} }, {
@@ -178,9 +173,9 @@ revoke : /revoke/i WORD(s /,/) /on/i TABLE(?) table_name /from/i name_with_opt_q
 revoke : /revoke/i WORD(s /,/) /on/i SCHEMA(?) schema_name /from/i name_with_opt_quotes(s /,/) ';'
     { 1 }
 
-grant : /grant/i WORD(s /,/) /on/i TABLE(?) table_name /to/i name_with_opt_quotes(s /,/) ';'
+grant : /grant/i WORD(s /,/) /on/i TABLE(?) table_id /to/i name_with_opt_quotes(s /,/) ';'
     {
-        my $table_info  = $item{'table_name'};
+        my $table_info  = $item{'table_id'};
         my $schema_name = $table_info->{'schema_name'};
         my $table_name  = $table_info->{'table_name'};
         push @{ $tables{ $table_name }{'permissions'} }, {
@@ -200,25 +195,25 @@ string :
 
 nonstring : /[^;\'"]+/
 
-statement_body : (string | nonstring)(s?)
+statement_body : string | nonstring
 
-insert : /insert/i statement_body ';'
+insert : /insert/i statement_body(s?) ';'
 
-update : /update/i statement_body ';'
+update : /update/i statement_body(s?) ';'
 
 #
 # Create table.
 #
-create : CREATE temporary_table(?) TABLE table_name '(' create_definition(s? /,/) ')' table_option(s?) ';'
+create : CREATE temporary(?) TABLE table_id '(' create_definition(s? /,/) ')' table_option(s?) ';'
     {
-        my $table_info  = $item{'table_name'};
+        my $table_info  = $item{'table_id'};
         my $schema_name = $table_info->{'schema_name'};
         my $table_name  = $table_info->{'table_name'};
         $tables{ $table_name }{'order'}       = ++$table_order;
         $tables{ $table_name }{'schema_name'} = $schema_name;
         $tables{ $table_name }{'table_name'}  = $table_name;
 
-        $tables{ $table_name }{'temporary'} = $item[2][0]; 
+        $tables{ $table_name }{'temporary'} = $item[2][0];
 
         if ( @table_comments ) {
             $tables{ $table_name }{'comments'} = [ @table_comments ];
@@ -254,9 +249,9 @@ create : CREATE temporary_table(?) TABLE table_name '(' create_definition(s? /,/
         1;
     }
 
-create : CREATE unique(?) /(index|key)/i index_name /on/i table_name using_method(?) '(' field_name(s /,/) ')' where_predicate(?) ';'
+create : CREATE unique(?) /(index|key)/i index_name /on/i table_id using_method(?) '(' field_name(s /,/) ')' where_predicate(?) ';'
     {
-        my $table_info  = $item{'table_name'};
+        my $table_info  = $item{'table_id'};
         my $schema_name = $table_info->{'schema_name'};
         my $table_name  = $table_info->{'table_name'};
         push @{ $tables{ $table_name }{'indices'} },
@@ -268,7 +263,17 @@ create : CREATE unique(?) /(index|key)/i index_name /on/i table_name using_metho
                 method    => $item{'using_method'}[0],
             }
         ;
+    }
 
+create : CREATE or_replace(?) temporary(?) VIEW view_id view_fields(?) /AS/i view_target ';'
+    {
+        push @views, {
+            schema_name  => $item{view_id}{schema_name},
+            view_name    => $item{view_id}{view_name},
+            sql          => $item{view_target},
+            fields       => $item[6],
+            is_temporary => $item[3][0],
+        }
     }
 
 #
@@ -294,9 +299,9 @@ comment : /^\s*(?:#|-{2})(.*)\n/
         push @table_comments, $comment;
     }
 
-comment_on_table : /comment/i /on/i /table/i table_name /is/i comment_phrase ';'
+comment_on_table : /comment/i /on/i /table/i table_id /is/i comment_phrase ';'
     {
-        my $table_info  = $item{'table_name'};
+        my $table_info  = $item{'table_id'};
         my $schema_name = $table_info->{'schema_name'};
         my $table_name  = $table_info->{'table_name'};
         push @{ $tables{ $table_name }{'comments'} }, $item{'comment_phrase'};
@@ -408,6 +413,9 @@ field_comment : /^\s*(?:#|-{2})(.*)\n/
 field_meta : default_val
     | column_constraint
 
+view_fields : '(' field_name(s /,/) ')'
+    { $return = join (',', @{$item[2]} ) }
+
 column_constraint : constraint_name(?) column_constraint_type deferrable(?) deferred(?)
     {
         my $desc       = $item{'column_constraint_type'};
@@ -446,9 +454,9 @@ column_constraint_type : /not null/i { $return = { type => 'not_null' } }
     /check/i '(' /[^)]+/ ')' 
         { $return = { type => 'check', expression => $item[3] } }
     |
-    /references/i table_name parens_word_list(?) match_type(?) key_action(s?)
+    /references/i table_id parens_word_list(?) match_type(?) key_action(s?)
     {
-        my $table_info  = $item{'table_name'};
+        my $table_info  = $item{'table_id'};
         my $schema_name = $table_info->{'schema_name'};
         my $table_name  = $table_info->{'table_name'};
         my ( $on_delete, $on_update );
@@ -467,11 +475,27 @@ column_constraint_type : /not null/i { $return = { type => 'not_null' } }
         }
     }
 
-table_name : schema_qualification(?) name_with_opt_quotes {
-    $return = { schema_name => $item[1], table_name => $item[2] }
+table_id : schema_qualification(?) name_with_opt_quotes {
+    $return = { schema_name => $item[1][0], table_name => $item[2] }
+}
+
+view_id : schema_qualification(?) name_with_opt_quotes {
+    $return = { schema_name => $item[1][0], view_name => $item[2] }
+}
+
+view_target : /select|with/i /[^;]+/ {
+    $return = "$item[1] $item[2]";
+}
+
+# SELECT views _may_ support outer parens, and we used to produce
+# such sql, although non-standard. Use ugly lookeahead to parse
+view_target : '('   /select/i    / [^;]+ (?= \) ) /x    ')'    {
+    $return = "$item[2] $item[3]"
 }
 
-  schema_qualification : name_with_opt_quotes '.'
+view_target_spec :  
+
+schema_qualification : name_with_opt_quotes '.'
 
 schema_name : name_with_opt_quotes
 
@@ -481,7 +505,7 @@ name_with_opt_quotes : double_quote(?) NAME double_quote(?) { $item[2] }
 
 double_quote: /"/
 
-index_name : WORD
+index_name : name_with_opt_quotes
 
 data_type : pg_data_type parens_value_list(?)
     { 
@@ -627,7 +651,7 @@ table_constraint : comment(s?) constraint_name(?) table_constraint_type deferrab
         my @comments   = ( @{ $item[1] }, @{ $item[-1] } );
 
         $return              =  {
-            name             => $item{'constraint_name'}[0] || '',
+            name             => $item[2][0] || '',
             supertype        => 'constraint',
             type             => $type,
             fields           => $type ne 'check' ? $fields : [],
@@ -636,7 +660,7 @@ table_constraint : comment(s?) constraint_name(?) table_constraint_type deferrab
             deferred         => $item{'deferred'},
             reference_table  => $desc->{'reference_table'},
             reference_fields => $desc->{'reference_fields'},
-            match_type       => $desc->{'match_type'}[0],
+            match_type       => $desc->{'match_type'},
             on_delete        => $desc->{'on_delete'} || $desc->{'on_delete_do'},
             on_update        => $desc->{'on_update'} || $desc->{'on_update_do'},
             comments         => [ @comments ],
@@ -667,7 +691,7 @@ table_constraint_type : /primary key/i '(' name_with_opt_quotes(s /,/) ')'
         }
     }
     |
-    /foreign key/i '(' name_with_opt_quotes(s /,/) ')' /references/i table_name parens_word_list(?) match_type(?) key_action(s?)
+    /foreign key/i '(' name_with_opt_quotes(s /,/) ')' /references/i table_id parens_word_list(?) match_type(?) key_action(s?)
     {
         my ( $on_delete, $on_update );
         for my $action ( @{ $item[9] || [] } ) {
@@ -694,9 +718,7 @@ deferrable : not(?) /deferrable/i
 
 deferred : /initially/i /(deferred|immediate)/i { $item[2] }
 
-match_type : /match full/i { 'match_full' }
-    |
-    /match partial/i { 'match_partial' }
+match_type : /match/i /partial|full|simple/i { $item[2] }
 
 key_action : key_delete 
     |
@@ -728,7 +750,7 @@ key_mutation : /no action/i { $return = 'no_action' }
     |
     /set default/i { $return = 'set default' }
 
-alter : alter_table table_name add_column field ';' 
+alter : alter_table table_id add_column field ';' 
     { 
         my $field_def = $item[4];
         $tables{ $item[2]->{'table_name'} }{'fields'}{ $field_def->{'name'} } = {
@@ -737,7 +759,7 @@ alter : alter_table table_name add_column field ';'
         1;
     }
 
-alter : alter_table table_name ADD table_constraint ';' 
+alter : alter_table table_id ADD table_constraint ';' 
     { 
         my $table_name = $item[2]->{'table_name'};
         my $constraint = $item[4];
@@ -745,13 +767,13 @@ alter : alter_table table_name ADD table_constraint ';'
         1;
     }
 
-alter : alter_table table_name drop_column NAME restrict_or_cascade(?) ';' 
+alter : alter_table table_id drop_column NAME restrict_or_cascade(?) ';' 
     {
         $tables{ $item[2]->{'table_name'} }{'fields'}{ $item[4] }{'drop'} = 1;
         1;
     }
 
-alter : alter_table table_name alter_column NAME alter_default_val ';' 
+alter : alter_table table_id alter_column NAME alter_default_val ';' 
     {
         $tables{ $item[2]->{'table_name'} }{'fields'}{ $item[4] }{'default'} = 
             $item[5]->{'value'};
@@ -761,22 +783,22 @@ alter : alter_table table_name alter_column NAME alter_default_val ';'
 #
 # These will just parse for now but won't affect the structure. - ky
 #
-alter : alter_table table_name /rename/i /to/i NAME ';'
+alter : alter_table table_id /rename/i /to/i NAME ';'
     { 1 }
 
-alter : alter_table table_name alter_column NAME SET /statistics/i INTEGER ';' 
+alter : alter_table table_id alter_column NAME SET /statistics/i INTEGER ';' 
     { 1 }
 
-alter : alter_table table_name alter_column NAME SET /storage/i storage_type ';'
+alter : alter_table table_id alter_column NAME SET /storage/i storage_type ';'
     { 1 }
 
-alter : alter_table table_name rename_column NAME /to/i NAME ';'
+alter : alter_table table_id rename_column NAME /to/i NAME ';'
     { 1 }
 
-alter : alter_table table_name DROP /constraint/i NAME restrict_or_cascade ';'
+alter : alter_table table_id DROP /constraint/i NAME restrict_or_cascade ';'
     { 1 }
 
-alter : alter_table table_name /owner/i /to/i NAME ';'
+alter : alter_table table_id /owner/i /to/i NAME ';'
     { 1 }
 
 alter : alter_sequence NAME /owned/i /by/i column_name ';'
@@ -784,12 +806,12 @@ alter : alter_sequence NAME /owned/i /by/i column_name ';'
 
 storage_type : /(plain|external|extended|main)/i
 
-temporary: /temp(orary)?\\b/i
+temporary : /temp(orary)?\\b/i
+  {
+    1;
+  }
 
-temporary_table: temporary
-    {
-        1;
-    }
+or_replace : /or replace/i
 
 alter_default_val : SET default_val 
     { 
@@ -807,7 +829,7 @@ alter_default_val : SET default_val
 # particular order.  I'm going to leave the rule but disable the code 
 # for now. - ky
 #
-alter : alter_table table_name alter_column NAME alter_nullable ';'
+alter : alter_table table_id alter_column NAME alter_nullable ';'
     {
 #        my $table_name  = $item[2]->{'table_name'};
 #        my $field_name  = $item[4];
@@ -945,6 +967,8 @@ COLUMN : /column/i
 
 TABLE : /table/i
 
+VIEW : /view/i
+
 SCHEMA : /schema/i
 
 SEMICOLON : /\s*;\n?/
@@ -984,7 +1008,7 @@ VALUE   : /[-+]?\.?\d+(?:[eE]\d+)?/
 # -------------------------------------------------------------------
 sub parse {
     my ( $translator, $data ) = @_;
-    $parser ||= Parse::RecDescent->new($GRAMMAR);
+    my $parser = Parse::RecDescent->new($GRAMMAR);
 
     $::RD_TRACE  = $translator->trace ? 1 : undef;
     $DEBUG       = $translator->debug;
@@ -1000,11 +1024,11 @@ sub parse {
 
     my $schema = $translator->schema;
     my @tables = sort { 
-        ( $result->{ $a }{'order'} || 0 ) <=> ( $result->{ $b }{'order'} || 0 )
-    } keys %{ $result };
+        ( $result->{tables}{ $a }{'order'} || 0 ) <=> ( $result->{tables}{ $b }{'order'} || 0 )
+    } keys %{ $result->{tables} };
 
     for my $table_name ( @tables ) {
-        my $tdata =  $result->{ $table_name };
+        my $tdata =  $result->{tables}{ $table_name };
         my $table =  $schema->add_table( 
             #schema => $tdata->{'schema_name'},
             name   => $tdata->{'table_name'},
@@ -1067,6 +1091,18 @@ sub parse {
         }
     }
 
+    for my $vinfo (@{$result->{views}}) {
+      my $sql = $vinfo->{sql};
+      $sql =~ s/\A\s+|\s+\z//g;
+      my $view = $schema->add_view (
+        name => $vinfo->{view_name},
+        sql => $sql,
+        fields => $vinfo->{fields},
+      );
+
+      $view->extra ( temporary => 1 ) if $vinfo->{is_temporary};
+    }
+
     return 1;
 }