change "fields" into "columns" (backcompat), probably needs some error/type checking

[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 b6b78d6..13f83a7 100644 (file)
--- a/lib/SQL/Translator/Object/Table.pm
+++ b/lib/SQL/Translator/Object/Table.pm
@@ -3,6 +3,8 @@ class SQL::Translator::Object::Table extends SQL::Translator::Object is dirty {
     use MooseX::Types::Moose qw(Any Bool HashRef Str);
     use MooseX::MultiMethods;
     use SQL::Translator::Types qw(Column Constraint Index Schema Sequence);
+    use SQL::Translator::Object::Column;
+    use SQL::Translator::Object::Constraint;
     clean;
 
     use overload
@@ -28,6 +30,7 @@ class SQL::Translator::Object::Table extends SQL::Translator::Object is dirty {
             get_column    => 'get',
             add_column    => 'set',
             remove_column => 'delete',
+            clear_columns => 'clear',
         },
         default => sub { my %hash = (); tie %hash, 'Tie::IxHash'; return \%hash },
     );
@@ -72,6 +75,7 @@ class SQL::Translator::Object::Table extends SQL::Translator::Object is dirty {
             get_sequences   => 'values',
             get_sequence    => 'get',
             add_sequence    => 'set',
+            remove_sequence => 'delete',
         },
         default => sub { my %hash = (); tie %hash, 'Tie::IxHash'; return \%hash },
     );
@@ -102,6 +106,9 @@ class SQL::Translator::Object::Table extends SQL::Translator::Object is dirty {
             $name = 'ANON' . $idx;
         }
         $constraint->table($self);
+        if ($constraint->has_type && $constraint->type eq 'PRIMARY KEY') {
+            $self->get_column($_)->is_primary_key(1) for $constraint->column_ids;
+        }
         $self->$orig($name, $constraint)
     }
 
@@ -118,8 +125,26 @@ class SQL::Translator::Object::Table extends SQL::Translator::Object is dirty {
 
     around add_sequence(Sequence $sequence does coerce) { $self->$orig($sequence->name, $sequence) }
 
-    multi method primary_key(Any $) { grep /^PRIMARY KEY$/, $_->type for $self->get_constraints }
-    multi method primary_key(Str $column) { $self->get_column($column)->is_primary_key(1) }
+    multi method primary_key {
+        my $constraints = $self->constraints;
+        for my $key (keys %$constraints) {
+            return $constraints->{$key} if $constraints->{$key}{type} eq 'PRIMARY KEY';
+        }
+        return undef;
+    }
+
+    multi method primary_key(Str $column) {
+        die "Column $column does not exist!" unless $self->exists_column($column);
+        $self->get_column($column)->is_primary_key(1);
+
+        my $primary_key = $self->primary_key;
+        unless (defined $primary_key) {
+            $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
+        return $primary_key;
+    }
 
     method is_valid { return $self->get_columns ? 1 : undef }
     method order { }
@@ -143,4 +168,15 @@ class SQL::Translator::Object::Table extends SQL::Translator::Object is dirty {
         die "Can't drop non-existant constraint " . $name unless $self->exists_constraint($name);
         $self->$orig($name);
     }
+
+    around BUILDARGS(ClassName $self: @args) {
+        my $args = $self->$orig(@args);
+
+        my $fields = delete $args->{fields};
+
+        tie %{$args->{columns}}, 'Tie::IxHash';
+        $args->{columns}{$_} = SQL::Translator::Object::Column->new( name => $_ ) for @$fields;
+
+        return $args;
+    }
 }