X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FSQL%2FTranslator%2FParser%2FOracle.pm;h=ddb6b3f3471cae9a24f3279c8fd08997534b7f0e;hb=44659089c28216f1984873bc4aa8641e2e0e3410;hp=45aa5e01cc25eea4dcaa335a01a82a54a8d56630;hpb=c4222efdca76000d079586f8cbc5fad5cd8c40eb;p=dbsrgits%2FSQL-Translator.git diff --git a/lib/SQL/Translator/Parser/Oracle.pm b/lib/SQL/Translator/Parser/Oracle.pm index 45aa5e0..ddb6b3f 100644 --- a/lib/SQL/Translator/Parser/Oracle.pm +++ b/lib/SQL/Translator/Parser/Oracle.pm @@ -1,9 +1,7 @@ package SQL::Translator::Parser::Oracle; # ------------------------------------------------------------------- -# $Id: Oracle.pm,v 1.23 2006-05-03 21:46:06 duality72 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 @@ -97,7 +95,7 @@ was altered to better handle the syntax created by DDL::Oracle. use strict; use vars qw[ $DEBUG $VERSION $GRAMMAR @EXPORT_OK ]; -$VERSION = sprintf "%d.%02d", q$Revision: 1.23 $ =~ /(\d+)\.(\d+)/; +$VERSION = '1.59'; $DEBUG = 0 unless defined $DEBUG; use Data::Dumper; @@ -112,11 +110,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; - $GRAMMAR = q` -{ my ( %tables, %indices, %constraints, $table_order, @table_comments ) } +{ my ( %tables, %indices, %constraints, $table_order, @table_comments, %views, $view_order, %procedures, $proc_order ) } # # The "eofile" rule makes the parser fail if any "statement" rule @@ -130,6 +126,8 @@ startrule : statement(s) eofile tables => \%tables, indices => \%indices, constraints => \%constraints, + views => \%views, + procedures => \%procedures, }; } @@ -223,12 +221,44 @@ index_expr: parens_word_list $return = "$item[2]($arg_list)"; } +create : /create/i /or replace/i /procedure/i table_name not_end m#^/$#im + { + @table_comments = (); + my $proc_name = $item[4]; + # Hack to strip owner from procedure name + $proc_name =~ s#.*\.##; + my $owner = ''; + my $sql = "$item[1] $item[2] $item[3] $item[4] $item[5]"; + + $procedures{ $proc_name }{'order'} = ++$proc_order; + $procedures{ $proc_name }{'name'} = $proc_name; + $procedures{ $proc_name }{'owner'} = $owner; + $procedures{ $proc_name }{'sql'} = $sql; + } + +not_end: m#.*?(?=^/$)#ism + +create : /create/i /or replace/i /force/i /view/i table_name not_delimiter ';' + { + @table_comments = (); + my $view_name = $item[5]; + # Hack to strip owner from view name + $view_name =~ s#.*\.##; + my $sql = "$item[1] $item[2] $item[3] $item[4] $item[5] $item[6] $item[7]"; + + $views{ $view_name }{'order'} = ++$view_order; + $views{ $view_name }{'name'} = $view_name; + $views{ $view_name }{'sql'} = $sql; + } + +not_delimiter: /.*?(?=;)/is + # Create anything else (e.g., domain, function, etc.) create : ...!create_table ...!create_index /create/i WORD /[^;]+/ ';' { @table_comments = () } create_index : /create/i UNIQUE(?) /index/i - { $return = $item[2] } + { $return = @{$item[2]} } index_name : NAME '.' NAME { $item[3] } @@ -242,8 +272,8 @@ table_name : NAME '.' NAME | NAME { $item[1] } -create_definition : field - | table_constraint +create_definition : table_constraint + | field | table_comment : comment @@ -363,8 +393,8 @@ column_constraint : constraint_name(?) column_constraint_type constraint_state(s name => $item{'constraint_name(?)'}[0] || '', type => $type, expression => $type eq 'check' ? $expression : '', - deferrable => $item{'deferrable'}, - deferred => $item{'deferred'}, + deferrable => $desc->{'deferrable'}, + deferred => $desc->{'deferred'}, reference_table => $desc->{'reference_table'}, reference_fields => $desc->{'reference_fields'}, # match_type => $desc->{'match_type'}, @@ -375,14 +405,17 @@ column_constraint : constraint_name(?) column_constraint_type constraint_state(s constraint_name : /constraint/i NAME { $item[2] } column_constraint_type : /not\s+null/i { $return = { type => 'not_null' } } - | /null/ - { $return = { type => 'null' } } - | /unique/ + | /unique/i { $return = { type => 'unique' } } | /primary\s+key/i { $return = { type => 'primary_key' } } - | /check/i '(' /[^)]+/ ')' - { $return = { type => 'check', expression => $item[3] } } + | /check/i check_expression + { + $return = { + type => 'check', + expression => $item[2], + }; + } | /references/i table_name parens_word_list(?) on_delete(?) { $return = { @@ -394,6 +427,18 @@ column_constraint_type : /not\s+null/i { $return = { type => 'not_null' } } } } +LPAREN : '(' + +RPAREN : ')' + +check_condition_text : /.+\s+in\s+\([^)]+\)/i + | /[^)]+/ + +check_expression : LPAREN check_condition_text RPAREN + { $return = join( ' ', map { $_ || () } + $item[1], $item[2], $item[3], $item[4][0] ) + } + constraint_state : deferrable { $return = { type => $item[1] } } | deferred { $return = { type => $item[1] } } | /(no)?rely/i { $return = { type => $item[1] } } @@ -430,7 +475,7 @@ ora_data_type : | /long\s+raw/i { $return = 'long raw' } | - /(long|date|timestamp|raw|rowid|urowid|mlslabel|clob|nclob|blob|bfile|float)/i { $item[1] } + /(long|date|timestamp|raw|rowid|urowid|mlslabel|clob|nclob|blob|bfile|float|double)/i { $item[1] } parens_value_list : '(' VALUE(s /,/) ')' { $item[2] } @@ -451,6 +496,14 @@ default_val : /default/i /(?:')?[\w\d.-]*(?:')?/ value => $val, } } + | /null/i + { + $return = { + supertype => 'constraint', + type => 'default', + value => 'NULL', + } + } create_table : /create/i global_temporary(?) /table/i @@ -517,11 +570,11 @@ table_constraint_type : /primary key/i '(' NAME(s /,/) ')' } } | - /check/ '(' /(.+)/ ')' + /check/i check_expression /^(en|dis)able/i { $return = { type => 'check', - expression => $item[3], + expression => join(' ', $item[2], $item[3]), } } | @@ -532,14 +585,14 @@ table_constraint_type : /primary key/i '(' NAME(s /,/) ')' fields => $item[3], reference_table => $item[6], reference_fields => $item[7][0], - match_type => $item[8][0], - on_delete => $item[9][0], - on_update => $item[10][0], +# match_type => $item[8][0], + on_delete => $item[8][0], +# on_update => $item[9][0], } } on_delete : /on delete/i WORD(s) - { $item[2] } + { join(' ', @{$item[2]}) } UNIQUE : /unique/i { $return = 1 } @@ -561,7 +614,7 @@ VALUE : /[-+]?\.?\d+(?:[eE]\d+)?/ # ------------------------------------------------------------------- sub parse { my ( $translator, $data ) = @_; - $parser ||= Parse::RecDescent->new($GRAMMAR); + my $parser = Parse::RecDescent->new($GRAMMAR); local $::RD_TRACE = $translator->trace ? 1 : undef; local $DEBUG = $translator->debug; @@ -632,14 +685,38 @@ sub parse { name => $cdata->{'name'}, type => $cdata->{'type'}, fields => $cdata->{'fields'}, + expression => $cdata->{'expression'}, 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'}, + on_delete => $cdata->{'on_delete'} + || $cdata->{'on_delete_do'}, + on_update => $cdata->{'on_update'} + || $cdata->{'on_update_do'}, ) or die $table->error; } } + + my @procedures = sort { + $result->{procedures}->{ $a }->{'order'} <=> $result->{procedures}->{ $b }->{'order'} + } keys %{ $result->{procedures} }; + foreach my $proc_name (@procedures) { + $schema->add_procedure( + name => $proc_name, + owner => $result->{procedures}->{$proc_name}->{owner}, + sql => $result->{procedures}->{$proc_name}->{sql}, + ); + } + + my @views = sort { + $result->{views}->{ $a }->{'order'} <=> $result->{views}->{ $b }->{'order'} + } keys %{ $result->{views} }; + foreach my $view_name (keys %{ $result->{views} }) { + $schema->add_view( + name => $view_name, + sql => $result->{views}->{$view_name}->{sql}, + ); + } return 1; } @@ -655,7 +732,7 @@ sub parse { =head1 AUTHOR -Ken Y. Clark Ekclark@cpan.orgE. +Ken Youens-Clark Ekclark@cpan.orgE. =head1 SEE ALSO