X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F17sqlfxml-producer.t;h=e9096735cdc7bb1845057d4963bbad86b5784b5b;hb=d4924f25d6cc897fa44e9bd9f0123308f63abc11;hp=54003c4b1700716752fa61afb4904cbdc0120ab7;hpb=0eebe05938c1a9ec8533d5ac9502743c0b43550b;p=dbsrgits%2FSQL-Translator.git

diff --git a/t/17sqlfxml-producer.t b/t/17sqlfxml-producer.t
index 54003c4..e909673 100644
--- a/t/17sqlfxml-producer.t
+++ b/t/17sqlfxml-producer.t
@@ -23,7 +23,7 @@ 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...
@@ -83,6 +83,7 @@ $ans = <<EOXML;
           <extra />
         </constraint>
       </constraints>
+      <comments></comments>
     </table>
   </tables>
   <views></views>
@@ -170,10 +171,18 @@ my ($obj,$ans,$xml);
 $ans = <<EOXML;
 <schema name="" database="" xmlns="http://sqlfairy.sourceforge.net/sqlfairy.xml">
   <extra />
-  <tables></tables>
+  <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="foo" perform_action_when="after" order="1">
+    <trigger name="foo_trigger" database_events="insert" on_table="Basic" perform_action_when="after" order="1">
       <action>update modified=timestamp();</action>
       <extra hello="world" />
     </trigger>
@@ -194,13 +203,13 @@ 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,
+        database_events     => [$database_event],
+        table               => $table,
         action              => $action,
         extra               => { hello => "world" },
     ) or die $s->error;
@@ -281,7 +290,7 @@ $ans = <<EOXML;
 <schema name="" database="" xmlns="http://sqlfairy.sourceforge.net/sqlfairy.xml">
   <extra />
   <tables>
-    <table name="Basic" order="2">
+    <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">
@@ -291,6 +300,7 @@ $ans = <<EOXML;
       </fields>
       <indices></indices>
       <constraints></constraints>
+      <comments></comments>
     </table>
   </tables>
   <views></views>