fix issue with order being wrong

[dbsrgits/SQL-Translator-2.0-ish.git] / lib / SQL / Translator / Object / Column.pm

diff --git a/lib/SQL/Translator/Object/Column.pm b/lib/SQL/Translator/Object/Column.pm
index 25dfd30..80aea11 100644 (file)
--- a/lib/SQL/Translator/Object/Column.pm
+++ b/lib/SQL/Translator/Object/Column.pm
@@ -21,7 +21,7 @@ class SQL::Translator::Object::Column extends SQL::Translator::Object is dirty {
         is => 'rw',
         isa => Str,
         required => 1,
-        trigger => sub { my ($self, $new, $old) = @_; if (defined $old) { $self->table->remove_column($old); $self->table->add_column($self) } }
+#        trigger => sub { my ($self, $new, $old) = @_; if (defined $old) { $self->table->remove_column($old); $self->table->add_column($self) } }
     );
     
     has 'data_type' => (
@@ -61,6 +61,12 @@ class SQL::Translator::Object::Column extends SQL::Translator::Object is dirty {
         required => 1,
         default => 1
     );
+
+    has 'is_unique' => (
+        is => 'rw',
+        isa => Bool,
+        default => 0,
+    );
     
     has 'default_value' => (
         is => 'rw',
@@ -97,6 +103,11 @@ class SQL::Translator::Object::Column extends SQL::Translator::Object is dirty {
         isa => Trigger,
     );
 
+    has '_order' => (
+        is => 'rw',
+        isa => Int,
+    );
+
     around size(@args) {
         $self->$orig(@args) if @args;
         my @sizes = $self->$orig;
@@ -107,9 +118,6 @@ class SQL::Translator::Object::Column extends SQL::Translator::Object is dirty {
     method full_name { $self->table->name . '.' . $self->name }
     method schema { $self->table->schema }
 
-    method order { }
-    method is_unique { }
-
     before name($name?) { die "Can't use column name $name" if defined $name && $self->table->exists_column($name) && $name ne $self->name }
 
     multi method size(Str $size) { my ($length, $precision) = split /,/, $size; $self->length($length); $self->precision($precision) if $precision; $self->size }
@@ -124,8 +132,19 @@ class SQL::Translator::Object::Column extends SQL::Translator::Object is dirty {
         : $self->length;
     }
 
+    multi method order(Int $order) { $self->_order($order); }
+    multi method order {
+        my $order = $self->_order;
+        unless (defined $order && $order) {
+            my $columns = Tie::IxHash->new( map { $_->name => $_ } $self->table->get_columns );
+            $order = ($columns->Indices($self->name) + 1) || 0;
+            $self->_order($order);
+        }
+        return $order;
+    }
+
     method BUILD(HashRef $args) {
         die "Cannot use column name $args->{name}" if $args->{name} eq '';
-        $self->size($args->{size}) if $args->{size}
+        $self->size($args->{size}) if $args->{size};
     }
 }