X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F17sqlfxml-producer.t;h=31bbf0c479ea2912499e3b9678d2226beeeb5465;hb=8ce5d6158b9fb1e09bda97b1061eea5232c268ad;hp=3f397272c76fe953a6ace48c61119d9323e9f2c8;hpb=e0a0c3e1a2698217f21e0e5b6739d56ada6833ba;p=dbsrgits%2FSQL-Translator.git

diff --git a/t/17sqlfxml-producer.t b/t/17sqlfxml-producer.t
index 3f39727..31bbf0c 100644
--- a/t/17sqlfxml-producer.t
+++ b/t/17sqlfxml-producer.t
@@ -23,14 +23,14 @@ my $file = "$Bin/data/mysql/sqlfxml-producer-basic.sql";
 
 local $SIG{__WARN__} = sub {
     CORE::warn(@_)
-        unless $_[0] =~ m#XML/Writer#;
+        unless $_[0] =~ m!XML/Writer!;
 };
 
 # Testing 1,2,3,4...
 #=============================================================================
 
 BEGIN {
-    maybe_plan(15,
+    maybe_plan(14,
         'XML::Writer',
         'Test::Differences',
         'SQL::Translator::Producer::XML::SQLFairy');
@@ -48,33 +48,47 @@ my ($obj,$ans,$xml);
 
 $ans = <<EOXML;
 <schema name="" database="" xmlns="http://sqlfairy.sourceforge.net/sqlfairy.xml">
-  <table name="Basic" order="1">
-    <fields>
-      <field name="id" data_type="integer" size="10" is_nullable="0" is_auto_increment="1" is_primary_key="1" is_foreign_key="0" order="1">
-        <extra />
-        <comments>comment on id field</comments>
-      </field>
-      <field name="title" data_type="varchar" size="100" is_nullable="0" default_value="hello" is_auto_increment="0" is_primary_key="0" is_foreign_key="0" order="2">
-        <extra />
-        <comments></comments>
-      </field>
-      <field name="description" data_type="text" size="65535" is_nullable="1" default_value="" is_auto_increment="0" is_primary_key="0" is_foreign_key="0" order="3">
-        <extra />
-        <comments></comments>
-      </field>
-      <field name="email" data_type="varchar" size="255" is_nullable="1" is_auto_increment="0" is_primary_key="0" is_foreign_key="0" order="4">
-        <extra />
-        <comments></comments>
-      </field>
-    </fields>
-    <indices>
-      <index name="titleindex" type="NORMAL" fields="title" options="" />
-    </indices>
-    <constraints>
-      <constraint name="" type="PRIMARY KEY" fields="id" reference_table="" reference_fields="" on_delete="" on_update="" match_type="" expression="" options="" deferrable="1" />
-      <constraint name="" type="UNIQUE" fields="email" reference_table="" reference_fields="" on_delete="" on_update="" match_type="" expression="" options="" deferrable="1" />
-    </constraints>
-  </table>
+  <extra />
+  <tables>
+    <table name="Basic" order="1">
+      <extra />
+      <fields>
+        <field name="id" data_type="integer" size="10" is_nullable="0" is_auto_increment="1" is_primary_key="1" is_foreign_key="0" order="1">
+          <extra />
+          <comments>comment on id field</comments>
+        </field>
+        <field name="title" data_type="varchar" size="100" is_nullable="0" default_value="hello" is_auto_increment="0" is_primary_key="0" is_foreign_key="0" order="2">
+          <extra />
+          <comments></comments>
+        </field>
+        <field name="description" data_type="text" size="65535" is_nullable="1" default_value="" is_auto_increment="0" is_primary_key="0" is_foreign_key="0" order="3">
+          <extra />
+          <comments></comments>
+        </field>
+        <field name="email" data_type="varchar" size="255" is_nullable="1" is_auto_increment="0" is_primary_key="0" is_foreign_key="0" order="4">
+          <extra />
+          <comments></comments>
+        </field>
+      </fields>
+      <indices>
+        <index name="titleindex" type="NORMAL" fields="title" options="">
+          <extra />
+        </index>
+      </indices>
+      <constraints>
+        <constraint name="" type="PRIMARY KEY" fields="id" reference_table="" reference_fields="" on_delete="" on_update="" match_type="" expression="" options="" deferrable="1">
+          <extra />
+        </constraint>
+        <constraint name="" type="UNIQUE" fields="email" reference_table="" reference_fields="" on_delete="" on_update="" match_type="" expression="" options="" deferrable="1">
+          <extra />
+        </constraint>
+      </constraints>
+      <comments></comments>
+    </table>
+  </tables>
+  <views></views>
+  <triggers></triggers>
+  <procedures></procedures>
 </schema>
 EOXML
 
@@ -86,7 +100,7 @@ $obj = SQL::Translator->new(
     from           => "MySQL",
     to             => "XML-SQLFairy",
 );
-lives_ok {$xml = $obj->translate($file);} "Translate (attrib_values=>1) ran";
+$xml = $obj->translate($file) or die $obj->error;
 ok("$xml" ne ""                             ,"Produced something!");
 print "XML:\n$xml" if DEBUG;
 # Strip sqlf header with its variable date so we diff safely
@@ -104,9 +118,16 @@ my ($obj,$ans,$xml);
 
 $ans = <<EOXML;
 <schema name="" database="" xmlns="http://sqlfairy.sourceforge.net/sqlfairy.xml">
-  <view name="foo_view" fields="name,age" order="1">
-    <sql>select name, age from person</sql>
-  </view>
+  <extra />
+  <tables></tables>
+  <views>
+    <view name="foo_view" fields="name,age" order="1">
+      <sql>select name, age from person</sql>
+      <extra hello="world" />
+    </view>
+  </views>
+  <triggers></triggers>
+  <procedures></procedures>
 </schema>
 EOXML
 
@@ -126,6 +147,7 @@ EOXML
         name   => $name,
         sql    => $sql,
         fields => $fields,
+        extra  => { hello => "world" },
         schema => $s,
     ) or die $s->error;
 
@@ -148,9 +170,24 @@ my ($obj,$ans,$xml);
 
 $ans = <<EOXML;
 <schema name="" database="" xmlns="http://sqlfairy.sourceforge.net/sqlfairy.xml">
-  <trigger name="foo_trigger" database_event="insert" on_table="foo" perform_action_when="after" order="1">
-    <action>update modified=timestamp();</action>
-  </trigger>
+  <extra />
+  <tables>
+    <table name="Basic" order="2">
+      <extra />
+      <fields></fields>
+      <indices></indices>
+      <constraints></constraints>
+      <comments></comments>
+    </table>
+  </tables>
+  <views></views>
+  <triggers>
+    <trigger name="foo_trigger" database_event="insert" on_table="Basic" perform_action_when="after" order="1">
+      <action>update modified=timestamp();</action>
+      <extra hello="world" />
+    </trigger>
+  </triggers>
+  <procedures></procedures>
 </schema>
 EOXML
 
@@ -166,14 +203,15 @@ EOXML
     my $name                = 'foo_trigger';
     my $perform_action_when = 'after';
     my $database_event      = 'insert';
-    my $on_table            = 'foo';
     my $action              = 'update modified=timestamp();';
+    my $table = $s->add_table( name => "Basic" ) or die $s->error;
     my $t                   = $s->add_trigger(
         name                => $name,
         perform_action_when => $perform_action_when,
         database_event      => $database_event,
-        on_table            => $on_table,
+        table               => $table,
         action              => $action,
+        extra               => { hello => "world" },
     ) or die $s->error;
 
     # As we have created a Schema we give translate a dummy string so that
@@ -195,10 +233,17 @@ my ($obj,$ans,$xml);
 
 $ans = <<EOXML;
 <schema name="" database="" xmlns="http://sqlfairy.sourceforge.net/sqlfairy.xml">
-  <procedure name="foo_proc" parameters="foo,bar" owner="Nomar" order="1">
-    <sql>select foo from bar</sql>
-    <comments>Go Sox!</comments>
-  </procedure>
+  <extra />
+  <tables></tables>
+  <views></views>
+  <triggers></triggers>
+  <procedures>
+    <procedure name="foo_proc" parameters="foo,bar" owner="Nomar" order="1">
+      <sql>select foo from bar</sql>
+      <comments>Go Sox!</comments>
+      <extra hello="world" />
+    </procedure>
+  </procedures>
 </schema>
 EOXML
 
@@ -222,6 +267,7 @@ EOXML
         parameters => $parameters,
         owner      => $owner,
         comments   => $comments,
+        extra      => { hello => "world" },
     ) or die $s->error;
 
     # As we have created a Schema we give translate a dummy string so that
@@ -242,16 +288,24 @@ my ($obj,$ans,$xml);
 
 $ans = <<EOXML;
 <schema name="" database="" xmlns="http://sqlfairy.sourceforge.net/sqlfairy.xml">
-  <table name="Basic" order="2">
-    <fields>
-      <field name="foo" data_type="integer" size="10" is_nullable="1" is_auto_increment="0" is_primary_key="0" is_foreign_key="0" order="5">
-        <extra ZEROFILL="1" />
-        <comments></comments>
-      </field>
-    </fields>
-    <indices></indices>
-    <constraints></constraints>
-  </table>
+  <extra />
+  <tables>
+    <table name="Basic" order="3">
+      <extra />
+      <fields>
+        <field name="foo" data_type="integer" size="10" is_nullable="1" is_auto_increment="0" is_primary_key="0" is_foreign_key="0" order="5">
+          <extra ZEROFILL="1" />
+          <comments></comments>
+        </field>
+      </fields>
+      <indices></indices>
+      <constraints></constraints>
+      <comments></comments>
+    </table>
+  </tables>
+  <views></views>
+  <triggers></triggers>
+  <procedures></procedures>
 </schema>
 EOXML