Author: spadkins
Date: Fri Feb 6 09:43:53 2009
New Revision: 12478
Modified:
p5ee/trunk/App-Repository/lib/App/Repository/DBI.pm
Log:
logic changes for dbexpr_update_applied, oracle
Modified: p5ee/trunk/App-Repository/lib/App/Repository/DBI.pm
==============================================================================
--- p5ee/trunk/App-Repository/lib/App/Repository/DBI.pm (original)
+++ p5ee/trunk/App-Repository/lib/App/Repository/DBI.pm Fri Feb 6 09:43:53 2009
@@ -922,10 +922,15 @@
if (!$options->{single_table} && $dbexpr && $options->{reqd_tables} &&
$tablealiashref) {
$self->_require_tables($dbexpr, $options->{reqd_tables},
$tablealiashref, 2);
}
-
- if ($dbexpr && !$dbexpr_update_applied) {
- $column = $dbexpr;
- $column =~ s/\b$alias\.//g if ($options->{single_table});
+ if ($dbexpr) {
+ if ($dbexpr_update_applied) {
+ $column = $column_def->{dbexpr_raw} || $dbexpr;
+ $column =~ s/\b$alias\.//g if ($options->{single_table});
+ }
+ else {
+ $column = $dbexpr;
+ $column =~ s/\b$alias\.//g if ($options->{single_table});
+ }
}
if ($include_null) {
