From: Mark Addison <grommit@users.sourceforge.net>
Date: Tue, 21 Oct 2003 14:53:08 +0000 (+0000)
Subject: When using attrib_values the attribs are now written in alphabetical order
X-Git-Tag: v0.04~36
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=446dfcbd3a58ad65602cd45c25155bc91d7e25a4;p=dbsrgits%2FSQL-Translator.git

When using attrib_values the attribs are now written in alphabetical order
rather than hash order. Should ensure the test passes for different versions of
perl.
---

diff --git a/lib/SQL/Translator/Producer/XML/SQLFairy.pm b/lib/SQL/Translator/Producer/XML/SQLFairy.pm
index 2f98873..de96e08 100644
--- a/lib/SQL/Translator/Producer/XML/SQLFairy.pm
+++ b/lib/SQL/Translator/Producer/XML/SQLFairy.pm
@@ -1,7 +1,7 @@
 package SQL::Translator::Producer::XML::SQLFairy;
 
 # -------------------------------------------------------------------
-# $Id: SQLFairy.pm,v 1.7 2003-10-20 13:15:23 grommit Exp $
+# $Id: SQLFairy.pm,v 1.8 2003-10-21 14:53:08 grommit Exp $
 # -------------------------------------------------------------------
 # Copyright (C) 2003 Ken Y. Clark <kclark@cpan.org>,
 #                    darren chamberlain <darren@cpan.org>,
@@ -78,7 +78,7 @@ Creates XML output of a schema.
 
 use strict;
 use vars qw[ $VERSION @EXPORT_OK ];
-$VERSION = sprintf "%d.%02d", q$Revision: 1.7 $ =~ /(\d+)\.(\d+)/;
+$VERSION = sprintf "%d.%02d", q$Revision: 1.8 $ =~ /(\d+)\.(\d+)/;
 
 use Exporter;
 use base qw(Exporter);
@@ -227,8 +227,11 @@ sub xml_obj {
 			($_ => ref($val) eq 'ARRAY' ? join(', ', @$val) : $val);
 		} @meths;
 		foreach ( keys %attr ) { delete $attr{$_} unless defined $attr{$_}; }
-		$empty_tag ? $xml->emptyTag( [ $Namespace => $tag ], %attr )
-		           : $xml->startTag( [ $Namespace => $tag ], %attr );
+        # Convert to array to ensure consistant (ie not hash) ordering of
+        # attribs
+        my @attr = map { ($_ => $attr{$_}) } sort keys %attr;
+        $empty_tag ? $xml->emptyTag( [ $Namespace => $tag ], @attr )
+		           : $xml->startTag( [ $Namespace => $tag ], @attr );
 	}
 	else {
 		$xml->startTag( [ $Namespace => $tag ] );
diff --git a/t/17sqlfxml-producer.t b/t/17sqlfxml-producer.t
index 27b824d..21722a7 100644
--- a/t/17sqlfxml-producer.t
+++ b/t/17sqlfxml-producer.t
@@ -284,19 +284,19 @@ my ($obj,$ans,$xml);
 
 $ans = <<EOXML;
 <sqlt:schema database="" name="" xmlns:sqlt="http://sqlfairy.sourceforge.net/sqlfairy.xml">
-  <sqlt:table order="3" name="Basic">
+  <sqlt:table name="Basic" order="3">
     <sqlt:fields>
-      <sqlt:field is_primary_key="1" is_foreign_key="0" name="id" comments="comment on id field" size="10" data_type="integer" is_auto_increment="1" order="9" is_nullable="0" />
-      <sqlt:field is_primary_key="0" is_foreign_key="0" name="title" comments="" size="100" is_auto_increment="0" data_type="varchar" order="10" default_value="hello" is_nullable="0" />
-      <sqlt:field is_primary_key="0" is_foreign_key="0" name="description" comments="" size="65535" is_auto_increment="0" data_type="text" order="11" default_value="" is_nullable="1" />
-      <sqlt:field is_primary_key="0" is_foreign_key="0" name="email" comments="" size="255" is_auto_increment="0" data_type="varchar" order="12" is_nullable="1" />
+      <sqlt:field comments="comment on id field" data_type="integer" is_auto_increment="1" is_foreign_key="0" is_nullable="0" is_primary_key="1" name="id" order="9" size="10" />
+      <sqlt:field comments="" data_type="varchar" default_value="hello" is_auto_increment="0" is_foreign_key="0" is_nullable="0" is_primary_key="0" name="title" order="10" size="100" />
+      <sqlt:field comments="" data_type="text" default_value="" is_auto_increment="0" is_foreign_key="0" is_nullable="1" is_primary_key="0" name="description" order="11" size="65535" />
+      <sqlt:field comments="" data_type="varchar" is_auto_increment="0" is_foreign_key="0" is_nullable="1" is_primary_key="0" name="email" order="12" size="255" />
     </sqlt:fields>
     <sqlt:indices>
-      <sqlt:index options="" name="titleindex" fields="title" type="NORMAL" />
+      <sqlt:index fields="title" name="titleindex" options="" type="NORMAL" />
     </sqlt:indices>
     <sqlt:constraints>
-      <sqlt:constraint options="" match_type="" deferrable="1" name="" on_update="" reference_table="" on_delete="" fields="id" expression="" type="PRIMARY KEY" />
-      <sqlt:constraint options="" match_type="" deferrable="1" name="" on_update="" reference_table="" on_delete="" fields="email" expression="" type="UNIQUE" />
+      <sqlt:constraint deferrable="1" expression="" fields="id" match_type="" name="" on_delete="" on_update="" options="" reference_table="" type="PRIMARY KEY" />
+      <sqlt:constraint deferrable="1" expression="" fields="email" match_type="" name="" on_delete="" on_update="" options="" reference_table="" type="UNIQUE" />
     </sqlt:constraints>
   </sqlt:table>
 </sqlt:schema>