X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FSQL%2FTranslator%2FObject%2FTable.pm;h=773fc3bce945768b90543172c8d0b7c3898e9e18;hb=2c64974b8705c149608a8e2d2b053fb337d7916c;hp=ed27e2798e9096b2d61ec15affb7b78c1f809a5c;hpb=eea42e0a6adf9ae462233079f17b50219227cdb4;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 ed27e27..773fc3b 100644
--- a/lib/SQL/Translator/Object/Table.pm
+++ b/lib/SQL/Translator/Object/Table.pm
@@ -1,9 +1,11 @@
 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::Types qw(Column Constraint Index Schema Sequence ColumnHash ConstraintHash IndexHash SequenceHash IxHash);
+    use SQL::Translator::Object::Column;
     use SQL::Translator::Object::Constraint;
+    use Tie::IxHash;
     clean;
 
     use overload
@@ -19,64 +21,65 @@ class SQL::Translator::Object::Table extends SQL::Translator::Object is dirty {
     );
     
     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',
-            remove_column => 'delete',
-            clear_columns => 'clear',
+            exists_column => 'EXISTS',
+            column_ids    => 'Keys',
+            get_columns   => 'Values',
+            get_column    => 'FETCH',
+            add_column    => 'STORE',
+            remove_column => 'DELETE',
+            has_columns   => 'Length',
+            clear_columns => 'CLEAR',
         },
-        default => sub { my %hash = (); tie %hash, 'Tie::IxHash'; return \%hash },
+        coerce => 1,
+        default => sub { Tie::IxHash->new() }
     );
     
     has 'indexes' => (
-        traits => ['Hash'],
         is => 'rw',
-        isa => HashRef[Index],
+        isa => IxHash, #IndexHash,
         handles => {
-            exists_index => 'exists',
-            index_ids    => 'keys',
-            get_indices  => 'values',
-            get_index    => 'get',
-            add_index    => 'set',
-            remove_index => 'delete',
+            exists_index => 'EXISTS',
+            index_ids    => 'Keys',
+            get_indices  => 'Values',
+            get_index    => 'FETCH',
+            add_index    => 'STORE',
+            remove_index => 'DELETE',
         },
-        default => sub { my %hash = (); tie %hash, 'Tie::IxHash'; return \%hash },
+        coerce => 1,
+        default => sub { Tie::IxHash->new() }
     );
     
     has 'constraints' => (
-        traits => ['Hash'],
         is => 'rw',
-        isa => HashRef[Constraint],
+        isa => IxHash, #ConstraintHash,
         handles => {
-            exists_constraint => 'exists',
-            constraint_ids    => 'keys',
-            get_constraints   => 'values',
-            get_constraint    => 'get',
-            add_constraint    => 'set',
-            remove_constraint => 'delete',
+            exists_constraint => 'EXISTS',
+            constraint_ids    => 'Keys',
+            get_constraints   => 'Values',
+            get_constraint    => 'FETCH',
+            add_constraint    => 'STORE',
+            remove_constraint => 'DELETE',
         },
-        default => sub { my %hash = (); tie %hash, 'Tie::IxHash'; return \%hash },
+        coerce => 1,
+        default => sub { Tie::IxHash->new() }
     );
     
     has 'sequences' => (
-        traits => ['Hash'],
         is => 'rw',
-        isa => HashRef[Sequence],
+        isa => IxHash, #SequenceHash,
         handles => {
-            exists_sequence => 'exists',
-            sequence_ids    => 'keys',
-            get_sequences   => 'values',
-            get_sequence    => 'get',
-            add_sequence    => 'set',
-            remove_sequence => 'delete',
+            exists_sequence => 'EXISTS',
+            sequence_ids    => 'Keys',
+            get_sequences   => 'Values',
+            get_sequence    => 'FETCH',
+            add_sequence    => 'STORE',
+            remove_sequence => 'DELETE',
         },
-        default => sub { my %hash = (); tie %hash, 'Tie::IxHash'; return \%hash },
+        coerce => 1,
+        default => sub { Tie::IxHash->new() },
     );
 
     has 'schema' => (
@@ -91,10 +94,16 @@ 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);
-        return $self->$orig($column->name, $column);
+        $self->$orig($column->name, $column);
+        return $self->get_column($column->name);
     }
 
     around add_constraint(Constraint $constraint does coerce) {
@@ -108,7 +117,8 @@ class SQL::Translator::Object::Table extends SQL::Translator::Object is dirty {
         if ($constraint->has_type && $constraint->type eq 'PRIMARY KEY') {
             $self->get_column($_)->is_primary_key(1) for $constraint->column_ids;
         }
-        $self->$orig($name, $constraint)
+        $self->$orig($name, $constraint);
+        return $self->get_constraint($name);
     }
 
     around add_index(Index $index does coerce) {
@@ -119,10 +129,14 @@ class SQL::Translator::Object::Table extends SQL::Translator::Object is dirty {
             $name = 'ANON' . $idx;
         }
         $index->table($self);
-        $self->$orig($name, $index)
+        $self->$orig($name, $index);
+        return $self->get_index($name);
     }
 
-    around add_sequence(Sequence $sequence does coerce) { $self->$orig($sequence->name, $sequence) }
+    around add_sequence(Sequence $sequence does coerce) {
+        $self->$orig($sequence->name, $sequence);
+        return $self->get_sequence($sequence->name);
+    }
 
     multi method primary_key {
         my $constraints = $self->constraints;
@@ -145,8 +159,18 @@ class SQL::Translator::Object::Table extends SQL::Translator::Object is dirty {
         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 }
 
@@ -167,4 +191,14 @@ 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};
+
+        $args->{columns}{$_} = SQL::Translator::Object::Column->new( name => $_ ) for @$fields;
+
+        return $args;
+    }
 }