Added parsing of field.extra

[dbsrgits/SQL-Translator.git] / lib / SQL / Translator / Utils.pm

diff --git a/lib/SQL/Translator/Utils.pm b/lib/SQL/Translator/Utils.pm
index 8e31185..cefa284 100644 (file)
--- a/lib/SQL/Translator/Utils.pm
+++ b/lib/SQL/Translator/Utils.pm
@@ -1,9 +1,9 @@
 package SQL::Translator::Utils;
 
 # ----------------------------------------------------------------------
-# $Id: Utils.pm,v 1.5 2003-05-12 14:49:39 kycl4rk Exp $
+# $Id: Utils.pm,v 1.12 2004-02-09 23:04:26 kycl4rk Exp $
 # ----------------------------------------------------------------------
-# Copyright (C) 2003 darren chamberlain <darren@cpan.org>
+# Copyright (C) 2002-4 SQLFairy Authors
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as
@@ -26,7 +26,7 @@ use vars qw($VERSION $DEFAULT_COMMENT @EXPORT_OK);
 
 use Exporter;
 
-$VERSION = 1.00;
+$VERSION = sprintf "%d.%02d", q$Revision: 1.12 $ =~ /(\d+)\.(\d+)/;
 $DEFAULT_COMMENT = '-- ';
 @EXPORT_OK = qw(
     debug normalize_name header_comment parse_list_arg $DEFAULT_COMMENT
@@ -72,7 +72,7 @@ sub debug {
 
 # ----------------------------------------------------------------------
 sub normalize_name {
-    my $name = shift;
+    my $name = shift or return '';
 
     # The name can only begin with a-zA-Z_; if there's anything
     # else, prefix with _
@@ -116,11 +116,31 @@ HEADER_COMMENT
 }
 
 # ----------------------------------------------------------------------
+# parse_list_arg
+#
+# Meant to accept a list, an array reference, or a string of 
+# comma-separated values.  Retuns an array reference of the 
+# arguments.  Modified to also handle a list of references.
+# ----------------------------------------------------------------------
 sub parse_list_arg {
-    return UNIVERSAL::isa( $_[0], 'ARRAY' ) 
-        ? shift 
-        : [ map { s/^\s+|\s+$//g; $_ } map { $_ ? split /,/ : '' } @_ ]
-    ;
+    my $list = UNIVERSAL::isa( $_[0], 'ARRAY' ) ? shift : [ @_ ];
+
+    #
+    # This protects stringification of references.
+    #
+    if ( @$list && ref $list->[0] ) {
+        return $list;
+    }
+    #
+    # This processes string-like arguments.
+    #
+    else {
+        return [ 
+            map { s/^\s+|\s+$//g; $_ }
+            map { split /,/ }
+            grep { defined && length } @$list
+        ];
+    }
 }
 
 1;
@@ -152,7 +172,7 @@ Nothing is exported by default.
 C<debug> takes 0 or more messages, which will be sent to STDERR using
 C<warn>.  Occurances of the strings I<PKG>, I<SUB>, and I<LINE>
 will be replaced by the calling package, subroutine, and line number,
-respectively, as reported by C<caller(1)>.  
+respectively, as reported by C<caller(1)>.
 
 For example, from within C<foo> in F<SQL/Translator.pm>, at line 666:
 
@@ -204,17 +224,17 @@ this use).  For example, this:
   use SQL::Translator::Utils qw(header_comment $DEFAULT_COMMENT);
 
   print header_comment(__PACKAGE__,
-                       $DEFAULT_COMMENT, 
+                       $DEFAULT_COMMENT,
                        "Hi mom!");
 
 produces:
 
-  -- 
+  --
   -- Created by My::Prodcuer
   -- Created on Fri Apr 25 06:56:02 2003
-  -- 
+  --
   -- Hi mom!
-  -- 
+  --
 
 Note the gratuitous spacing.