X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FSQL%2FTranslator%2FObject%2FColumn.pm;h=80aea11d096ea6ea9719ef7c3f7abc472f919a92;hb=815822d5f3e5685d46adcbb7fbaf296f27006ee6;hp=d06923bd115161fa3290ff42e2d40af4cb5bef8a;hpb=e8ef9a9be3d177e824ac8960b7a9ffec0f368275;p=dbsrgits%2FSQL-Translator-2.0-ish.git

diff --git a/lib/SQL/Translator/Object/Column.pm b/lib/SQL/Translator/Object/Column.pm
index d06923b..80aea11 100644
--- a/lib/SQL/Translator/Object/Column.pm
+++ b/lib/SQL/Translator/Object/Column.pm
@@ -2,7 +2,7 @@ use MooseX::Declare;
 class SQL::Translator::Object::Column extends SQL::Translator::Object is dirty {
     use MooseX::Types::Moose qw(Bool Int Maybe ScalarRef Str);
     use MooseX::MultiMethods;
-    use SQL::Translator::Types qw(Bit ColumnSize Constraint Table Trigger);
+    use SQL::Translator::Types qw(Bit Constraint Table Trigger);
     clean;
 
     use overload
@@ -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->drop_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' => (
@@ -29,6 +29,7 @@ class SQL::Translator::Object::Column extends SQL::Translator::Object is dirty {
         isa => Str,
         required => 1,
         default => '',
+        trigger => sub { my ($self, $new, $old) = @_; $self->is_auto_increment(1) if $new =~ /^serial$/i; },
     );
 
     has 'sql_data_type' => (
@@ -60,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',
@@ -96,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;
@@ -106,16 +118,13 @@ 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 }
     multi method size(Int $length, Int $precision) { $self->length($length); $self->precision($precision); $self->size }
     multi method size(ArrayRef $size) { $self->length($size->[0]); $self->precision($size->[1]) if @$size == 2; $self->size }
 
-    multi method size(Any $) {
+    multi method size {
         return $self->has_precision
         ? wantarray
             ? ($self->length, $self->precision) 
@@ -123,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};
     }
 }