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=9040e968c2557f85d654704f012469af6580256e;hpb=0a7ce17ebd004c0f96d9f70370fe7a93820eed8f;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 9040e96..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
@@ -90,6 +92,11 @@ class SQL::Translator::Object::Table extends SQL::Translator::Object is dirty {
         default => 0
     );
 
+    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);
@@ -123,14 +130,39 @@ 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 { grep /^PRIMARY KEY$/, $_->type for $self->get_constraints }
+    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 }
 
@@ -151,4 +183,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;
+    }
 }