X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F24yaml.t;h=9f9f2c736c667576f090b44080b475cc17a777d2;hb=f59b2c0e0d3cad2e98ed0eb440720f85a8f33a6f;hp=335397dbbcf7d2c58f2a0c25cbc05665f7145091;hpb=e1742702761b2ed580facf6c0ca8bc7a9fb9efed;p=dbsrgits%2FSQL-Translator.git

diff --git a/t/24yaml.t b/t/24yaml.t
index 335397d..9f9f2c7 100644
--- a/t/24yaml.t
+++ b/t/24yaml.t
@@ -2,17 +2,50 @@
 # vim: set ft=perl:
 
 use strict;
-use Test::More tests => 2;
+use Test::More;
 use Test::Differences;
+use Test::SQL::Translator qw(maybe_plan);
 use SQL::Translator;
 use FindBin '$Bin';
 
-my $yaml = q/--- #YAML:1.0
+BEGIN {
+    maybe_plan(2,
+        'SQL::Translator::Parser::SQLite',
+        'SQL::Translator::Producer::YAML');
+}
+
+my $sqlt_version = $SQL::Translator::VERSION;
+my $yaml = <<YAML;
+---
 schema:
   procedures: {}
   tables:
     person:
-      comments: ''
+      constraints:
+        - deferrable: 1
+          expression: ''
+          fields:
+            - person_id
+          match_type: ''
+          name: ''
+          on_delete: ''
+          on_update: ''
+          options: []
+          reference_fields: []
+          reference_table: ''
+          type: PRIMARY KEY
+        - deferrable: 1
+          expression: ''
+          fields:
+            - name
+          match_type: ''
+          name: u_name
+          on_delete: ''
+          on_update: ''
+          options: []
+          reference_fields: []
+          reference_table: ''
+          type: UNIQUE
       fields:
         age:
           data_type: integer
@@ -81,12 +114,36 @@ schema:
           size:
             - 11
             - 2
-      indices: {}
+      indices: []
       name: person
       options: []
       order: 1
     pet:
-      comments: ''
+      constraints:
+        - deferrable: 1
+          expression: ''
+          fields: []
+          match_type: ''
+          name: ''
+          on_delete: ''
+          on_update: ''
+          options: []
+          reference_fields: []
+          reference_table: ''
+          type: CHECK
+        - deferrable: 1
+          expression: ''
+          fields:
+            - pet_id
+            - person_id
+          match_type: ''
+          name: ''
+          on_delete: ''
+          on_update: ''
+          options: []
+          reference_fields: []
+          reference_table: ''
+          type: PRIMARY KEY
       fields:
         age:
           data_type: int
@@ -96,7 +153,7 @@ schema:
           is_primary_key: 0
           is_unique: 0
           name: age
-          order: 10
+          order: 4
           size:
             - 0
         name:
@@ -107,7 +164,7 @@ schema:
           is_primary_key: 0
           is_unique: 0
           name: name
-          order: 9
+          order: 3
           size:
             - 30
         person_id:
@@ -118,7 +175,7 @@ schema:
           is_primary_key: 1
           is_unique: 0
           name: person_id
-          order: 8
+          order: 2
           size:
             - 0
         pet_id:
@@ -129,41 +186,57 @@ schema:
           is_primary_key: 1
           is_unique: 0
           name: pet_id
-          order: 7
+          order: 1
           size:
             - 0
-      indices: {}
+      indices: []
       name: pet
       options: []
       order: 2
   triggers:
-    after:
+    pet_trig:
       action:
         for_each: ~
         steps:
-          - update name=name
+          - update pet set name=name
         when: ~
-      database_event: insert
+      database_events:
+        - insert
       fields: ~
-      name: after
-      on_table: ~
+      name: pet_trig
+      on_table: pet
       order: 1
-      perform_action_when: ~
+      perform_action_when: after
   views:
     person_pet:
-      fields: ~
+      fields: ''
       name: person_pet
       order: 1
       sql: |
         select pr.person_id, pr.name as person_name, pt.name as pet_name
           from   person pr, pet pt
           where  person.person_id=pet.pet_id
-/;
+translator:
+  add_drop_table: 0
+  filename: ~
+  no_comments: 0
+  parser_args: {}
+  parser_type: SQL::Translator::Parser::SQLite
+  producer_args: {}
+  producer_type: SQL::Translator::Producer::YAML
+  show_warnings: 0
+  trace: 0
+  version: $sqlt_version
+YAML
 
-my $tr = SQL::Translator->new(
+my $file = "$Bin/data/sqlite/create.sql";
+open FH, "<$file" or die "Can't read '$file': $!\n";
+local $/;
+my $data = <FH>;
+my $tr   = SQL::Translator->new(
     parser   => 'SQLite',
     producer => 'YAML',
-    filename => "$Bin/data/sqlite/create.sql",
+    data     => $data,
 );
 
 my $out;