X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F39-filter-globals.t;h=cd79f9ef84ec047e28f208abd1c14e4c8869ef38;hb=db195df8af1efc7fb983ec6041fcb064dada7124;hp=dfc4f36064e4c9937ae52c7a3316128c8269bedb;hpb=9866969c9ce1f27f43ac15d967dc42e6421dd2df;p=dbsrgits%2FSQL-Translator.git

diff --git a/t/39-filter-globals.t b/t/39-filter-globals.t
index dfc4f36..cd79f9e 100644
--- a/t/39-filter-globals.t
+++ b/t/39-filter-globals.t
@@ -9,22 +9,22 @@ use Test::More;
 use Test::Exception;
 use Test::SQL::Translator qw(maybe_plan);
 
-use Data::Dumper;
-
 BEGIN {
-    maybe_plan(4, 'YAML', 'Test::Differences')
+    maybe_plan(3, 'YAML', 'Test::Differences')
 }
 use Test::Differences;
 use SQL::Translator;
 
-my $sqlt_version = $SQL::Translator::VERSION;
-
 # The _GLOBAL_ table should be removed and its fields copied onto all other
 # tables.
+#
+# FIXME - the loader should not require order for globals, needs to be able
+# to recognize/sort approproately
 my $in_yaml = qq{---
 schema:
   tables:
     _GLOBAL_:
+      order: 99
       name: _GLOBAL_
       fields:
         modified:
@@ -38,6 +38,7 @@ schema:
             - modified
           type: UNIQUE
     Person:
+      order: 1
       name: Person
       fields:
         first_name:
@@ -45,92 +46,6 @@ schema:
           name: first_name
 };
 
-# Should include the the items added from the Global table defined above in the
-# schema as well as those defined in the filter args below.
-my $ans_yaml = qq{---
-schema:
-  procedures: {}
-  tables:
-    Person:
-      comments: ''
-      constraints:
-        - deferrable: 1
-          expression: ''
-          fields:
-            - modified
-          match_type: ''
-          name: ''
-          on_delete: ''
-          on_update: ''
-          options: []
-          reference_fields: []
-          reference_table: ''
-          type: UNIQUE
-      fields:
-        created:
-          comments: ''
-          data_type: timestamp
-          default_value: ~
-          extra: {}
-          is_nullable: 0
-          is_primary_key: 0
-          is_unique: 0
-          name: created
-          order: 3
-          size:
-            - 0
-        first_name:
-          comments: ''
-          data_type: foovar
-          default_value: ~
-          extra: {}
-          is_nullable: 1
-          is_primary_key: 0
-          is_unique: 0
-          name: first_name
-          order: 2
-          size:
-            - 0
-        modified:
-          comments: ''
-          data_type: timestamp
-          default_value: ~
-          extra: {}
-          is_nullable: 1
-          is_primary_key: 0
-          is_unique: 1
-          name: modified
-          order: 4
-          size:
-            - 0
-      indices:
-        - fields:
-            - created
-          name: ''
-          options: []
-          type: NORMAL
-        - fields:
-            - modified
-          name: ''
-          options: []
-          type: NORMAL
-      name: Person
-      options: []
-      order: 2
-  triggers: {}
-  views: {}
-translator:
-  add_drop_table: 0
-  filename: ~
-  no_comments: 0
-  parser_args: {}
-  parser_type: SQL::Translator::Parser::YAML
-  producer_args: {}
-  producer_type: SQL::Translator::Producer::YAML
-  show_warnings: 1
-  trace: 0
-  version: $sqlt_version
-};
 
 
 # Parse the test XML schema
@@ -162,9 +77,108 @@ $obj = SQL::Translator->new(
 
 ) or die "Failed to create translator object: ".SQL::Translator->error;
 
-my $out;
-lives_ok { $out = $obj->translate; }  "Translate ran";
-is $obj->error, ''                   ,"No errors";
-ok $out ne ""                        ,"Produced something!";
-eq_or_diff $out, $ans_yaml           ,"Output looks right";
-#print "$out\n";
+my $struct;
+lives_ok { $struct = YAML::Load($obj->translate) }  "Translate/yaml reload ran";
+is $obj->error, '', "No errors";
+
+# Should include the the items added from the Global table defined above in the
+# schema as well as those defined in the filter args below.
+is_deeply ($struct, {
+  schema => {
+    procedures => {},
+    tables => {
+      Person => {
+        constraints => [
+          {
+            deferrable => 1,
+            expression => "",
+            fields => [
+              "modified"
+            ],
+            match_type => "",
+            name => "",
+            on_delete => "",
+            on_update => "",
+            options => [],
+            reference_fields => [],
+            reference_table => "",
+            type => "UNIQUE"
+          }
+        ],
+        fields => {
+          first_name => {
+            data_type => "foovar",
+            default_value => undef,
+            is_nullable => 1,
+            is_primary_key => 0,
+            is_unique => 0,
+            name => "first_name",
+            order => 1,
+            size => [
+              0
+            ]
+          },
+          created => {
+            data_type => "timestamp",
+            default_value => undef,
+            is_nullable => 0,
+            is_primary_key => 0,
+            is_unique => 0,
+            name => "created",
+            order => 2,
+            size => [
+              0
+            ]
+          },
+          modified => {
+            data_type => "timestamp",
+            default_value => undef,
+            is_nullable => 1,
+            is_primary_key => 0,
+            is_unique => 1,
+            name => "modified",
+            order => 3,
+            size => [
+              0
+            ]
+          }
+        },
+        indices => [
+          {
+            fields => [
+              "created"
+            ],
+            name => "",
+            options => [],
+            type => "NORMAL"
+          },
+          {
+            fields => [
+              "modified"
+            ],
+            name => "",
+            options => [],
+            type => "NORMAL"
+          }
+        ],
+        name => "Person",
+        options => [],
+        order => 1
+      }
+    },
+    triggers => {},
+    views => {}
+  },
+  translator => {
+    add_drop_table => 0,
+    filename => undef,
+    no_comments => 0,
+    parser_args => {},
+    parser_type => "SQL::Translator::Parser::YAML",
+    producer_args => {},
+    producer_type => "SQL::Translator::Producer::YAML",
+    show_warnings => 1,
+    trace => 0,
+    version => $SQL::Translator::VERSION,
+  }
+}, 'Expected final yaml-schema');