X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FSQL%2FTranslator%2FParser%2FPostgreSQL.pm;h=6a83b8882a5ce9f1644463c234600f9b2475070a;hb=d4f84dd192edc7a64a0b1a9923f1bafc0bc5ef9d;hp=58e46423e3ef369fff50924a6facba784568f6c1;hpb=e4a9818dd51f752673818986e0419f25ad9f9357;p=dbsrgits%2FSQL-Translator.git diff --git a/lib/SQL/Translator/Parser/PostgreSQL.pm b/lib/SQL/Translator/Parser/PostgreSQL.pm index 58e4642..6a83b88 100644 --- a/lib/SQL/Translator/Parser/PostgreSQL.pm +++ b/lib/SQL/Translator/Parser/PostgreSQL.pm @@ -1,9 +1,9 @@ package SQL::Translator::Parser::PostgreSQL; # ------------------------------------------------------------------- -# $Id: PostgreSQL.pm,v 1.42 2004-10-23 19:58:19 cmungall Exp $ +# $Id: PostgreSQL.pm 1440 2009-01-17 16:31:57Z jawnsy $ # ------------------------------------------------------------------- -# 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 @@ -107,8 +107,7 @@ View table: =cut use strict; -use vars qw[ $DEBUG $VERSION $GRAMMAR @EXPORT_OK ]; -$VERSION = sprintf "%d.%02d", q$Revision: 1.42 $ =~ /(\d+)\.(\d+)/; +use vars qw[ $DEBUG $GRAMMAR @EXPORT_OK ]; $DEBUG = 0 unless defined $DEBUG; use Data::Dumper; @@ -154,6 +153,9 @@ statement : create | connect | update | set + | select + | copy + | readin_symbol | connect : /^\s*\\\connect.*\n/ @@ -162,7 +164,9 @@ set : /set/i /[^;]*/ ';' revoke : /revoke/i WORD(s /,/) /on/i TABLE(?) table_name /from/i name_with_opt_quotes(s /,/) ';' { - my $table_name = $item{'table_name'}; + my $table_info = $item{'table_name'}; + my $schema_name = $table_info->{'schema_name'}; + my $table_name = $table_info->{'table_name'}; push @{ $tables{ $table_name }{'permissions'} }, { type => 'revoke', actions => $item[2], @@ -170,9 +174,14 @@ 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 /,/) ';' { - my $table_name = $item{'table_name'}; + my $table_info = $item{'table_name'}; + my $schema_name = $table_info->{'schema_name'}; + my $table_name = $table_info->{'table_name'}; push @{ $tables{ $table_name }{'permissions'} }, { type => 'grant', actions => $item[2], @@ -180,20 +189,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 : /[^;\'"]+/ -update : /update/i /[^;]*/ ';' +statement_body : (string | nonstring)(s?) + +insert : /insert/i statement_body ';' + +update : /update/i statement_body ';' # # Create table. # -create : create_table table_name '(' create_definition(s /,/) ')' table_option(s?) ';' +create : CREATE temporary_table(?) TABLE table_name '(' 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_name'}; + 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 ]; @@ -201,7 +225,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 } = @@ -221,7 +245,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; } @@ -231,7 +255,10 @@ create : create_table table_name '(' create_definition(s /,/) ')' table_option(s create : CREATE unique(?) /(index|key)/i index_name /on/i table_name using_method(?) '(' field_name(s /,/) ')' where_predicate(?) ';' { - push @{ $tables{ $item{'table_name'} }{'indices'} }, + my $table_info = $item{'table_name'}; + 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', @@ -268,15 +295,23 @@ comment : /^\s*(?:#|-{2})(.*)\n/ comment_on_table : /comment/i /on/i /table/i table_name /is/i comment_phrase ';' { - push @{ $tables{ $item{'table_name'} }{'comments'} }, $item{'comment_phrase'}; + my $table_info = $item{'table_name'}; + 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 ';' @@ -389,8 +424,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'}, } } @@ -412,6 +447,9 @@ column_constraint_type : /not null/i { $return = { type => 'not_null' } } | /references/i table_name parens_word_list(?) match_type(?) key_action(s?) { + my $table_info = $item{'table_name'}; + 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'; @@ -420,15 +458,21 @@ 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_name : schema_qualification(?) name_with_opt_quotes { + $return = { schema_name => $item[1], table_name => $item[2] } +} + + schema_qualification : name_with_opt_quotes '.' + +schema_name : name_with_opt_quotes field_name : name_with_opt_quotes @@ -541,12 +585,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' }; } @@ -567,7 +606,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'} } @@ -596,8 +636,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 ], } } @@ -638,15 +678,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; } @@ -690,7 +730,7 @@ key_mutation : /no action/i { $return = 'no_action' } alter : alter_table table_name 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; @@ -698,7 +738,7 @@ alter : alter_table table_name add_column field ';' alter : alter_table table_name 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; @@ -706,13 +746,13 @@ alter : alter_table table_name ADD table_constraint ';' alter : alter_table table_name 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 ';' { - $tables{ $item[2] }{'fields'}{ $item[4] }{'default'} = + $tables{ $item[2]->{'table_name'} }{'fields'}{ $item[4] }{'default'} = $item[5]->{'value'}; 1; } @@ -738,8 +778,18 @@ alter : alter_table table_name DROP /constraint/i NAME restrict_or_cascade ';' alter : alter_table table_name /owner/i /to/i NAME ';' { 1 } +alter : alter_sequence NAME /owned/i /by/i column_name ';' + { 1 } + storage_type : /(plain|external|extended|main)/i +temporary: /temp(orary)?\\b/i + +temporary_table: temporary + { + 1; + } + alter_default_val : SET default_val { $return = { value => $item[2]->{'value'} } @@ -758,7 +808,7 @@ alter_default_val : SET default_val # alter : alter_table table_name 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'}; # @@ -799,10 +849,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(?) @@ -812,6 +866,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 # @@ -820,7 +892,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; @@ -872,8 +944,16 @@ COLUMN : /column/i TABLE : /table/i +SCHEMA : /schema/i + SEMICOLON : /\s*;\n?/ +SEQUENCE : /sequence/i + +SELECT : /select/i + +COPY : /copy/i + INTEGER : /\d+/ WORD : /\w+/ @@ -925,9 +1005,12 @@ sub parse { for my $table_name ( @tables ) { my $tdata = $result->{ $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 { @@ -963,7 +1046,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'} || [] } ) { @@ -974,8 +1057,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 .