EZPDO User Forums

--- ezpdo.2007-11-20.orig/src/query/epQueryBuilder.php.orig     Tue Nov 20 06:28:56 2007
+++ ezpdo.2007-11-20/src/query/epQueryBuilder.php  Wed Jul 16 14:00:48 2008
@@ -391,7 +391,8 @@
         // add the super root
         $this->primary_class = $item->getParam('class');
         $this->primary_alias = $item->getParam('alias');
-        $this->pm->addPrimaryRoot($this->primary_class, $this->primary_alias);
+       $doClassRecursion = ! (TRUE == $item->getParam('instanceof'));
+       $this->pm->addPrimaryRoot($this->primary_class, $this->primary_alias, $doClassRecursion);
         
         // go through the rest: secondary roots
         foreach($items as &$item) {
--- ezpdo.2007-11-20.orig/src/query/epQueryLexer.php.orig       Tue Nov 20 06:28:56 2007
+++ ezpdo.2007-11-20/src/query/epQueryLexer.php    Wed Jul 16 11:38:49 2008
@@ -33,6 +33,7 @@
 epDefine('EPQ_T_FALSE');
 epDefine('EPQ_T_FLOAT');
 epDefine('EPQ_T_FROM');
+epDefine('EPQ_T_FROM_INSTANCEOF');
 epDefine('EPQ_T_IDENTIFIER');
 epDefine('EPQ_T_IN');
 epDefine('EPQ_T_INTEGER');
@@ -130,6 +131,7 @@
             'desc'       => EPQ_T_DESC,
             'descending' => EPQ_T_DESC,
             'from'       => EPQ_T_FROM,
+            'instanceof' => EPQ_T_FROM_INSTANCEOF,
             'false'      => EPQ_T_FALSE,
             'in'         => EPQ_T_IN,
             'is'         => EPQ_T_IS,
--- ezpdo.2007-11-20.orig/src/query/epQueryParser.php.orig      Tue Nov 20 06:28:56 2007
+++ ezpdo.2007-11-20/src/query/epQueryParser.php   Wed Jul 16 11:42:15 2008
@@ -680,11 +680,19 @@
         // array to keep all from items
         $items = array();
         do {
+           $foundInstanceOf = FALSE;
+
             // eat ','
             if ($t == ',') {
                 $this->next();
             }
 
+           // handle the instanceof and consume it if it exists
+           if (($t = $this->peek()) == EPQ_T_FROM_INSTANCEOF) {
+             $foundInstanceOf = TRUE;
+             $this->next();
+           }
+   
             // expect an identifier
             if (($t = $this->peek()) != EPQ_T_IDENTIFIER) {
                 $this->syntax_error("A class name is expected");
@@ -724,6 +732,14 @@
         }
         $node->addChildren($items);
 
+       // If the "instanceof" keyword was found do not examine class
+       // children in the query.
+
+       if ( $foundInstanceOf )
+       {
+         $item->setParam('instanceof', TRUE);
+       }
+
         return $node;
     }
 
--- ezpdo.2007-11-20.orig/src/query/epQueryPath.php.orig        Tue Nov 20 06:28:56 2007
+++ ezpdo.2007-11-20/src/query/epQueryPath.php     Wed Jul 16 11:52:15 2008
@@ -594,6 +594,12 @@
     protected $type = false;
 
     /**
+     * Whether or not to do class recursion (include child classes in the SQL)
+     * @var integer
+     */
+    protected $doClassRecursion = true;
+
+    /**
      * Constructor
      * @param string|epClassMap $class
      * @param string $alias
@@ -672,6 +678,22 @@
     }
 
     /**
+     * Should child classes be examined in the SQL?
+     * @return boolean
+     */
+    public function doClassRecursion() {
+      return $this->doClassRecursion;
+    }
+ 
+    /**
+     * Should child classes be examined in the SQL?
+     * @return boolean
+     */
+    public function setClassRecursion($flag) {
+      $this->doClassRecursion = ( is_bool($flag) ? $flag : true );
+    }
+
+    /**
      * Returns field map
      * Implements {@link epQueryPathNode::getMap()}
      * @return epClassMap
@@ -771,6 +793,14 @@
         // array to hold sql parts
         $sql_parts = array();
 
+       // If we are not doing class recursion in the SQL generation
+       // set the specific class.
+ 
+       if ( ! $this->doClassRecursion() )
+       {
+         $this->specificClass($this->cm->getName());
+       }
+
         // for each non-abstract class map
         foreach($this->getClassMaps() as $cm) {
 
@@ -899,6 +929,13 @@
             return false;
         }
 
+       // If not doing class recursion when generating the SQL set the specific class here.
+
+       if ( ! $this->getParent()->doClassRecursion() )
+       {
+         $this->specificClass($base_b);
+       }
+
                // check if spcific class is set. use it only if so.
                if ($sc = $this->specificClass()) {
                        // get class map of specific class
@@ -1196,7 +1233,7 @@
      * @param false|string $alias
      * @return boolean
      */
-    public function addPrimaryRoot($class, &$alias = false) {
+    public function addPrimaryRoot($class, &$alias = false, $doClassRecursion = true) {
 
         // create primary root node 
         if (!($node = new epQueryPathRoot($class, $alias, epQueryPathRoot::PRIMARY, $this->am))) {
@@ -1203,6 +1240,8 @@
             return false;
         }
         
+       $node->setClassRecursion($doClassRecursion);
+
         // put it into alias-root lookup
         $this->proot = $this->alias2root[$alias = $node->getAlias()] = & $node;