From 776e6befe6897d76df602f3a19fca682b39aa345 Mon Sep 17 00:00:00 2001
From: Romain Quetiez <romain.quetiez@combodo.com>
Date: Sat, 1 May 2010 11:26:48 +0000
Subject: [PATCH] Improvement: allow to create intermediate classes having no
 table (just a different behavior)

SVN:trunk[379]
---
 core/metamodel.class.php | 29 +++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/core/metamodel.class.php b/core/metamodel.class.php
index 78801892c..3a5422d9b 100644
--- a/core/metamodel.class.php
+++ b/core/metamodel.class.php
@@ -1498,7 +1498,19 @@ abstract class MetaModel
 		// First query built upon on the leaf (ie current) class
 		//
 		self::DbgTrace("Main (=leaf) class, call MakeQuerySingleTable()");
-		$oSelectBase = self::MakeQuerySingleTable($aSelectedClasses, $oConditionTree, $aClassAliases, $aTableAliases, $aTranslation, $oFilter, $sClass, $aExpectedAtts, $aExtKeys, $aValues);
+		if (self::HasTable($sClass))
+		{
+			$oSelectBase = self::MakeQuerySingleTable($aSelectedClasses, $oConditionTree, $aClassAliases, $aTableAliases, $aTranslation, $oFilter, $sClass, $aExpectedAtts, $aExtKeys, $aValues);
+		}
+		else
+		{
+			$oSelectBase = null;
+
+			// As the join will not filter on the expected classes, we have to specify it explicitely
+			$sExpectedClasses = implode("', '", self::EnumChildClasses($sClass, ENUM_CHILD_CLASSES_ALL));
+			$oFinalClassRestriction = Expression::FromOQL("`$sClassAlias`.finalclass IN ('$sExpectedClasses')");
+			$oConditionTree = $oConditionTree->LogAnd($oFinalClassRestriction);
+		}
 
 		// Then we join the queries of the eventual parent classes (compound model)
 		foreach(self::EnumParentClasses($sClass) as $sParentClass)
@@ -1506,7 +1518,14 @@ abstract class MetaModel
 			if (self::DBGetTable($sParentClass) == "") continue;
 			self::DbgTrace("Parent class: $sParentClass... let's call MakeQuerySingleTable()");
 			$oSelectParentTable = self::MakeQuerySingleTable($aSelectedClasses, $oConditionTree, $aClassAliases, $aTableAliases, $aTranslation, $oFilter, $sParentClass, $aExpectedAtts, $aExtKeys, $aValues);
-			$oSelectBase->AddInnerJoin($oSelectParentTable, $sKeyField, self::DBGetKey($sParentClass));
+			if (is_null($oSelectBase))
+			{
+				$oSelectBase = $oSelectParentTable;
+			}
+			else
+			{
+				$oSelectBase->AddInnerJoin($oSelectParentTable, $sKeyField, self::DBGetKey($sParentClass));
+			}
 		}
 
 		// Filter on objects referencing me
@@ -1610,8 +1629,10 @@ abstract class MetaModel
 		{
 			$aSelect[$aExpectedAtts['id'][0]] = new FieldExpression(self::DBGetKey($sTableClass), $sTableAlias);
 		}
-		// We need one pkey to be the key, let's take the one corresponding to the leaf
-		if ($sTableClass == $sTargetClass)
+		// We need one pkey to be the key, let's take the one corresponding to the root class
+		// (used to be based on the leaf, but it may happen that this one has no table defined)
+		$sRootClass = self::GetRootClass($sTargetClass);
+		if ($sTableClass == $sRootClass)
 		{
 			$aTranslation[$sTargetAlias]['id'] = array($sTableAlias, self::DBGetKey($sTableClass));
 		}