[svn:p5ee] r3725 - in p5ee/trunk/App-Repository/lib/App: . Repository

Author: spadkins
Date: Wed Mar 29 11:30:58 2006
New Revision: 3725

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

Log:
shutdown_parent_process_resources(), substitute() on joincriteria

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	Wed Mar 29 11:30:58 2006
@@ -362,6 +362,12 @@
 
 sub _disconnect { 1; }
 
+sub _shutdown_parent_process_resources {
+    &App::sub_entry if ($App::trace);
+    my $self = shift;
+    &App::sub_exit() if ($App::trace);
+}
+
 #############################################################################
 # _is_connected()
 #############################################################################

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	Wed Mar 29 11:30:58 2006
@@ -299,6 +299,13 @@
     1;
 }
 
+sub _shutdown_parent_process_resources {
+    &App::sub_entry if ($App::trace);
+    my $self = shift;
+    $self->_disconnect_client_only();
+    &App::sub_exit() if ($App::trace);
+}
+
 sub _is_connected {
     &App::sub_entry if ($App::trace);
     my $self = shift;
@@ -1343,6 +1350,9 @@
             $dbtable = $tablealiashref->{$tablealias}{table};
             $tableref = ($dbtable) ? "$dbtable $tablealias" : $tablealias;
             $where_condition = $tablealiashref->{$tablealias}{joincriteria};
+            if ($where_condition =~ /\{.*\}/) {
+                $where_condition = $self->substitute($where_condition);
+            }
             if ($tablealiashref->{$tablealias}{cardinality_zero}) {
                 push(@outer_join_clauses, "left join $tableref on $where_condition") if ($where_condition);
                 #print "   $tablealias is [$dbtable] as [$tableref] where [$where_condition] (outer)\n";