X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FSQL%2FTranslator%2FProducer%2FMySQL.pm;h=498e8d6d0fe3faeb390400888957e6721de9ea34;hb=31f10179f8660d0482fe85b49f9b3ca9bcf542cd;hp=5a5bba571a4f1fe4cb8c282145d53ee274f35ea4;hpb=5a0c7b434ab26721269fb21199e93568cf17bd83;p=dbsrgits%2FSQL-Translator.git

diff --git a/lib/SQL/Translator/Producer/MySQL.pm b/lib/SQL/Translator/Producer/MySQL.pm
index 5a5bba5..498e8d6 100644
--- a/lib/SQL/Translator/Producer/MySQL.pm
+++ b/lib/SQL/Translator/Producer/MySQL.pm
@@ -1,7 +1,7 @@
 package SQL::Translator::Producer::MySQL;
 
 # -------------------------------------------------------------------
-# $Id: MySQL.pm,v 1.42 2005-01-13 11:50:23 grommit Exp $
+# $Id: MySQL.pm,v 1.45 2005-06-27 20:41:13 duality72 Exp $
 # -------------------------------------------------------------------
 # Copyright (C) 2002-4 SQLFairy Authors
 #
@@ -63,19 +63,27 @@ Set the list of allowed values for Enum fields.
 
 Set the MySQL field options of the same name.
 
-=item mysql_table_type
+=item table.mysql_table_type
 
 Set the type of the table e.g. 'InnoDB', 'MyISAM'. This will be
 automatically set for tables involved in foreign key constraints if it is
 not already set explicitly. See L<"Table Types">.
 
+=item table.mysql_charset table.mysql_collate
+
+Set the tables default charater set and collation order.
+
+=item field.mysql_charset field.mysql_collate
+
+Set the fields charater set and collation order.
+
 =back
 
 =cut
 
 use strict;
 use vars qw[ $VERSION $DEBUG ];
-$VERSION = sprintf "%d.%02d", q$Revision: 1.42 $ =~ /(\d+)\.(\d+)/;
+$VERSION = sprintf "%d.%02d", q$Revision: 1.45 $ =~ /(\d+)\.(\d+)/;
 $DEBUG   = 0 unless defined $DEBUG;
 
 use Data::Dumper;
@@ -167,6 +175,8 @@ sub produce {
             my $list      = $extra{'list'} || [];
             # \todo deal with embedded quotes
             my $commalist = join( ', ', map { qq['$_'] } @$list );
+            my $charset = $extra{'mysql_charset'};
+            my $collate = $extra{'mysql_collate'};
 
             #
             # Oracle "number" type -- figure best MySQL type
@@ -211,7 +221,7 @@ sub produce {
             }
 
             $field_def .= " $data_type";
-            
+
             if ( lc $data_type eq 'enum' ) {
                 $field_def .= '(' . $commalist . ')';
 			} 
@@ -219,11 +229,19 @@ sub produce {
                 $field_def .= '(' . join( ', ', @size ) . ')';
             }
 
+            # char sets
+            $field_def .= " CHARACTER SET $charset" if $charset;
+            $field_def .= " COLLATE $collate" if $collate;
+
             # MySQL qualifiers
             for my $qual ( qw[ binary unsigned zerofill ] ) {
-                my $val = $extra{ $qual || uc $qual } or next;
+                my $val = $extra{ $qual } || $extra{ uc $qual } or next;
                 $field_def .= " $qual";
             }
+            for my $qual ( 'character set', 'collate', 'on update' ) {
+                my $val = $extra{ $qual } || $extra{ uc $qual } or next;
+                $field_def .= " $qual $val";
+            }
 
             # Null?
             $field_def .= ' NOT NULL' unless $field->is_nullable;
@@ -238,6 +256,10 @@ sub produce {
                 }
             }
 
+            if ( my $comments = $field->comments ) {
+                $field_def .= qq[ comment '$comments'];
+            }
+
             # auto_increment?
             $field_def .= " auto_increment" if $field->is_auto_increment;
             push @field_defs, $field_def;
@@ -271,7 +293,9 @@ sub produce {
             }
             elsif ( $c->type eq UNIQUE ) {
                 push @constraint_defs,
-                    'UNIQUE (' . join(', ', @fields). ')';
+                    'UNIQUE '.
+                    (defined $c->name ? $c->name.' ' : '').
+                    '(' . join(', ', @fields). ')';
             }
             elsif ( $c->type eq FOREIGN_KEY ) {
                 #
@@ -283,7 +307,7 @@ sub produce {
                 }
 
                 my $def = join(' ', 
-                    map { $_ || () } 'FOREIGN KEY', $c->name 
+                    map { $_ || () } 'CONSTRAINT', $c->name, 'FOREIGN KEY'
                 );
 
                 $def .= ' (' . join( ', ', @fields ) . ')';
@@ -336,8 +360,23 @@ sub produce {
         # Footer
         #
         $create .= "\n)";
+        my $table_type_defined = 0;
+		for my $t1_option_ref ( $table->options ) {
+			my($key, $value) = %{$t1_option_ref};
+			$table_type_defined = 1
+				if uc $key eq 'ENGINE' or uc $key eq 'TYPE';
+		    $create .= " $key=$value";
+		}
         my $mysql_table_type = $table->extra('mysql_table_type');
-        $create .= " Type=$mysql_table_type" if $mysql_table_type;
+        $create .= " Type=$mysql_table_type"
+			if $mysql_table_type && !$table_type_defined;
+        my $charset          = $table->extra('mysql_charset');
+        my $collate          = $table->extra('mysql_collate');
+        my $comments         = $table->comments;
+
+        $create .= " DEFAULT CHARACTER SET $charset" if $charset;
+        $create .= " COLLATE $collate" if $collate;
+        $create .= qq[ comment='$comments'] if $comments;
         $create .= ";\n\n";
     }