X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FSQL%2FTranslator%2FObject%2FTable.pm;h=878cd1149ac99b0a72f303573a2694a0dbd65339;hb=160f1f551395c24929216b166a3eb45c3096f435;hp=54d28c12972d680bad51dfee7d06c113e063e926;hpb=0c4b09d0b3e88aeec94c096075f56b88d7410cef;p=dbsrgits%2FSQL-Translator-2.0-ish.git

diff --git a/lib/SQL/Translator/Object/Table.pm b/lib/SQL/Translator/Object/Table.pm
index 54d28c1..878cd11 100644
--- a/lib/SQL/Translator/Object/Table.pm
+++ b/lib/SQL/Translator/Object/Table.pm
@@ -1,8 +1,10 @@
 use MooseX::Declare;
 class SQL::Translator::Object::Table extends SQL::Translator::Object is dirty {
-    use MooseX::Types::Moose qw(Any Bool HashRef Str);
+    use MooseX::Types::Moose qw(Any Bool HashRef Int 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
@@ -27,10 +29,8 @@ class SQL::Translator::Object::Table extends SQL::Translator::Object is dirty {
             get_columns   => 'values',
             get_column    => 'get',
             add_column    => 'set',
-
-            ## compat
-            get_fields    => 'values',
-            fields        => 'keys',
+            remove_column => 'delete',
+            clear_columns => 'clear',
         },
         default => sub { my %hash = (); tie %hash, 'Tie::IxHash'; return \%hash },
     );
@@ -45,6 +45,7 @@ class SQL::Translator::Object::Table extends SQL::Translator::Object is dirty {
             get_indices  => 'values',
             get_index    => 'get',
             add_index    => 'set',
+            remove_index => 'delete',
         },
         default => sub { my %hash = (); tie %hash, 'Tie::IxHash'; return \%hash },
     );
@@ -59,6 +60,7 @@ class SQL::Translator::Object::Table extends SQL::Translator::Object is dirty {
             get_constraints   => 'values',
             get_constraint    => 'get',
             add_constraint    => 'set',
+            remove_constraint => 'delete',
         },
         default => sub { my %hash = (); tie %hash, 'Tie::IxHash'; return \%hash },
     );
@@ -73,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 },
     );
@@ -81,7 +84,6 @@ class SQL::Translator::Object::Table extends SQL::Translator::Object is dirty {
         is => 'rw',
         isa => Schema,
         weak_ref => 1,
-        required => 1,
     );
 
     has 'temporary' => (
@@ -90,29 +92,106 @@ class SQL::Translator::Object::Table extends SQL::Translator::Object is dirty {
         default => 0
     );
 
-    around add_column(Column $column) { $self->$orig($column->name, $column) }
-    around add_constraint(Constraint $constraint) {
+    has '_order' => (
+        is => 'rw',
+        isa => Int,
+    );
+
+    around add_column(Column $column does coerce) {
+        die "Can't use column name " . $column->name if $self->exists_column($column->name) || $column->name eq '';
+        $column->table($self);
+        return $self->$orig($column->name, $column);
+    }
+
+    around add_constraint(Constraint $constraint does coerce) {
         my $name = $constraint->name;
         if ($name eq '') {
             my $idx = 0;
             while ($self->exists_constraint('ANON' . $idx)) { $idx++ }
             $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)
     }
-    around add_index(Index $index) {
+
+    around add_index(Index $index does coerce) {
         my $name = $index->name;
         if ($name eq '') {
             my $idx = 0;
             while ($self->exists_index('ANON' . $idx)) { $idx++ }
             $name = 'ANON' . $idx;
         }
+        $index->table($self);
         $self->$orig($name, $index)
     }
-    around add_sequence(Sequence $sequence) { $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) }
+    around add_sequence(Sequence $sequence does coerce) { $self->$orig($sequence->name, $sequence) }
+
+    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;
+    }
+
+    multi method order(Int $order) { $self->_order($order); }
+    multi method order {
+        my $order = $self->_order;
+        unless (defined $order && $order) {
+            my $tables = Tie::IxHash->new( map { $_->name => $_ } $self->schema->get_tables );
+            $order = $tables->Indices($self->name) || 0; $order++;
+            $self->_order($order);
+        }
+        return $order;
+    }
+
+    method is_valid { return $self->get_columns ? 1 : undef }
 
-    method order { }
+    before name($name?) { die "Can't use table name $name, table already exists" if $name && $self->schema->exists_table($name) && $name ne $self->name }
+
+    around remove_column(Column|Str $column, Int :$cascade = 0) {
+        my $name = is_Column($column) ? $column->name : $column;
+        die "Can't drop non-existant column " . $name unless $self->exists_column($name);
+        $self->$orig($name);
+    }
+
+    around remove_index(Index|Str $index) {
+        my $name = is_Index($index) ? $index->name : $index;
+        die "Can't drop non-existant index " . $name unless $self->exists_index($name);
+        $self->$orig($name);
+    }
+
+    around remove_constraint(Constraint|Str $constraint) {
+        my $name = is_Constraint($constraint) ? $constraint->name : $constraint;
+        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;
+    }
 }