X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F24yaml.t;h=e1779076468853a2007d856891fb495caf1b19b1;hb=9d430e0976994de076ebb0602651e9e0eca332da;hp=53520d9d6706cb89c1ded05410f9ec3189b03c3a;hpb=da2f599235eeacb8336fda55e160402ad03db4fb;p=dbsrgits%2FSQL-Translator.git

diff --git a/t/24yaml.t b/t/24yaml.t
index 53520d9..e177907 100644
--- a/t/24yaml.t
+++ b/t/24yaml.t
@@ -1,6 +1,4 @@
-#!/usr/local/bin/perl
-# vim: set ft=perl:
-
+use warnings;
 use strict;
 use Test::More;
 use Test::Differences;
@@ -15,13 +13,13 @@ BEGIN {
 }
 
 my $sqlt_version = $SQL::Translator::VERSION;
-my $yaml = <<YAML;
+use YAML qw(Dump Load);
+my $yaml = Dump(Load(<<YAML));
 ---
 schema:
   procedures: {}
   tables:
     person:
-      comments: ''
       constraints:
         - deferrable: 1
           expression: ''
@@ -49,10 +47,8 @@ schema:
           type: UNIQUE
       fields:
         age:
-          comments: ''
           data_type: integer
           default_value: ~
-          extra: {}
           is_nullable: 1
           is_primary_key: 0
           is_unique: 0
@@ -61,10 +57,8 @@ schema:
           size:
             - 0
         description:
-          comments: ''
           data_type: text
           default_value: ~
-          extra: {}
           is_nullable: 1
           is_primary_key: 0
           is_unique: 0
@@ -73,10 +67,8 @@ schema:
           size:
             - 0
         iq:
-          comments: ''
           data_type: tinyint
           default_value: 0
-          extra: {}
           is_nullable: 1
           is_primary_key: 0
           is_unique: 0
@@ -85,10 +77,8 @@ schema:
           size:
             - 0
         name:
-          comments: ''
           data_type: varchar
           default_value: ~
-          extra: {}
           is_nullable: 0
           is_primary_key: 0
           is_unique: 1
@@ -97,10 +87,12 @@ schema:
           size:
             - 20
         person_id:
-          comments: ''
+          comments:
+            - field comment 1
+            - field comment 2
           data_type: INTEGER
           default_value: ~
-          extra: {}
+          is_auto_increment: 1
           is_nullable: 0
           is_primary_key: 1
           is_unique: 0
@@ -109,10 +101,8 @@ schema:
           size:
             - 0
         weight:
-          comments: ''
           data_type: double
           default_value: ~
-          extra: {}
           is_nullable: 1
           is_primary_key: 0
           is_unique: 0
@@ -126,11 +116,10 @@ schema:
       options: []
       order: 1
     pet:
-      comments: ''
       constraints:
         - deferrable: 1
           expression: ''
-          fields: ''
+          fields: []
           match_type: ''
           name: ''
           on_delete: ''
@@ -152,53 +141,58 @@ schema:
           reference_fields: []
           reference_table: ''
           type: PRIMARY KEY
+        - deferrable: 1
+          expression: ''
+          fields:
+            - person_id
+          match_type: ''
+          name: ''
+          on_delete: ''
+          on_update: ''
+          options: []
+          reference_fields:
+            - person_id
+          reference_table: person
+          type: FOREIGN KEY
       fields:
         age:
-          comments: ''
           data_type: int
           default_value: ~
-          extra: {}
           is_nullable: 1
           is_primary_key: 0
           is_unique: 0
           name: age
-          order: 10
+          order: 4
           size:
             - 0
         name:
-          comments: ''
           data_type: varchar
           default_value: ~
-          extra: {}
           is_nullable: 1
           is_primary_key: 0
           is_unique: 0
           name: name
-          order: 9
+          order: 3
           size:
             - 30
         person_id:
-          comments: ''
           data_type: int
           default_value: ~
-          extra: {}
           is_nullable: 0
           is_primary_key: 1
           is_unique: 0
           name: person_id
-          order: 8
+          order: 2
           size:
             - 0
         pet_id:
-          comments: ''
           data_type: int
           default_value: ~
-          extra: {}
           is_nullable: 0
           is_primary_key: 1
           is_unique: 0
           name: pet_id
-          order: 7
+          order: 1
           size:
             - 0
       indices: []
@@ -210,9 +204,10 @@ schema:
       action:
         for_each: ~
         steps:
-          - update name=name
+          - update pet set name=name
         when: ~
-      database_event: insert
+      database_events:
+        - insert
       fields: ~
       name: pet_trig
       on_table: pet
@@ -220,7 +215,7 @@ schema:
       perform_action_when: after
   views:
     person_pet:
-      fields: ''
+      fields: []
       name: person_pet
       order: 1
       sql: |
@@ -248,8 +243,6 @@ my $tr   = SQL::Translator->new(
     parser   => 'SQLite',
     producer => 'YAML',
     data     => $data,
-#    debug    => 1,
-#    trace    => 1,
 );
 
 my $out;