package SQL::Translator::Parser::MySQL;
-# -------------------------------------------------------------------
-# 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
-# published by the Free Software Foundation; version 2.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA
-# -------------------------------------------------------------------
-
=head1 NAME
SQL::Translator::Parser::MySQL - parser for MySQL
CREATE [TEMPORARY] TABLE [IF NOT EXISTS] tbl_name [(create_definition,...)]
[table_options] [select_statement]
-
+
or
-
+
CREATE [TEMPORARY] TABLE [IF NOT EXISTS] tbl_name LIKE old_table_name;
-
+
create_definition:
col_name type [NOT NULL | NULL] [DEFAULT default_value] [AUTO_INCREMENT]
[PRIMARY KEY] [reference_definition]
or [CONSTRAINT symbol] FOREIGN KEY [index_name] (index_col_name,...)
[reference_definition]
or CHECK (expr)
-
+
type:
TINYINT[(length)] [UNSIGNED] [ZEROFILL]
or SMALLINT[(length)] [UNSIGNED] [ZEROFILL]
or LONGTEXT
or ENUM(value1,value2,value3,...)
or SET(value1,value2,value3,...)
-
+
index_col_name:
col_name [(length)]
-
+
reference_definition:
REFERENCES tbl_name [(index_col_name,...)]
[MATCH FULL | MATCH PARTIAL]
[ON DELETE reference_option]
[ON UPDATE reference_option]
-
+
reference_option:
RESTRICT | CASCADE | SET NULL | NO ACTION | SET DEFAULT
-
+
table_options:
TYPE = {BDB | HEAP | ISAM | InnoDB | MERGE | MRG_MYISAM | MYISAM }
or ENGINE = {BDB | HEAP | ISAM | InnoDB | MERGE | MRG_MYISAM | MYISAM }
provides the desired version for the target database. Any statement in the processed
dump file, that is commented with a version higher than the one supplied, will be stripped.
+The default C<mysql_parser_version> is set to the conservative value of 40000 (MySQL 4.0)
+
Valid version specifiers for C<mysql_parser_version> are listed L<here|SQL::Translator::Utils/parse_mysql_version>
More information about the MySQL comment-syntax: L<http://dev.mysql.com/doc/refman/5.0/en/comments.html>
=cut
use strict;
-use vars qw[ $DEBUG $VERSION $GRAMMAR @EXPORT_OK ];
-$VERSION = '1.59';
+use warnings;
+
+our $VERSION = '1.62';
+
+our $DEBUG;
$DEBUG = 0 unless defined $DEBUG;
use Data::Dumper;
-use Parse::RecDescent;
-use Exporter;
use Storable qw(dclone);
use DBI qw(:sql_types);
-use base qw(Exporter);
+use SQL::Translator::Utils qw/parse_mysql_version ddl_parser_instance/;
-use SQL::Translator::Utils qw/parse_mysql_version/;
+use base qw(Exporter);
+our @EXPORT_OK = qw(parse);
our %type_mapping = ();
-@EXPORT_OK = qw(parse);
-
-# Enable warnings within the Parse::RecDescent module.
-$::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.
+use constant DEFAULT_PARSER_VERSION => 40000;
-use constant DEFAULT_PARSER_VERSION => 30000;
+our $GRAMMAR = << 'END_OF_GRAMMAR';
-$GRAMMAR = << 'END_OF_GRAMMAR';
-
-{
+{
my ( $database_name, %tables, $table_order, @table_comments, %views,
$view_order, %procedures, $proc_order );
my $delimiter = ';';
#
# The "eofile" rule makes the parser fail if any "statement" rule
-# fails. Otherwise, the first successful match by a "statement"
+# fails. Otherwise, the first successful match by a "statement"
# won't cause the failure needed to know that the parse, as a whole,
# failed. -ky
#
-startrule : statement(s) eofile {
- {
- database_name => $database_name,
- tables => \%tables,
- views => \%views,
+startrule : statement(s) eofile {
+ {
+ database_name => $database_name,
+ tables => \%tables,
+ views => \%views,
procedures => \%procedures,
- }
+ }
}
eofile : /^\Z/
| empty_statement
| <error>
-use : /use/i WORD "$delimiter"
+use : /use/i NAME "$delimiter"
{
$database_name = $item[2];
@table_comments = ();
}
-set : /set/i /[^;]+/ "$delimiter"
+set : /set/i not_delimiter "$delimiter"
{ @table_comments = () }
-drop : /drop/i TABLE /[^;]+/ "$delimiter"
+drop : /drop/i TABLE not_delimiter "$delimiter"
-drop : /drop/i WORD(s) "$delimiter"
+drop : /drop/i NAME(s) "$delimiter"
{ @table_comments = () }
+bit:
+ /(b'[01]{1,64}')/ |
+ /(b"[01]{1,64}")/
+
string :
- # MySQL strings, unlike common SQL strings, can be double-quoted or
- # single-quoted, and you can escape the delmiters by doubling (but only the
- # delimiter) or by backslashing.
+ # MySQL strings, unlike common SQL strings, can be double-quoted or
+ # single-quoted.
- /'(\\.|''|[^\\\'])*'/ |
- /"(\\.|""|[^\\\"])*"/
- # For reference, std sql str: /(?:(?:\')(?:[^\']*(?:(?:\'\')[^\']*)*)(?:\'))//
+ SQSTRING | DQSTRING
nonstring : /[^;\'"]+/
my $table_name = $item{'table_name'};
die "Cannot ALTER table '$table_name'; it does not exist"
unless $tables{ $table_name };
- for my $definition ( @{ $item[4] } ) {
+ for my $definition ( @{ $item[4] } ) {
$definition->{'extra'}->{'alter'} = 1;
push @{ $tables{ $table_name }{'constraints'} }, $definition;
}
alter_specification : ADD foreign_key_def
{ $return = $item[2] }
-create : CREATE /database/i WORD "$delimiter"
+create : CREATE /database/i NAME "$delimiter"
{ @table_comments = () }
create : CREATE TEMPORARY(?) TABLE opt_if_not_exists(?) table_name '(' create_definition(s /,/) /(,\s*)?\)/ table_option(s?) "$delimiter"
- {
+ {
my $table_name = $item{'table_name'};
+ die "There is more than one definition for $table_name"
+ if ($tables{$table_name});
+
$tables{ $table_name }{'order'} = ++$table_order;
$tables{ $table_name }{'table_name'} = $table_name;
for my $definition ( @{ $item[7] } ) {
if ( $definition->{'supertype'} eq 'field' ) {
my $field_name = $definition->{'name'};
- $tables{ $table_name }{'fields'}{ $field_name } =
+ $tables{ $table_name }{'fields'}{ $field_name } =
{ %$definition, order => $i };
$i++;
-
+
if ( $definition->{'is_primary_key'} ) {
push @{ $tables{ $table_name }{'constraints'} },
{
my $func_name = $item[3];
my $owner = '';
my $sql = "$item[1] $item[2] $item[3] $item[4]";
-
+
$procedures{ $func_name }{'order'} = ++$proc_order;
$procedures{ $func_name }{'name'} = $func_name;
$procedures{ $func_name }{'owner'} = $owner;
PROCEDURE : /procedure/i
| /function/i
-create : CREATE replace(?) algorithm(?) /view/i NAME not_delimiter "$delimiter"
+create : CREATE or_replace(?) create_view_option(s?) /view/i NAME /as/i view_select_statement "$delimiter"
{
@table_comments = ();
- my $view_name = $item[5];
- my $sql = join(q{ }, grep { defined and length } $item[1], $item[2]->[0], $item[3]->[0])
- . " $item[4] $item[5] $item[6]";
-
+ my $view_name = $item{'NAME'};
+ my $select_sql = $item{'view_select_statement'};
+ my $options = $item{'create_view_option(s?)'};
+
+ my $sql = join(q{ },
+ grep { defined and length }
+ map { ref $_ eq 'ARRAY' ? @$_ : $_ }
+ $item{'CREATE'},
+ $item{'or_replace(?)'},
+ $options,
+ $view_name,
+ 'as select',
+ join(', ',
+ map {
+ sprintf('%s%s',
+ $_->{'name'},
+ $_->{'alias'} ? ' as ' . $_->{'alias'} : ''
+ )
+ }
+ @{ $select_sql->{'columns'} || [] }
+ ),
+ ' from ',
+ join(', ',
+ map {
+ sprintf('%s%s',
+ $_->{'name'},
+ $_->{'alias'} ? ' as ' . $_->{'alias'} : ''
+ )
+ }
+ @{ $select_sql->{'from'}{'tables'} || [] }
+ ),
+ $select_sql->{'from'}{'where'}
+ ? 'where ' . $select_sql->{'from'}{'where'}
+ : ''
+ ,
+ );
+
# Hack to strip database from function calls in SQL
$sql =~ s#`\w+`\.(`\w+`\()##g;
-
- $views{ $view_name }{'order'} = ++$view_order;
- $views{ $view_name }{'name'} = $view_name;
- $views{ $view_name }{'sql'} = $sql;
+
+ $views{ $view_name }{'order'} = ++$view_order;
+ $views{ $view_name }{'name'} = $view_name;
+ $views{ $view_name }{'sql'} = $sql;
+ $views{ $view_name }{'options'} = $options;
+ $views{ $view_name }{'select'} = $item{'view_select_statement'};
}
-replace : /or replace/i
+create_view_option : view_algorithm | view_sql_security | view_definer
-algorithm : /algorithm/i /=/ WORD
+or_replace : /or replace/i
+
+view_algorithm : /algorithm/i /=/ WORD
{
$return = "$item[1]=$item[3]";
}
+view_definer : /definer=\S+/i
+
+view_sql_security : /sql \s+ security \s+ (definer|invoker)/ixs
+
+not_delimiter : /.*?(?=$delimiter)/is
+
+view_select_statement : /[(]?/ /select/i view_column_def /from/i view_table_def /[)]?/
+ {
+ $return = {
+ columns => $item{'view_column_def'},
+ from => $item{'view_table_def'},
+ };
+ }
+
+view_column_def : /(.*?)(?=\bfrom\b)/ixs
+ {
+ # split on commas not in parens,
+ # e.g., "concat_ws(\' \', first, last) as first_last"
+ my @tmp = $1 =~ /((?:[^(,]+|\(.*?\))+)/g;
+ my @cols;
+ for my $col ( @tmp ) {
+ my ( $name, $alias ) = map {
+ s/^\s+|\s+$//g;
+ s/[`]//g;
+ $_
+ } split /\s+as\s+/i, $col;
+
+ push @cols, { name => $name, alias => $alias || '' };
+ }
+
+ $return = \@cols;
+ }
+
not_delimiter : /.*?(?=$delimiter)/is
-create_definition : constraint
+view_table_def : not_delimiter
+ {
+ my $clause = $item[1];
+ my $where = $1 if $clause =~ s/\bwhere \s+ (.*)//ixs;
+ $clause =~ s/[)]\s*$//;
+
+ my @tables;
+ for my $tbl ( split( /\s*,\s*/, $clause ) ) {
+ my ( $name, $alias ) = split /\s+as\s+/i, $tbl;
+ push @tables, { name => $name, alias => $alias || '' };
+ }
+
+ $return = {
+ tables => \@tables,
+ where => $where || '',
+ };
+ }
+
+view_column_alias : /as/i NAME
+ { $return = $item[2] }
+
+create_definition : constraint
| index
| field
| comment
| <error>
-comment : /^\s*(?:#|-{2}).*\n/
- {
+comment : /^\s*(?:#|-{2}).*\n/
+ {
my $comment = $item[1];
$comment =~ s/^\s*(#|--)\s*//;
$comment =~ s/\s*$//;
$return = $comment;
}
-comment : /\/\*/ /.*?\*\//s
+comment : m{ / \* (?! \!) .*? \* / }xs
{
my $comment = $item[2];
$comment = substr($comment, 0, -2);
$comment =~ s/^\s*|\s*$//g;
$return = $comment;
}
-
-field_comment : /^\s*(?:#|-{2}).*\n/
- {
+
+comment_like_command : m{/\*!(\d+)?}s
+
+comment_end : m{ \* / }xs
+
+field_comment : /^\s*(?:#|-{2}).*\n/
+ {
my $comment = $item[1];
$comment =~ s/^\s*(#|--)\s*//;
$comment =~ s/\s*$//;
}
-field_comment2 : /comment/i /'.*?'/
- {
- my $comment = $item[2];
- $comment =~ s/^'//;
- $comment =~ s/'$//;
- $return = $comment;
- }
-
blank : /\s*/
-field : field_comment(s?) field_name data_type field_qualifier(s?) field_comment2(?) reference_definition(?) on_update(?) field_comment(s?)
- {
+field : field_comment(s?) field_name data_type field_qualifier(s?) reference_definition(?) on_update(?) field_comment(s?)
+ {
my %qualifiers = map { %$_ } @{ $item{'field_qualifier(s?)'} || [] };
if ( my @type_quals = @{ $item{'data_type'}{'qualifiers'} || [] } ) {
$qualifiers{ $_ } = 1 for @type_quals;
}
- my $null = defined $qualifiers{'not_null'}
+ my $null = defined $qualifiers{'not_null'}
? $qualifiers{'not_null'} : 1;
delete $qualifiers{'not_null'};
- my @comments = ( @{ $item[1] }, @{ $item[5] }, @{ $item[8] } );
+ my @comments = ( @{ $item[1] }, (exists $qualifiers{comment} ? delete $qualifiers{comment} : ()) , @{ $item[7] } );
- $return = {
+ $return = {
supertype => 'field',
- name => $item{'field_name'},
+ name => $item{'field_name'},
data_type => $item{'data_type'}{'type'},
size => $item{'data_type'}{'size'},
list => $item{'data_type'}{'list'},
constraints => $item{'reference_definition(?)'},
comments => [ @comments ],
%qualifiers,
- }
+ }
}
| <error>
field_qualifier : not_null
- {
- $return = {
+ {
+ $return = {
null => $item{'not_null'},
- }
+ }
}
field_qualifier : default_val
- {
- $return = {
+ {
+ $return = {
default => $item{'default_val'},
- }
+ }
}
field_qualifier : auto_inc
- {
- $return = {
+ {
+ $return = {
is_auto_inc => $item{'auto_inc'},
- }
+ }
}
field_qualifier : primary_key
- {
- $return = {
+ {
+ $return = {
is_primary_key => $item{'primary_key'},
- }
+ }
}
field_qualifier : unsigned
- {
- $return = {
+ {
+ $return = {
is_unsigned => $item{'unsigned'},
- }
+ }
}
-field_qualifier : /character set/i WORD
+field_qualifier : /character set/i WORD
{
$return = {
'CHARACTER SET' => $item[2],
}
}
+field_qualifier : /comment/i string
+ {
+ $return = {
+ comment => $item[2],
+ }
+ }
+
reference_definition : /references/i table_name parens_field_list(?) match_type(?) on_delete(?) on_update(?)
{
$return = {
on_delete : /on delete/i reference_option
{ $item[2] }
-on_update :
- /on update/i 'CURRENT_TIMESTAMP'
+on_update :
+ /on update/i CURRENT_TIMESTAMP
{ $item[2] }
|
/on update/i reference_option
{ $item[2] }
-reference_option: /restrict/i |
- /cascade/i |
- /set null/i |
- /no action/i |
+reference_option: /restrict/i |
+ /cascade/i |
+ /set null/i |
+ /no action/i |
/set default/i
- { $item[1] }
+ { $item[1] }
index : normal_index
| fulltext_index
index_name : NAME
data_type : WORD parens_value_list(s?) type_qualifier(s?)
- {
+ {
my $type = $item[1];
my $size; # field size, applicable only to non-set fields
my $list; # set list, applicable only to sets (duh)
}
- $return = {
+ $return = {
type => $type,
size => $size,
list => $list,
qualifiers => $item[3],
- }
+ }
}
parens_field_list : '(' field_name(s /,/) ')'
create_index : /create/i /index/i
-not_null : /not/i /null/i
+not_null : /not/i /null/i
{ $return = 0 }
|
/null/i
unsigned : /unsigned/i { $return = 0 }
-default_val :
- /default/i 'CURRENT_TIMESTAMP'
+default_val :
+ /default/i CURRENT_TIMESTAMP
{
- $return = \$item[2];
+ $return = $item[2];
}
|
- /default/i /'(?:.*?(?:\\'|''))*.*?'|(?:')?[\w\d:.-]*(?:')?/
+ /default/i VALUE
+ {
+ $return = $item[2];
+ }
+ |
+ /default/i bit
+ {
+ $item[2] =~ s/b['"]([01]+)['"]/$1/g;
+ $return = $item[2];
+ }
+ |
+ /default/i /[\w\d:.-]+/
+ {
+ $return = $item[2];
+ }
+ |
+ /default/i NAME # column value, allowed in MariaDB
{
- $item[2] =~ s/^\s*'|'\s*$//g;
$return = $item[2];
}
constraint : primary_key_def
| unique_key_def
| foreign_key_def
+ | check_def
| <error>
+expr : /[^)]* \( [^)]+ \) [^)]*/x # parens, balanced one deep
+ | /[^)]+/
+
+check_def : check_def_begin '(' expr ')'
+ {
+ $return = {
+ supertype => 'constraint',
+ type => 'check',
+ name => $item[1],
+ expression => $item[3],
+ }
+ }
+
+check_def_begin : /constraint/i /check/i NAME
+ { $return = $item[3] }
+ |
+ /constraint/i NAME /check/i
+ { $return = $item[2] }
+ |
+ /constraint/i /check/i
+ { $return = '' }
+
foreign_key_def : foreign_key_def_begin parens_field_list reference_definition
{
$return = {
}
}
-foreign_key_def_begin : /constraint/i /foreign key/i WORD
+foreign_key_def_begin : /constraint/i /foreign key/i NAME
{ $return = $item[3] }
|
/constraint/i NAME /foreign key/i
/constraint/i /foreign key/i
{ $return = '' }
|
- /foreign key/i WORD
+ /foreign key/i NAME
{ $return = $item[2] }
|
/foreign key/i
{ $return = '' }
-primary_key_def : primary_key index_name(?) '(' name_with_opt_paren(s /,/) ')'
- {
- $return = {
+primary_key_def : primary_key index_type(?) '(' name_with_opt_paren(s /,/) ')' index_type(?)
+ {
+ $return = {
+ supertype => 'constraint',
+ type => 'primary_key',
+ fields => $item[4],
+ options => $item[2][0] || $item[6][0],
+ };
+ }
+ # In theory, and according to the doc, names should not be allowed here, but
+ # MySQL accept (and ignores) them, so we are not going to be less :)
+ | primary_key index_name_not_using(?) '(' name_with_opt_paren(s /,/) ')' index_type(?)
+ {
+ $return = {
supertype => 'constraint',
- name => $item{'index_name(?)'}[0],
type => 'primary_key',
fields => $item[4],
+ options => $item[6][0],
};
}
-unique_key_def : UNIQUE KEY(?) index_name(?) '(' name_with_opt_paren(s /,/) ')'
- {
- $return = {
+unique_key_def : UNIQUE KEY(?) index_name_not_using(?) index_type(?) '(' name_with_opt_paren(s /,/) ')' index_type(?)
+ {
+ $return = {
supertype => 'constraint',
- name => $item{'index_name(?)'}[0],
+ name => $item[3][0],
type => 'unique',
- fields => $item[5],
- }
+ fields => $item[6],
+ options => $item[4][0] || $item[8][0],
+ }
}
-normal_index : KEY index_name_not_using(?) index_type(?) '(' name_with_opt_paren(s /,/) ')'
- {
- $return = {
+normal_index : KEY index_name_not_using(?) index_type(?) '(' name_with_opt_paren(s /,/) ')' index_type(?)
+ {
+ $return = {
supertype => 'index',
type => 'normal',
name => $item[2][0],
fields => $item[5],
- options => $item[3][0],
- }
+ options => $item[3][0] || $item[7][0],
+ }
}
index_name_not_using : QUOTED_NAME
- | /(\b(?!using)\w+\b)/ { $return = $1 }
+ | /(\b(?!using)\w+\b)/ { $return = ($1 =~ /^using/i) ? undef : $1 }
index_type : /using (btree|hash|rtree)/i { $return = uc $1 }
fulltext_index : /fulltext/i KEY(?) index_name(?) '(' name_with_opt_paren(s /,/) ')'
- {
- $return = {
+ {
+ $return = {
supertype => 'index',
type => 'fulltext',
name => $item{'index_name(?)'}[0],
fields => $item[5],
- }
+ }
}
spatial_index : /spatial/i KEY(?) index_name(?) '(' name_with_opt_paren(s /,/) ')'
- {
- $return = {
+ {
+ $return = {
supertype => 'index',
type => 'spatial',
name => $item{'index_name(?)'}[0],
fields => $item[5],
- }
+ }
}
name_with_opt_paren : NAME parens_value_list(s?)
KEY : /key/i | /index/i
-table_option : /comment/i /=/ /'.*?'/
+table_option : /comment/i /=/ string
{
- my $comment = $item[3];
- $comment =~ s/^'//;
- $comment =~ s/'$//;
- $return = { comment => $comment };
+ $return = { comment => $item[3] };
}
- | /(default )?(charset|character set)/i /\s*=?\s*/ WORD
- {
+ | /(default )?(charset|character set)/i /\s*=?\s*/ NAME
+ {
$return = { 'CHARACTER SET' => $item[3] };
}
- | /collate/i WORD
+ | /collate/i NAME
{
$return = { 'COLLATE' => $item[2] }
}
| /union/i /\s*=\s*/ '(' table_name(s /,/) ')'
- {
+ {
$return = { $item[1] => $item[4] };
}
- | WORD /\s*=\s*/ MAYBE_QUOTED_WORD
+ | WORD /\s*=\s*/ table_option_value
{
$return = { $item[1] => $item[3] };
}
-MAYBE_QUOTED_WORD: /\w+/
- | /'(\w+)'/
- { $return = $1 }
- | /"(\w+)"/
- { $return = $1 }
+table_option_value : VALUE
+ | NAME
default : /default/i
DOUBLE_QUOTE: '"'
-QUOTED_NAME : BACKTICK /[^`]+/ BACKTICK
- { $item[2] }
- | DOUBLE_QUOTE /[^"]+/ DOUBLE_QUOTE
- { $item[2] }
+SINGLE_QUOTE: "'"
+
+QUOTED_NAME : BQSTRING
+ | SQSTRING
+ | DQSTRING
+
+# MySQL strings, unlike common SQL strings, can have the delmiters
+# escaped either by doubling or by backslashing.
+BQSTRING: BACKTICK <skip: ''> /(?:[^\\`]|``|\\.)*/ BACKTICK
+ { ($return = $item[3]) =~ s/(\\[\\`]|``)/substr($1,1)/ge }
+
+DQSTRING: DOUBLE_QUOTE <skip: ''> /(?:[^\\"]|""|\\.)*/ DOUBLE_QUOTE
+ { ($return = $item[3]) =~ s/(\\[\\"]|"")/substr($1,1)/ge }
+
+SQSTRING: SINGLE_QUOTE <skip: ''> /(?:[^\\']|''|\\.)*/ SINGLE_QUOTE
+ { ($return = $item[3]) =~ s/(\\[\\']|'')/substr($1,1)/ge }
+
NAME: QUOTED_NAME
- | /\w+/
+ | /\w+/
-VALUE : /[-+]?\.?\d+(?:[eE]\d+)?/
+VALUE : /[-+]?\d*\.?\d+(?:[eE]\d+)?/
{ $item[1] }
- | /'.*?'/
- {
- # remove leading/trailing quotes
- my $val = $item[1];
- $val =~ s/^['"]|['"]$//g;
- $return = $val;
- }
- | /NULL/
+ | SQSTRING
+ | DQSTRING
+ | /NULL/i
{ 'NULL' }
-CURRENT_TIMESTAMP : /current_timestamp(\(\))?/i
- | /now\(\)/i
- { 'CURRENT_TIMESTAMP' }
-
+# always a scalar-ref, so that it is treated as a function and not quoted by consumers
+CURRENT_TIMESTAMP :
+ /current_timestamp(\(\))?/i { \'CURRENT_TIMESTAMP' }
+ | /now\(\)/i { \'CURRENT_TIMESTAMP' }
+
END_OF_GRAMMAR
-# -------------------------------------------------------------------
sub parse {
my ( $translator, $data ) = @_;
- my $parser = Parse::RecDescent->new($GRAMMAR);
+
+ # Enable warnings within the Parse::RecDescent module.
+ # Make sure the parser dies when it encounters an error
+ local $::RD_ERRORS = 1 unless defined $::RD_ERRORS;
+ # Enable warnings. This will warn on unused rules &c.
+ local $::RD_WARN = 1 unless defined $::RD_WARN;
+ # Give out hints to help fix problems.
+ local $::RD_HINT = 1 unless defined $::RD_HINT;
local $::RD_TRACE = $translator->trace ? 1 : undef;
local $DEBUG = $translator->debug;
- unless (defined $parser) {
- return $translator->error("Error instantiating Parse::RecDescent ".
- "instance: Bad grammer");
- }
-
+ my $parser = ddl_parser_instance('MySQL');
+
# Preprocess for MySQL-specific and not-before-version comments
# from mysqldump
my $parser_version = parse_mysql_version(
$translator->parser_args->{mysql_parser_version}, 'mysql'
) || DEFAULT_PARSER_VERSION;
- while ( $data =~
- s#/\*!(\d{5})?(.*?)\*/#($1 && $1 > $parser_version ? '' : $2)#es
+ while ( $data =~
+ s#/\*!(\d{5})?(.*?)\*/#($1 && $1 > $parser_version ? '' : $2)#es
) {
# do nothing; is there a better way to write this? -- ky
}
my $schema = $translator->schema;
$schema->name($result->{'database_name'}) if $result->{'database_name'};
- my @tables = sort {
- $result->{'tables'}{ $a }{'order'}
- <=>
+ my @tables = sort {
+ $result->{'tables'}{ $a }{'order'}
+ <=>
$result->{'tables'}{ $b }{'order'}
} keys %{ $result->{'tables'} };
for my $table_name ( @tables ) {
my $tdata = $result->{tables}{ $table_name };
- my $table = $schema->add_table(
+ my $table = $schema->add_table(
name => $tdata->{'table_name'},
) or die $schema->error;
$table->comments( $tdata->{'comments'} );
- my @fields = sort {
- $tdata->{'fields'}->{$a}->{'order'}
+ my @fields = sort {
+ $tdata->{'fields'}->{$a}->{'order'}
<=>
$tdata->{'fields'}->{$b}->{'order'}
} keys %{ $tdata->{'fields'} };
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'}
+ on_delete => $cdata->{'on_delete'}
|| $cdata->{'on_delete_do'},
- on_update => $cdata->{'on_update'}
+ on_update => $cdata->{'on_update'}
|| $cdata->{'on_update_do'},
) or die $table->error;
}
- # After the constrains and PK/idxs have been created,
+ # After the constrains and PK/idxs have been created,
# we normalize fields
normalize_field($_) for $table->get_fields;
}
-
- my @procedures = sort {
- $result->{procedures}->{ $a }->{'order'}
- <=>
+
+ my @procedures = sort {
+ $result->{procedures}->{ $a }->{'order'}
+ <=>
$result->{procedures}->{ $b }->{'order'}
} keys %{ $result->{procedures} };
);
}
- my @views = sort {
- $result->{views}->{ $a }->{'order'}
- <=>
+ my @views = sort {
+ $result->{views}->{ $a }->{'order'}
+ <=>
$result->{views}->{ $b }->{'order'}
} keys %{ $result->{views} };
- for my $view_name ( keys %{ $result->{'views'} } ) {
+ for my $view_name ( @views ) {
+ my $view = $result->{'views'}{ $view_name };
+ my @flds = map { $_->{'alias'} || $_->{'name'} }
+ @{ $view->{'select'}{'columns'} || [] };
+ my @from = map { $_->{'alias'} || $_->{'name'} }
+ @{ $view->{'from'}{'tables'} || [] };
+
$schema->add_view(
- name => $view_name,
- sql => $result->{'views'}->{$view_name}->{sql},
+ name => $view_name,
+ sql => $view->{'sql'},
+ order => $view->{'order'},
+ fields => \@flds,
+ tables => \@from,
+ options => $view->{'options'}
);
}
return 1;
}
-# Takes a field, and returns
+# Takes a field, and returns
sub normalize_field {
my ($field) = @_;
- my ($size, $type, $list, $changed) = @_;
-
+ my ($size, $type, $list, $unsigned, $changed);
+
$size = $field->size;
$type = $field->data_type;
$list = $field->extra->{list} || [];
+ $unsigned = defined($field->extra->{unsigned});
if ( !ref $size && $size eq 0 ) {
if ( lc $type eq 'tinyint' ) {
- $changed = $size != 4;
- $size = 4;
+ $changed = $size != 4 - $unsigned;
+ $size = 4 - $unsigned;
}
elsif ( lc $type eq 'smallint' ) {
- $changed = $size != 6;
- $size = 6;
+ $changed = $size != 6 - $unsigned;
+ $size = 6 - $unsigned;
}
elsif ( lc $type eq 'mediumint' ) {
- $changed = $size != 9;
- $size = 9;
+ $changed = $size != 9 - $unsigned;
+ $size = 9 - $unsigned;
}
elsif ( $type =~ /^int(eger)?$/i ) {
- $changed = $size != 11 || $type ne 'int';
+ $changed = $size != 11 - $unsigned || $type ne 'int';
$type = 'int';
- $size = 11;
+ $size = 11 - $unsigned;
}
elsif ( lc $type eq 'bigint' ) {
$changed = $size != 20;
}
elsif ( lc $type =~ /(float|double|decimal|numeric|real|fixed|dec)/ ) {
my $old_size = (ref $size || '') eq 'ARRAY' ? $size : [];
- $changed = @$old_size != 2
- || $old_size->[0] != 8
+ $changed = @$old_size != 2
+ || $old_size->[0] != 8
|| $old_size->[1] != 2;
$size = [8,2];
}
projects / dbsrgits/SQL-Translator.git / blobdiff