[svn:p5ee] r13203 - p5ee/trunk/App-Repository/lib/App

[email protected] Tue, 18 Aug 2009 12:47:03 -0700 (PDT)
Newsgroups perl.cvs.p5ee
Message-ID <[email protected]>
Author: spadkins
Date: Tue Aug 18 12:46:59 2009
New Revision: 13203

Modified:
   p5ee/trunk/App-Repository/lib/App/Repository.pm

Log:
Added the expr_no_default attrib

Modified: p5ee/trunk/App-Repository/lib/App/Repository.pm
==============================================================================
--- p5ee/trunk/App-Repository/lib/App/Repository.pm	(original)
+++ p5ee/trunk/App-Repository/lib/App/Repository.pm	Tue Aug 18 12:46:59 2009
@@ -3746,7 +3746,7 @@
                             $val = $self->evaluate_expression($column_defs->{$col}{expr}, $values, $validx, $column_defs);
                             $values->[$idx] = $val;
                         }
-                        if (!defined $val) {
+                        if (!defined $val && !defined $column_defs->{$col}{expr_no_default}) {
                             $val = ($default ne "") ? $default : $column_defs->{$col}{default};
                         }
                     }
@@ -3770,7 +3770,7 @@
                         $val = $self->evaluate_expression($column_defs->{$col}{expr}, $values, $validx, $column_defs);
                         $values->{$col} = $val;
                     }
-                    if (!defined $val) {
+                    if (!defined $val && !defined $column_defs->{$col}{expr_no_default}) {
                         $val = ($default ne "") ? $default : $column_defs->{$col}{default};
                     }
                 }