[Jifty-commit] jifty-dbi branch, master, updated. 0.69-4-g0376c53

[Jifty commits]

The branch, master has been updated
       via  0376c53c1b8f67dd5b9cead253436c64b53866ec (commit)
      from  0b77302cd429c98298a046584bdbb7ee417f21f1 (commit)

Summary of changes:
 lib/Jifty/DBI/Schema.pm |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

- Log -----------------------------------------------------------------
commit 0376c53c1b8f67dd5b9cead253436c64b53866ec
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Wed Jun 15 16:33:49 2011 -0400

    Only automatically set the sort order if there isn't one set

diff --git a/lib/Jifty/DBI/Schema.pm b/lib/Jifty/DBI/Schema.pm
index 1d47c31..426ee0f 100644
--- a/lib/Jifty/DBI/Schema.pm
+++ b/lib/Jifty/DBI/Schema.pm
@@ -326,7 +326,8 @@ sub _init_column_for {
     # XXX: deprecated
     $column->mandatory(1) if delete $column->attributes->{not_null};
 
-    $column->sort_order($SORT_ORDERS->{$from}++);
+    $column->sort_order($SORT_ORDERS->{$from}++)
+        unless defined $column->sort_order;
 
     $column->input_filters($column->{input_filters} || []);
     $column->output_filters($column->{output_filters} || []);

-----------------------------------------------------------------------