From b66410e45ea9e2661a5892c4bae80dd7f2693eb6 Mon Sep 17 00:00:00 2001
From: Taras Machyshyn <taras@letrium.com>
Date: Wed, 18 Dec 2013 10:53:45 +0200
Subject: [PATCH] rename espoMetadata to ormMetadata

---
 application/Espo/Core/Loaders/EntityManager.php    |  2 +-
 application/Espo/Core/Utils/Database/Converter.php |  4 ++--
 application/Espo/Core/Utils/Metadata.php           | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/application/Espo/Core/Loaders/EntityManager.php b/application/Espo/Core/Loaders/EntityManager.php
index ceee12b80a..27b97d91ad 100644
--- a/application/Espo/Core/Loaders/EntityManager.php
+++ b/application/Espo/Core/Loaders/EntityManager.php
@@ -28,7 +28,7 @@ class EntityManager
 			'dbname' => $config->get('database.dbname'),
 			'user' => $config->get('database.user'),
 			'password' => $config->get('database.password'),
-			'metadata' => $this->getContainer()->get('metadata')->getEspoMetadata(),
+			'metadata' => $this->getContainer()->get('metadata')->getOrmMetadata(),
 		);
 
 		$entityManager = new \Espo\Core\ORM\EntityManager($params);
diff --git a/application/Espo/Core/Utils/Database/Converter.php b/application/Espo/Core/Utils/Database/Converter.php
index 2c944da291..07ced0812e 100644
--- a/application/Espo/Core/Utils/Database/Converter.php
+++ b/application/Espo/Core/Utils/Database/Converter.php
@@ -50,7 +50,7 @@ class Converter
 	public function getSchemaFromMetadata()
 	{
 		if (!isset($this->schemaFromMetadata)) {
-        	$databaseMeta = $this->getMetadata()->getEspoMetadata();
+        	$databaseMeta = $this->getMetadata()->getOrmMetadata();
         	$entityDefs = $this->getMetadata()->get('entityDefs');
 
 			$schema = $this->getSchemaConverter()->process($databaseMeta, $entityDefs);
@@ -85,7 +85,7 @@ class Converter
         $databaseMeta = $this->getOrmConverter()->prepare($databaseMeta);
 
 		//save database meta to a file espoMetadata.php
-        $result = $this->getMetadata()->setEspoMetadata($databaseMeta);
+        $result = $this->getMetadata()->setOrmMetadata($databaseMeta);
 
 
 		$GLOBALS['log']->add('Debug', 'Converter:process() - End: converting metadata to orm format and database schema, result=['.$result.']');
diff --git a/application/Espo/Core/Utils/Metadata.php b/application/Espo/Core/Utils/Metadata.php
index a2ef8028a2..3c2a82837c 100644
--- a/application/Espo/Core/Utils/Metadata.php
+++ b/application/Espo/Core/Utils/Metadata.php
@@ -199,13 +199,13 @@ class Metadata
 	}
 
 
-	public function getEspoMetadata()
+	public function getOrmMetadata()
 	{
 		if (!empty($this->espoMetadata)) {
 			return $this->espoMetadata;
 		}
 
-		$espoMetadataFile = Util::concatPath($this->getMetaConfig()->cachePath, 'espoMetadata.php');
+		$espoMetadataFile = Util::concatPath($this->getMetaConfig()->cachePath, 'ormMetadata.php');
 
 		if (!file_exists($espoMetadataFile)) {
         	$this->getConverter()->process();
@@ -216,11 +216,11 @@ class Metadata
         return $this->espoMetadata;
 	}
 
-	public function setEspoMetadata(array $espoMetadata)
+	public function setOrmMetadata(array $espoMetadata)
 	{
-		 $result = $this->getFileManager()->setContentPHP($espoMetadata, $this->getMetaConfig()->cachePath, 'espoMetadata.php');
+		 $result = $this->getFileManager()->setContentPHP($espoMetadata, $this->getMetaConfig()->cachePath, 'ormMetadata.php');
 		 if ($result == false) {
-		 	$GLOBALS['log']->add('EXCEPTION', 'Metadata::setEspoMetadata() - Cannot save espoMetadata to a file');
+		 	$GLOBALS['log']->add('EXCEPTION', 'Metadata::setOrmMetadata() - Cannot save ormMetadata to a file');
          	throw new \Espo\Core\Exceptions\Error();
 		 }