Development

Changeset 5853

You must first sign up to be able to contribute.

Changeset 5853

Show
Ignore:
Timestamp:
11/04/07 17:15:11 (1 year ago)
Author:
fabien
Message:

added hooks for doSelectJoinXXX() and doSelectJoinAllExceptXXX() methods (closes #2310)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lib/plugins/sfPropelPlugin/lib/propel/builder/SfPeerBuilder.php

    r5761 r5853  
    221221 
    222222"; 
     223      $tmp = preg_replace('/public static function doSelectJoin.*\(Criteria \$c, \$con = null\)\n\s*{/', '\0'.$mixer_script, $tmp); 
     224    } 
     225 
     226    $script .= $tmp; 
     227  } 
     228 
     229  protected function addDoSelectJoin(&$script) 
     230  { 
     231    $tmp = ''; 
     232    parent::addDoSelectJoin($tmp); 
     233 
     234    if (DataModelBuilder::getBuildProperty('builderAddBehaviors')) 
     235    { 
     236      $mixer_script = " 
     237 
     238    foreach (sfMixer::getCallables('{$this->getClassname()}:doSelectJoin:doSelectJoin') as \$callable) 
     239    { 
     240      call_user_func(\$callable, '{$this->getClassname()}', \$c, \$con); 
     241    } 
     242 
     243"; 
    223244      $tmp = preg_replace('/{/', '{'.$mixer_script, $tmp, 1); 
    224245    } 
    …… 
    227248  } 
    228249 
    229   protected function addDoSelectJoin(&$script) 
    230   { 
    231     $tmp = ''; 
    232     parent::addDoSelectJoin($tmp); 
     250  protected function addDoSelectJoinAll(&$script) 
     251  { 
     252    $tmp = ''; 
     253    parent::addDoSelectJoinAll($tmp); 
    233254 
    234255    if (DataModelBuilder::getBuildProperty('builderAddBehaviors')) 
    …… 
    236257      $mixer_script = " 
    237258 
    238     foreach (sfMixer::getCallables('{$this->getClassname()}:doSelectJoin:doSelectJoin') as \$callable) 
     259    foreach (sfMixer::getCallables('{$this->getClassname()}:doSelectJoinAll:doSelectJoinAll') as \$callable) 
    239260    { 
    240261      call_user_func(\$callable, '{$this->getClassname()}', \$c, \$con); 
    …… 
    242263 
    243264"; 
    244       $tmp = preg_replace('/{/', '{'.$mixer_script, $tmp, 1); 
    245     } 
    246  
    247     $script .= $tmp; 
    248   } 
    249  
    250   protected function addDoSelectJoinAll(&$script) 
    251   { 
    252     $tmp = ''; 
    253     parent::addDoSelectJoinAll($tmp); 
    254  
    255     if (DataModelBuilder::getBuildProperty('builderAddBehaviors')) 
    256     { 
    257       $mixer_script = " 
    258  
    259     foreach (sfMixer::getCallables('{$this->getClassname()}:doSelectJoinAll:doSelectJoinAll') as \$callable) 
    260     { 
    261       call_user_func(\$callable, '{$this->getClassname()}', \$c, \$con); 
    262     } 
    263  
    264 "; 
    265       $tmp = preg_replace('/{/', '{'.$mixer_script, $tmp, 1); 
     265      $tmp = preg_replace('/public static function doSelectJoinAllExcept.*\(Criteria \$c, \$con = null\)\n\s*{/', '\0'.$mixer_script, $tmp); 
    266266    } 
    267267