espocrm-extensions/espocrm-base
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://172.20.0.1/var/git/espo/backend

Browse Source
This commit is contained in:
Yuri Kuznetsov
2013-12-20 12:02:45 +02:00
parent 365cb02ac8 b06155ece5
commit 22be9dc7c6
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/Espo/Core/Utils/Database/Converters/Links.php
+3 -3
View File
@@ -89,14 +89,14 @@ class Links
}
protected function belongsToParent($params, $foreignParams)
/*protected function belongsToParent($params, $foreignParams)
{
return $this->getRelations()->belongsToParent($params, $foreignParams);
}
}*/
protected function linkParent($params, $foreignParams)
{
return $this->getRelations()->belongsToParent($params, $foreignParams);
return $this->getRelations()->linkParent($params, $foreignParams);
}
application/Espo/Core/Utils/Database/Converters/Relations.php
+3 -2
View File
@@ -128,7 +128,7 @@ class Relations
$params['link']['name'].'Name' => array(
'type' => Entity::FOREIGN,
'relation' => $params['link']['name'],
'notStorable' => true,
//'notStorable' => true,
'foreign' => $this->getForeignField('name', $foreignParams['entityName']),
),
$params['link']['name'].'Id' => array(
@@ -188,7 +188,8 @@ class Relations
}
//uses for belongsToParent and linkParent
public function belongsToParent($params, $foreignParams)
//public function belongsToParent($params, $foreignParams)
public function linkParent($params, $foreignParams)
{
$relation = array();
application/Espo/Core/Utils/Database/Converters/Schema.php
+6 -2
View File
@@ -27,6 +27,10 @@ class Schema
'len' => '24',
);
protected $notStorableTypes = array(
'foreign'
);
public function __construct()
{
$this->dbalSchema = new \Doctrine\DBAL\Schema\Schema();
@@ -55,7 +59,7 @@ class Schema
$uniqueColumns = array();
foreach ($entityParams['fields'] as $fieldName => $fieldParams) {
if (isset($fieldParams['notStorable']) && $fieldParams['notStorable']) {
if ((isset($fieldParams['notStorable']) && $fieldParams['notStorable']) || in_array($fieldParams['type'], $this->notStorableTypes)) {
continue;
}
@@ -81,7 +85,7 @@ class Schema
$fieldType = isset($fieldParams['dbType']) ? $fieldParams['dbType'] : $fieldParams['type'];
if (!in_array($fieldType, $this->typeList)) {
$GLOBALS['log']->add('DEBUG', 'Field type ['.$fieldType.'] does not exist '.$entityName.':'.$fieldName);
$GLOBALS['log']->add('DEBUG', 'Converters/Schema::process(): Field type ['.$fieldType.'] does not exist '.$entityName.':'.$fieldName);
continue;
}