fix up some ordering issues

[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 64cf5df..878cd11 100644 (file)
--- a/lib/SQL/Translator/Object/Table.pm
+++ b/lib/SQL/Translator/Object/Table.pm
@@ -1,8 +1,9 @@
 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;
 
@@ -91,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);
@@ -141,12 +147,22 @@ class SQL::Translator::Object::Table extends SQL::Translator::Object is dirty {
             $primary_key = SQL::Translator::Object::Constraint->new({ type => 'PRIMARY KEY' });
             $self->add_constraint($primary_key);
         }
-        $primary_key->add_column(SQL::Translator::Object::Column->new({ name => $column })) unless $primary_key->exists_column($column);
+        $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 }
 
@@ -167,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;
+    }
 }