ManyToMany and TaggableDaoWorker first version of hardfix

Author: AlexeyDsov

main/DAOs/Workers/CommonDaoWorker.class.php

@@ -484,7 +484,7 @@ public function dropById($id)
 		 * @return Closure
 		 */
 		public function getUncacheByIdFunc($id) {
-			$dao = $this->dao();
+			$dao = $this->dao;
 			$function = parent::getUncacheByIdFunc($id);
 			return function () use ($function, $dao) {
 				$dao->uncacheLists();

main/DAOs/Workers/TaggableSmartHandler.class.php

@@ -27,22 +27,29 @@ public function getUncacheObjectTags(IdentifiableObject $object, $className)
 			$tags = array_merge($this->getDefaultTags($className), $tags);
 
 			foreach ($this->getLinkProperties($className) as $name => $property) {
+				/* @var $property LightMetaProperty */
 				if ($name == 'id') {
 					continue;
 				}
 				if ($property->getClassName()) {
-					if ($property->getFetchStrategyId() == FetchStrategy::LAZY) {
-						if ($linkedObjectId = $object->{$property->getGetter().'Id'}()) {
-							$tags[] = $this->getTagByClassAndId($property->getClassName(), $linkedObjectId);
-						}
-					} elseif ($property->getFetchStrategyId()) {
-						if (
-							($linkedObject = $object->{$property->getGetter()}())
-							&& $linkedObject instanceof IdentifiableObject
-							&& $linkedObjectId = $linkedObject->getId()
-						) {
-							$tags[] = $this->getTagByClassAndId($property->getClassName(), $linkedObjectId);
+					if ($property->getRelationId() == MetaRelation::ONE_TO_ONE) {
+						if ($property->getFetchStrategyId() == FetchStrategy::LAZY) {
+							if ($linkedObjectId = $object->{$property->getGetter().'Id'}()) {
+								$tags[] = $this->getTagByClassAndId($property->getClassName(), $linkedObjectId);
+							}
+						} elseif ($property->getFetchStrategyId()) {
+							if (
+								($linkedObject = $object->{$property->getGetter()}())
+								&& $linkedObject instanceof IdentifiableObject
+								&& $linkedObjectId = $linkedObject->getId()
+							) {
+								$tags[] = $this->getTagByClassAndId($property->getClassName(), $linkedObjectId);
+							}
 						}
+					} elseif ($property->getRelationId() == MetaRelation::MANY_TO_MANY) {
+						$daoHelper = $object->{$property->getGetter()}();
+						/* @var $daoHelper ManyToManyLinked */
+						$tags[] = $daoHelper->getHelperTable();
 					}
 				}
 			}
@@ -83,7 +90,6 @@ public function getQueryTags(SelectQuery $query, $className)
 				}
 			}
 
-
 			return $tagList;
 		}
 
@@ -166,7 +172,9 @@ protected function getLinkObjectColumnListByClass($className)
 				$columnList = array();
 				foreach ($this->getLinkProperties($className) as $property) {
 					/* @var $property LightMetaProperty */
-					$columnList[$property->getColumnName()] = $property->getClassName();
+					if ($property->getRelationId() == MetaRelation::ONE_TO_ONE || $property->getName() == 'id') {
+						$columnList[$property->getColumnName()] = $property->getClassName();
+					}
 				}
 				$result[$className] = $columnList;
 			}
@@ -206,10 +214,12 @@ protected function getLinkProperties($className) {
 					);
 				} elseif ($property instanceof LightMetaProperty) {
 					switch ($property->getType()) {
-						case 'identifierList':
 						case 'identifier':
+						case 'identifierList':
 						case 'integerIdentifier':
+						case 'integerIdentifierList':
 						case 'scalarIdentifier':
+						case 'scalarIdentifierList':
 							if ($property->getClassName()) {
 								$propertyList[] = $property;
 							}

main/UnifiedContainer/UnifiedContainer.class.php

@@ -330,6 +330,7 @@ public function save()
 
 			$this->clones = array();
 			$this->syncClones();
+			$this->parent->dao()->uncacheById($this->getParentObject()->getId());
 			$this->dao->uncacheLists();
 
 			return $this;