X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FSQL%2FTranslator%2FParser%2FPostgreSQL.pm;h=5a66cecf70a76bfe1516c4958b30f8c65c205471;hb=7d8f0a61b9fbd54e85625c0f9857fc000ae11bfd;hp=1076934297fff2038d7f77ad1ad9c394c9a48c91;hpb=c4c363bbbde0efda0304ca71010d1d7d66c896a7;p=dbsrgits%2FSQL-Translator.git diff --git a/lib/SQL/Translator/Parser/PostgreSQL.pm b/lib/SQL/Translator/Parser/PostgreSQL.pm index 1076934..5a66cec 100644 --- a/lib/SQL/Translator/Parser/PostgreSQL.pm +++ b/lib/SQL/Translator/Parser/PostgreSQL.pm @@ -1,9 +1,7 @@ package SQL::Translator::Parser::PostgreSQL; # ------------------------------------------------------------------- -# $Id: PostgreSQL.pm,v 1.41 2004-09-17 21:53:35 kycl4rk Exp $ -# ------------------------------------------------------------------- -# Copyright (C) 2002-4 SQLFairy Authors +# Copyright (C) 2002-2009 SQLFairy Authors # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License as @@ -108,7 +106,7 @@ View table: use strict; use vars qw[ $DEBUG $VERSION $GRAMMAR @EXPORT_OK ]; -$VERSION = sprintf "%d.%02d", q$Revision: 1.41 $ =~ /(\d+)\.(\d+)/; +$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,13 +131,15 @@ $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/ + statement : create | comment_on_table | comment_on_column + | comment_on_other | comment | alter | grant @@ -152,15 +149,20 @@ statement : create | connect | update | set + | select + | copy + | readin_symbol | 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_name = $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'} }, { type => 'revoke', actions => $item[2], @@ -168,9 +170,14 @@ revoke : /revoke/i WORD(s /,/) /on/i TABLE(?) table_name /from/i name_with_opt_q } } -grant : /grant/i WORD(s /,/) /on/i TABLE(?) table_name /to/i name_with_opt_quotes(s /,/) ';' +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_id /to/i name_with_opt_quotes(s /,/) ';' { - my $table_name = $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'} }, { type => 'grant', actions => $item[2], @@ -178,20 +185,35 @@ grant : /grant/i WORD(s /,/) /on/i TABLE(?) table_name /to/i name_with_opt_quote } } +grant : /grant/i WORD(s /,/) /on/i SCHEMA(?) schema_name /to/i name_with_opt_quotes(s /,/) ';' + { 1 } + drop : /drop/i /[^;]*/ ';' -insert : /insert/i /[^;]*/ ';' +string : + /'(\\.|''|[^\\\'])*'/ + +nonstring : /[^;\'"]+/ + +statement_body : string | nonstring + +insert : /insert/i statement_body(s?) ';' -update : /update/i /[^;]*/ ';' +update : /update/i statement_body(s?) ';' # # Create table. # -create : create_table table_name '(' create_definition(s /,/) ')' table_option(s?) ';' +create : CREATE temporary(?) TABLE table_id '(' create_definition(s? /,/) ')' table_option(s?) ';' { - my $table_name = $item{'table_name'}; - $tables{ $table_name }{'order'} = ++$table_order; - $tables{ $table_name }{'table_name'} = $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]; if ( @table_comments ) { $tables{ $table_name }{'comments'} = [ @table_comments ]; @@ -199,7 +221,7 @@ create : create_table table_name '(' create_definition(s /,/) ')' table_option(s } my @constraints; - for my $definition ( @{ $item[4] } ) { + for my $definition ( @{ $item[6] } ) { if ( $definition->{'supertype'} eq 'field' ) { my $field_name = $definition->{'name'}; $tables{ $table_name }{'fields'}{ $field_name } = @@ -219,7 +241,7 @@ create : create_table table_name '(' create_definition(s /,/) ')' table_option(s } } - for my $option ( @{ $item[6] } ) { + for my $option ( @{ $item[8] } ) { $tables{ $table_name }{'table_options(s?)'}{ $option->{'type'} } = $option; } @@ -227,9 +249,12 @@ create : create_table table_name '(' create_definition(s /,/) ')' table_option(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(?) ';' { - push @{ $tables{ $item{'table_name'} }{'indices'} }, + 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'} }, { name => $item{'index_name'}, supertype => $item{'unique'}[0] ? 'constraint' : 'index', @@ -238,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], + } } # @@ -264,23 +299,67 @@ 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 ';' { - push @{ $tables{ $item{'table_name'} }{'comments'} }, $item{'comment_phrase'}; + 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'}; } comment_on_column : /comment/i /on/i /column/i column_name /is/i comment_phrase ';' { my $table_name = $item[4]->{'table'}; my $field_name = $item[4]->{'field'}; - push @{ $tables{ $table_name }{'fields'}{ $field_name }{'comments'} }, - $item{'comment_phrase'}; + if ($tables{ $table_name }{'fields'}{ $field_name } ) { + push @{ $tables{ $table_name }{'fields'}{ $field_name }{'comments'} }, + $item{'comment_phrase'}; + } + else { + die "No such column as $table_name.$field_name"; + } } +comment_on_other : /comment/i /on/i /\w+/ /\w+/ /is/i comment_phrase ';' + { + push(@table_comments, $item{'comment_phrase'}); + } + +# [added by cjm 20041019] +# [TODO: other comment-on types] +# for now we just have a general mechanism for handling other +# kinds of comments than table/column; I'm not sure of the best +# way to incorporate these into the datamodel +# +# this is the exhaustive list of types of comment: +#COMMENT ON DATABASE my_database IS 'Development Database'; +#COMMENT ON INDEX my_index IS 'Enforces uniqueness on employee id'; +#COMMENT ON RULE my_rule IS 'Logs UPDATES of employee records'; +#COMMENT ON SEQUENCE my_sequence IS 'Used to generate primary keys'; +#COMMENT ON TABLE my_table IS 'Employee Information'; +#COMMENT ON TYPE my_type IS 'Complex Number support'; +#COMMENT ON VIEW my_view IS 'View of departmental costs'; +#COMMENT ON COLUMN my_table.my_field IS 'Employee ID number'; +#COMMENT ON TRIGGER my_trigger ON my_table IS 'Used for R.I.'; +# +# this is tested by test 08 + column_name : NAME '.' NAME { $return = { table => $item[1], field => $item[3] } } -comment_phrase : /'.*?'|NULL/ +comment_phrase : /null/i + { $return = 'NULL' } + +comment_phrase : /'/ comment_phrase_unquoted(s) /'/ + { my $phrase = join(' ', @{ $item[2] }); + $return = $phrase} + +# [cjm TODO: double-single quotes in a comment_phrase] +comment_phrase_unquoted : /[^\']*/ + { $return = $item[1] } + + +xxxcomment_phrase : /'.*?'|NULL/ { my $val = $item[1] || ''; $val =~ s/^'|'$//g; @@ -334,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'}; @@ -351,8 +433,8 @@ column_constraint : constraint_name(?) column_constraint_type deferrable(?) defe reference_table => $desc->{'reference_table'}, reference_fields => $desc->{'reference_fields'}, match_type => $desc->{'match_type'}, - on_delete_do => $desc->{'on_delete_do'}, - on_update_do => $desc->{'on_update_do'}, + on_delete => $desc->{'on_delete'} || $desc->{'on_delete_do'}, + on_update => $desc->{'on_update'} || $desc->{'on_update_do'}, } } @@ -372,8 +454,11 @@ 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_id'}; + my $schema_name = $table_info->{'schema_name'}; + my $table_name = $table_info->{'table_name'}; my ( $on_delete, $on_update ); for my $action ( @{ $item[5] || [] } ) { $on_delete = $action->{'action'} if $action->{'type'} eq 'delete'; @@ -382,15 +467,37 @@ column_constraint_type : /not null/i { $return = { type => 'not_null' } } $return = { type => 'foreign_key', - reference_table => $item[2], + reference_table => $table_name, reference_fields => $item[3][0], match_type => $item[4][0], - on_delete_do => $on_delete, - on_update_do => $on_update, + on_delete => $on_delete, + on_update => $on_update, } } -table_name : name_with_opt_quotes +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]" +} + +view_target_spec : + +schema_qualification : name_with_opt_quotes '.' + +schema_name : name_with_opt_quotes field_name : name_with_opt_quotes @@ -398,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(?) { @@ -503,12 +610,7 @@ pg_data_type : $return = { type => 'bytea' }; } | - /(timestamptz|timestamp)( with time zone)?/i - { - $return = { type => 'timestamp' }; - } - | - /(timestamptz|timestamp)( without time zone)?/i + /(timestamptz|timestamp)(?:\(\d\))?( with(out)? time zone)?/i { $return = { type => 'timestamp' }; } @@ -529,7 +631,8 @@ pg_data_type : parens_value_list : '(' VALUE(s /,/) ')' { $item[2] } -parens_word_list : '(' WORD(s /,/) ')' + +parens_word_list : '(' name_with_opt_quotes(s /,/) ')' { $item[2] } field_size : '(' num_range ')' { $item{'num_range'} } @@ -548,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 : [], @@ -558,8 +661,8 @@ table_constraint : comment(s?) constraint_name(?) table_constraint_type deferrab reference_table => $desc->{'reference_table'}, reference_fields => $desc->{'reference_fields'}, match_type => $desc->{'match_type'}[0], - on_delete_do => $desc->{'on_delete_do'}, - on_update_do => $desc->{'on_update_do'}, + on_delete => $desc->{'on_delete'} || $desc->{'on_delete_do'}, + on_update => $desc->{'on_update'} || $desc->{'on_update_do'}, comments => [ @comments ], } } @@ -588,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] || [] } ) { @@ -600,15 +703,15 @@ table_constraint_type : /primary key/i '(' name_with_opt_quotes(s /,/) ')' supertype => 'constraint', type => 'foreign_key', fields => $item[3], - reference_table => $item[6], + reference_table => $item[6]->{'table_name'}, reference_fields => $item[7][0], match_type => $item[8][0], - on_delete_do => $on_delete || '', - on_update_do => $on_update || '', + on_delete => $on_delete || '', + on_update => $on_update || '', } } -deferrable : /not/i /deferrable/i +deferrable : not(?) /deferrable/i { $return = ( $item[1] =~ /not/i ) ? 0 : 1; } @@ -649,32 +752,32 @@ 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] }{'fields'}{ $field_def->{'name'} } = { + $tables{ $item[2]->{'table_name'} }{'fields'}{ $field_def->{'name'} } = { %$field_def, order => $field_order++ }; 1; } -alter : alter_table table_name ADD table_constraint ';' +alter : alter_table table_id ADD table_constraint ';' { - my $table_name = $item[2]; + my $table_name = $item[2]->{'table_name'}; my $constraint = $item[4]; push @{ $tables{ $table_name }{'constraints'} }, $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] }{'fields'}{ $item[4] }{'drop'} = 1; + $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] }{'fields'}{ $item[4] }{'default'} = + $tables{ $item[2]->{'table_name'} }{'fields'}{ $item[4] }{'default'} = $item[5]->{'value'}; 1; } @@ -682,26 +785,36 @@ 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_id alter_column NAME SET /statistics/i INTEGER ';' { 1 } -alter : alter_table table_name alter_column NAME SET /statistics/i INTEGER ';' +alter : alter_table table_id alter_column NAME SET /storage/i storage_type ';' { 1 } -alter : alter_table table_name alter_column NAME SET /storage/i storage_type ';' +alter : alter_table table_id rename_column NAME /to/i NAME ';' { 1 } -alter : alter_table table_name rename_column NAME /to/i NAME ';' +alter : alter_table table_id DROP /constraint/i NAME restrict_or_cascade ';' { 1 } -alter : alter_table table_name DROP /constraint/i NAME restrict_or_cascade ';' +alter : alter_table table_id /owner/i /to/i NAME ';' { 1 } -alter : alter_table table_name /owner/i /to/i NAME ';' +alter : alter_sequence NAME /owned/i /by/i column_name ';' { 1 } storage_type : /(plain|external|extended|main)/i +temporary : /temp(orary)?\\b/i + { + 1; + } + +or_replace : /or replace/i + alter_default_val : SET default_val { $return = { value => $item[2]->{'value'} } @@ -718,9 +831,9 @@ 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]; +# my $table_name = $item[2]->{'table_name'}; # my $field_name = $item[4]; # my $is_nullable = $item[5]->{'is_nullable'}; # @@ -761,10 +874,14 @@ alter_nullable : SET not_null not_null : /not/i /null/i +not : /not/i + add_column : ADD COLUMN(?) alter_table : ALTER TABLE ONLY(?) +alter_sequence : ALTER SEQUENCE + drop_column : DROP COLUMN(?) alter_column : ALTER COLUMN(?) @@ -774,6 +891,24 @@ rename_column : /rename/i COLUMN(?) restrict_or_cascade : /restrict/i | /cascade/i +# Handle functions that can be called +select : SELECT select_function ';' + { 1 } + +# Read the setval function but don't do anything with it because this parser +# isn't handling sequences +select_function : schema_qualification(?) /setval/i '(' VALUE /,/ VALUE /,/ /(true|false)/i ')' + { 1 } + +# Skipping all COPY commands +copy : COPY WORD /[^;]+/ ';' { 1 } + { 1 } + +# The "\." allows reading in from STDIN but this isn't needed for schema +# creation, so it is skipped. +readin_symbol : '\.' + {1} + # # End basically useless stuff. - ky # @@ -782,7 +917,7 @@ create_table : CREATE TABLE create_index : CREATE /index/i -default_val : DEFAULT /(\d+|'[^']*'|\w+\(.*?\))|\w+/ +default_val : DEFAULT /(\d+|'[^']*'|\w+\(.*\))|\w+/ { my $val = defined $item[2] ? $item[2] : ''; $val =~ s/^'|'$//g; @@ -834,8 +969,18 @@ COLUMN : /column/i TABLE : /table/i +VIEW : /view/i + +SCHEMA : /schema/i + SEMICOLON : /\s*;\n?/ +SEQUENCE : /sequence/i + +SELECT : /select/i + +COPY : /copy/i + INTEGER : /\d+/ WORD : /\w+/ @@ -865,7 +1010,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; @@ -881,15 +1026,18 @@ 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( - name => $tdata->{'table_name'}, + #schema => $tdata->{'schema_name'}, + name => $tdata->{'table_name'}, ) or die "Couldn't create table '$table_name': " . $schema->error; + $table->extra(temporary => 1) if $tdata->{'temporary'}; + $table->comments( $tdata->{'comments'} ); my @fields = sort { @@ -925,7 +1073,7 @@ sub parse { name => $idata->{'name'}, type => uc $idata->{'type'}, fields => $idata->{'fields'}, - ) or die $table->error; + ) or die $table->error . ' ' . $table->name; } for my $cdata ( @{ $tdata->{'constraints'} || [] } ) { @@ -936,8 +1084,8 @@ sub parse { reference_table => $cdata->{'reference_table'}, reference_fields => $cdata->{'reference_fields'}, match_type => $cdata->{'match_type'} || '', - on_delete => $cdata->{'on_delete_do'}, - on_update => $cdata->{'on_update_do'}, + on_delete => $cdata->{'on_delete'} || $cdata->{'on_delete_do'}, + on_update => $cdata->{'on_update'} || $cdata->{'on_update_do'}, expression => $cdata->{'expression'}, ) or die "Can't add constraint of type '" . $cdata->{'type'} . "' to table '" . $table->name . @@ -945,6 +1093,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; }