From: Mark Addison <grommit@users.sourceforge.net>
Date: Tue, 21 Oct 2003 15:12:51 +0000 (+0000)
Subject: Refactored attrib ordering fix.
X-Git-Tag: v0.04~35
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=d671d3b9df517bda47874f963971815628e5d0f1;p=dbsrgits%2FSQL-Translator.git

Refactored attrib ordering fix.
---

diff --git a/lib/SQL/Translator/Producer/XML/SQLFairy.pm b/lib/SQL/Translator/Producer/XML/SQLFairy.pm
index de96e08..50fe2a0 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.8 2003-10-21 14:53:08 grommit Exp $
+# $Id: SQLFairy.pm,v 1.9 2003-10-21 15:12:51 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.8 $ =~ /(\d+)\.(\d+)/;
+$VERSION = sprintf "%d.%02d", q$Revision: 1.9 $ =~ /(\d+)\.(\d+)/;
 
 use Exporter;
 use base qw(Exporter);
@@ -222,14 +222,11 @@ sub xml_obj {
 	}
 
 	if ( $attrib_values ) {
-		my %attr = map { 
+        # Use array to ensure consistant (ie not hash) ordering of attribs
+		my @attr = map { 
 			my $val = $obj->$_;
 			($_ => ref($val) eq 'ARRAY' ? join(', ', @$val) : $val);
-		} @meths;
-		foreach ( keys %attr ) { delete $attr{$_} unless defined $attr{$_}; }
-        # Convert to array to ensure consistant (ie not hash) ordering of
-        # attribs
-        my @attr = map { ($_ => $attr{$_}) } sort keys %attr;
+		} grep { defined $obj->$_ } sort @meths;
         $empty_tag ? $xml->emptyTag( [ $Namespace => $tag ], @attr )
 		           : $xml->startTag( [ $Namespace => $tag ], @attr );
 	}