some better handling of munging fields to columns

[dbsrgits/SQL-Translator-2.0-ish.git] / lib / SQL / Translator / Object / Table.pm

diff --git a/lib/SQL/Translator/Object/Table.pm b/lib/SQL/Translator/Object/Table.pm
index 0ce2861..1389933 100644 (file)
--- a/lib/SQL/Translator/Object/Table.pm
+++ b/lib/SQL/Translator/Object/Table.pm
@@ -168,7 +168,7 @@ class SQL::Translator::Object::Table extends SQL::Translator::Object is dirty {
             $primary_key = SQL::Translator::Object::Constraint->new({ type => 'PRIMARY KEY' });
             $self->add_constraint($primary_key);
         }
-        $primary_key->add_field({ name => $column }) unless $primary_key->exists_column($column); ## FIX ME, change back to add_column once around add_column(coerce .. ) works
+        $primary_key->add_column( name => $column ) unless $primary_key->exists_column($column);
         return $primary_key;
     }
 
@@ -208,9 +208,11 @@ class SQL::Translator::Object::Table extends SQL::Translator::Object is dirty {
     around BUILDARGS(ClassName $self: @args) {
         my $args = $self->$orig(@args);
 
-        my $fields = delete $args->{fields};
-
-        $args->{columns}{$_} = SQL::Translator::Object::Column->new( name => $_ ) for @$fields;
+        my $fields = delete $args->{fields} || [];
+        $fields = ref($fields) eq 'ARRAY' ? $fields : [ $fields ];
+        my $ix_hash = Tie::IxHash->new();
+        $ix_hash->STORE($_, SQL::Translator::Object::Column->new( name => $_ )) for @$fields;
+        $args->{columns} = $ix_hash;
 
         return $args;
     }