Changes + Reverts for 0.11000, see Changes file for info

[dbsrgits/SQL-Translator.git] / lib / SQL / Translator / Producer / YAML.pm

diff --git a/lib/SQL/Translator/Producer/YAML.pm b/lib/SQL/Translator/Producer/YAML.pm
index 5b30911..68ecd8f 100644 (file)
--- a/lib/SQL/Translator/Producer/YAML.pm
+++ b/lib/SQL/Translator/Producer/YAML.pm
@@ -1,8 +1,6 @@
 package SQL::Translator::Producer::YAML;
 
 # -------------------------------------------------------------------
-# $Id: YAML.pm 1440 2009-01-17 16:31:57Z jawnsy $
-# -------------------------------------------------------------------
 # Copyright (C) 2002-2009 SQLFairy Authors
 #
 # This program is free software; you can redistribute it and/or
@@ -41,7 +39,7 @@ takes a long time.
 
 use strict;
 use vars qw($VERSION);
-$VERSION = '1.99';
+$VERSION = '1.59';
 
 use YAML qw(Dump);
 
@@ -80,7 +78,8 @@ sub produce {
             show_warnings  => $translator->show_warnings,
             trace          => $translator->trace,
             version        => $translator->version,
-        }
+        },
+        keys %{$schema->extra} ? ('extra' => { $schema->extra } ) : (),
     });
 }
 
@@ -103,6 +102,7 @@ sub view_table {
             map { ($_->name => view_field($_)) }
                 $table->get_fields 
         },
+        keys %{$table->extra} ? ('extra' => { $table->extra } ) : (),
     };
 }
 
@@ -119,9 +119,10 @@ sub view_constraint {
         'options'          => scalar $constraint->options,
         'on_delete'        => scalar $constraint->on_delete,
         'on_update'        => scalar $constraint->on_update,
-        'reference_fields' => scalar $constraint->reference_fields,
+        'reference_fields' => [ map { ref $_ ? $_->name : $_ } $constraint->reference_fields ],
         'reference_table'  => scalar $constraint->reference_table,
         'type'             => scalar $constraint->type,
+        keys %{$constraint->extra} ? ('extra' => { $constraint->extra } ) : (),
     };
 }
 
@@ -140,7 +141,7 @@ sub view_field {
         'is_unique'         => scalar $field->is_unique,
         $field->is_auto_increment ? ('is_auto_increment' => 1) : (),
         $field->comments ? ('comments' => $field->comments) : (),
-        'extra'             => { $field->extra },
+        keys %{$field->extra} ? ('extra' => { $field->extra } ) : (),
     };
 }
 
@@ -155,6 +156,7 @@ sub view_procedure {
         'parameters' => scalar $procedure->parameters,
         'owner'      => scalar $procedure->owner,
         'comments'   => scalar $procedure->comments,
+        keys %{$procedure->extra} ? ('extra' => { $procedure->extra } ) : (),
     };
 }
 
@@ -166,10 +168,11 @@ sub view_trigger {
         'order'               => scalar $trigger->order,
         'name'                => scalar $trigger->name,
         'perform_action_when' => scalar $trigger->perform_action_when,
-        'database_event'      => scalar $trigger->database_event,
+        'database_events'     => scalar $trigger->database_events,
         'fields'              => scalar $trigger->fields,
         'on_table'            => scalar $trigger->on_table,
         'action'              => scalar $trigger->action,
+        keys %{$trigger->extra} ? ('extra' => { $trigger->extra } ) : (),
     };
 }
 
@@ -182,6 +185,7 @@ sub view_view {
         'name'   => scalar $view->name,
         'sql'    => scalar $view->sql,
         'fields' => scalar $view->fields,
+        keys %{$view->extra} ? ('extra' => { $view->extra } ) : (),
     };
 }
 
@@ -194,6 +198,7 @@ sub view_index {
         'type'      => scalar $index->type,
         'fields'    => scalar $index->fields,
         'options'   => scalar $index->options,
+        keys %{$index->extra} ? ('extra' => { $index->extra } ) : (),
     };
 }
 
@@ -208,6 +213,6 @@ SQL::Translator, YAML, http://www.yaml.org/.
 =head1 AUTHORS
 
 darren chamberlain E<lt>darren@cpan.orgE<gt>,
-Ken Y. Clark E<lt>kclark@cpan.orgE<gt>.
+Ken Youens-Clark E<lt>kclark@cpan.orgE<gt>.
 
 =cut