add an around BUILDARGS to process fields arg properly

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

diff --git a/lib/SQL/Translator/Object/Constraint.pm b/lib/SQL/Translator/Object/Constraint.pm
index f8913c9..91dbff0 100644 (file)
--- a/lib/SQL/Translator/Object/Constraint.pm
+++ b/lib/SQL/Translator/Object/Constraint.pm
@@ -2,7 +2,8 @@ use MooseX::Declare;
 class SQL::Translator::Object::Constraint extends SQL::Translator::Object {
     use MooseX::Types::Moose qw(ArrayRef Bool HashRef Int Maybe Str Undef);
     use MooseX::MultiMethods;
-    use SQL::Translator::Types qw(Column MatchType Table);
+    use SQL::Translator::Types qw(Column MatchType Table ColumnHash IxHash);
+    use Tie::IxHash;
 
     has 'table' => (
         is => 'rw',
@@ -18,18 +19,19 @@ class SQL::Translator::Object::Constraint extends SQL::Translator::Object {
     );
     
     has 'columns' => (
-        traits => ['Hash'],
         is => 'rw',
-        isa => HashRef[Column],
+        isa => IxHash, #ColumnHash,
         handles => {
-            exists_column => 'exists',
-            column_ids    => 'keys',
-            get_columns   => 'values',
-            get_column    => 'get',
-            add_column    => 'set',
-            clear_columns => 'clear',
+            exists_column => 'EXISTS',
+            column_ids    => 'Keys',
+            get_columns   => 'Values',
+            get_column    => 'FETCH',
+            add_column    => 'STORE',
+            remove_column => 'DELETE',
+            clear_columns => 'CLEAR',
         },
-        default => sub { my %hash = (); tie %hash, 'Tie::IxHash'; return \%hash },
+        coerce => 1,
+        default => sub { Tie::IxHash->new() }
     );
     
     has 'type' => (
@@ -82,11 +84,12 @@ class SQL::Translator::Object::Constraint extends SQL::Translator::Object {
     has 'on_delete' => ( is => 'rw', required => 0);
     has 'on_update' => ( is => 'rw', required => 0);
 
-    around add_column(Column $column) {
+    around add_column(Column $column does coerce) {
         if ($self->has_type && $self->type eq 'PRIMARY KEY') {
             $column->is_primary_key(1);
         }
-        $self->$orig($column->name, $column)
+        $self->$orig($column->name, $column);
+        return $self->get_column($column->name);
     }
 
     multi method order(Int $order) { $self->_order($order); }
@@ -101,4 +104,17 @@ class SQL::Translator::Object::Constraint extends SQL::Translator::Object {
     }
 
     method is_valid { return $self->has_type && scalar $self->column_ids ? 1 : undef }
+
+    around BUILDARGS(ClassName $self: @args) {
+        my $args = $self->$orig(@args);
+
+        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;
+     }
 }