[Jifty-commit] r1245 - Jifty-DBI/trunk/lib/Jifty/DBI

[jifty-commit at lists.jifty.org]

Author: clkao
Date: Sat Jun 10 18:00:21 2006
New Revision: 1245

Modified:
   Jifty-DBI/trunk/lib/Jifty/DBI/Record.pm

Log:
Do fewer ->COLUMNS calls from ->column, and do fewer ->column calls from
->value.



Modified: Jifty-DBI/trunk/lib/Jifty/DBI/Record.pm
==============================================================================
--- Jifty-DBI/trunk/lib/Jifty/DBI/Record.pm	(original)
+++ Jifty-DBI/trunk/lib/Jifty/DBI/Record.pm	Sat Jun 10 18:00:21 2006
@@ -334,8 +334,10 @@
 sub column {
     my $self = shift;
     my $name = lc( shift || '' );
-    return undef unless $self->COLUMNS and $self->COLUMNS->{$name};
-    return $self->COLUMNS->{$name};
+    my $col = $self->COLUMNS;
+
+    return undef unless $col && exists $col->{$name};
+    return $col->{$name};
 
 }
 
@@ -475,12 +477,10 @@
           && $self->{'decoded'}{$column_name} );
 
     # If the requested column is actually an alias for another, resolve it.
-    if ( $self->column($column_name)
-        and defined $self->column($column_name)->alias_for_column ) {
-        $column_name = $self->column($column_name)->alias_for_column();
-    }
-
     my $column = $self->column($column_name);
+    if  ($column   and defined $column->alias_for_column ) {
+        $column = $self->column($column->alias_for_column());
+    }
 
     return unless ($column);