package SQL::Translator::Parser::MySQL;
# -------------------------------------------------------------------
-# $Id: MySQL.pm,v 1.46 2005-06-07 16:49:55 kycl4rk Exp $
+# $Id: MySQL.pm,v 1.50 2005-06-28 16:39:41 mwz444 Exp $
# -------------------------------------------------------------------
# Copyright (C) 2002-4 SQLFairy Authors
#
use strict;
use vars qw[ $DEBUG $VERSION $GRAMMAR @EXPORT_OK ];
-$VERSION = sprintf "%d.%02d", q$Revision: 1.46 $ =~ /(\d+)\.(\d+)/;
+$VERSION = sprintf "%d.%02d", q$Revision: 1.50 $ =~ /(\d+)\.(\d+)/;
$DEBUG = 0 unless defined $DEBUG;
use Data::Dumper;
}
if ( my @options = @{ $item{'table_option(s?)'} } ) {
- $tables{ $table_name }{'table_options'} = \@options;
+ for my $option ( @options ) {
+ my ( $key, $value ) = each %$option;
+ if ( $key eq 'comment' ) {
+ push @{ $tables{ $table_name }{'comments'} }, $value;
+ }
+ else {
+ push @{ $tables{ $table_name }{'table_options'} }, $option;
+ }
+ }
}
1;
$return = $comment;
}
+
+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?) reference_definition(?) field_comment(s?)
+field : field_comment(s?) field_name data_type field_qualifier(s?) field_comment2(?) reference_definition(?) on_update(?) field_comment(s?)
{
my %qualifiers = map { %$_ } @{ $item{'field_qualifier(s?)'} || [] };
if ( my @type_quals = @{ $item{'data_type'}{'qualifiers'} || [] } ) {
? $qualifiers{'not_null'} : 1;
delete $qualifiers{'not_null'};
- my @comments = ( @{ $item[1] }, @{ $item[6] } );
+ my @comments = ( @{ $item[1] }, @{ $item[5] }, @{ $item[8] } );
$return = {
supertype => 'field',
field_qualifier : /character set/i WORD
{
$return = {
- character_set => $item[2],
+ 'CHARACTER SET' => $item[2],
+ }
+ }
+
+field_qualifier : /collate/i WORD
+ {
+ $return = {
+ COLLATE => $item[2],
}
}
-reference_definition : /references/i table_name parens_field_list(?) match_type(?) on_delete_do(?) on_update_do(?)
+field_qualifier : /on update/i CURRENT_TIMESTAMP
+ {
+ $return = {
+ 'ON UPDATE' => $item[2],
+ }
+ }
+
+reference_definition : /references/i table_name parens_field_list(?) match_type(?) on_delete(?) on_update(?)
{
$return = {
type => 'foreign_key',
reference_table => $item[2],
reference_fields => $item[3][0],
match_type => $item[4][0],
- on_delete_do => $item[5][0],
- on_update_do => $item[6][0],
+ on_delete => $item[5][0],
+ on_update => $item[6][0],
}
}
|
/match partial/i { 'partial' }
-on_delete_do : /on delete/i reference_option
+on_delete : /on delete/i reference_option
{ $item[2] }
-on_update_do : /on update/i reference_option
+on_update :
+ /on update/i 'CURRENT_TIMESTAMP'
+ { $item[2] }
+ |
+ /on update/i reference_option
{ $item[2] }
reference_option: /restrict/i |
# $return = $item[2];
# }
-default_val : /default/i /'(?:.*?\\')*.*?'|(?:')?[\w\d:.-]*(?:')?/
+default_val :
+ /default/i 'CURRENT_TIMESTAMP'
+ {
+ $return = $item[2];
+ }
+ |
+ /default/i /'(?:.*?\\')*.*?'|(?:')?[\w\d:.-]*(?:')?/
{
$item[2] =~ s/^\s*'|'\s*$//g;
$return = $item[2];
KEY : /key/i | /index/i
-table_option : 'DEFAULT CHARSET' /\s*=\s*/ WORD
+table_option : WORD /\s*=\s*/ WORD
{
$return = { $item[1] => $item[3] };
}
- | WORD /\s*=\s*/ WORD
+ | /comment/i /=/ /'.*?'/
+ {
+ my $comment = $item[3];
+ $comment =~ s/^'//;
+ $comment =~ s/'$//;
+ $return = { comment => $comment };
+ }
+ | /(default )?(charset|character set)/i /\s*=\s*/ WORD
{
- $return = { $item[1] => $item[3] };
+ $return = { 'CHARACTER SET' => $item[3] };
}
+
+default : /default/i
ADD : /add/i
| /NULL/
{ 'NULL' }
+CURRENT_TIMESTAMP : /current_timestamp(\(\))?/i
+ | /now\(\)/i
+ { 'CURRENT_TIMESTAMP' }
+
!;
# -------------------------------------------------------------------
$table->primary_key( $field->name ) if $fdata->{'is_primary_key'};
- for my $qual ( qw[ binary unsigned zerofill list ] ) {
+ for my $qual ( qw[ binary unsigned zerofill list collate ],
+ 'character set', 'on update' ) {
if ( my $val = $fdata->{ $qual } || $fdata->{ uc $qual } ) {
next if ref $val eq 'ARRAY' && !@$val;
$field->extra( $qual, $val );
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'},
) or die $table->error;
}
}