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

query executor method rename

Browse Source
This commit is contained in:
Yuri Kuznetsov
2020-08-18 20:01:13 +03:00
parent 0f1b8ecb39
commit 3d7a04be8e
17 changed files with 63 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/Espo/Core/Cleanup/Reminders.php
+1 -1
View File
@@ -62,6 +62,6 @@ class Reminders
])
->build();
$this->entityManager->getQueryExecutor()->run($delete);
$this->entityManager->getQueryExecutor()->execute($delete);
}
}
application/Espo/Core/Repositories/CategoryTree.php
+5 -5
View File
@@ -70,7 +70,7 @@ class CategoryTree extends Database
->valuesQuery($select)
->build();
$em->getQueryExecutor()->run($insert);
$em->getQueryExecutor()->execute($insert);
return;
}
@@ -85,7 +85,7 @@ class CategoryTree extends Database
])
->build();
$em->getQueryExecutor()->run($insert);
$em->getQueryExecutor()->execute($insert);
return;
}
@@ -118,7 +118,7 @@ class CategoryTree extends Database
])
->build();
$em->getQueryExecutor()->run($delete);
$em->getQueryExecutor()->execute($delete);
if (!empty($parentId)) {
$select = $em->getQueryBuilder()
@@ -139,7 +139,7 @@ class CategoryTree extends Database
->valuesQuery($select)
->build();
$em->getQueryExecutor()->run($insert);
$em->getQueryExecutor()->execute($insert);
}
}
@@ -159,7 +159,7 @@ class CategoryTree extends Database
])
->build();
$em->getQueryExecutor()->run($delete);
$em->getQueryExecutor()->execute($delete);
$em->getMapper()->deleteFromDb($entity->getEntityType(), $entity->id);
}
application/Espo/Core/Repositories/Event.php
+1 -1
View File
@@ -134,7 +134,7 @@ class Event extends Database implements
])
->build();
$this->getEntityManager()->getQueryExecutor()->run($delete);
$this->getEntityManager()->getQueryExecutor()->execute($delete);
}
protected function afterSave(Entity $entity, array $options = [])
application/Espo/Core/Utils/Cron/Job.php
+1 -1
View File
@@ -358,7 +358,7 @@ class Job
])
->build();
$this->entityManager->getQueryExecutor()->run($delete);
$this->entityManager->getQueryExecutor()->execute($delete);
}
}
application/Espo/Core/Utils/Database/Schema/rebuildActions/Currency.php
+1 -1
View File
@@ -49,7 +49,7 @@ class Currency extends \Espo\Core\Utils\Database\Schema\BaseRebuildActions
->from('Currency')
->build();
$this->getEntityManager()->getQueryExecutor()->run($delete);
$this->getEntityManager()->getQueryExecutor()->execute($delete);
foreach ($currencyRates as $currencyName => $rate) {
$this->getEntityManager()->createEntity('Currency', [
application/Espo/Jobs/Cleanup.php
+11 -11
View File
@@ -126,7 +126,7 @@ class Cleanup implements Job
])
->build();
$this->entityManager->getQueryExecutor()->run($delete);
$this->entityManager->getQueryExecutor()->execute($delete);
$delete = $this->entityManager->getQueryBuilder()->delete()
->from('Job')
@@ -137,7 +137,7 @@ class Cleanup implements Job
])
->build();
$this->entityManager->getQueryExecutor()->run($delete);
$this->entityManager->getQueryExecutor()->execute($delete);
}
protected function cleanupUniqueIds()
@@ -150,7 +150,7 @@ class Cleanup implements Job
])
->build();
$this->entityManager->getQueryExecutor()->run($delete);
$this->entityManager->getQueryExecutor()->execute($delete);
}
protected function cleanupScheduledJobLog()
@@ -189,7 +189,7 @@ class Cleanup implements Job
])
->build();
$this->entityManager->getQueryExecutor()->run($delete);
$this->entityManager->getQueryExecutor()->execute($delete);
}
}
@@ -206,7 +206,7 @@ class Cleanup implements Job
])
->build();
$this->entityManager->getQueryExecutor()->run($delete);
$this->entityManager->getQueryExecutor()->execute($delete);
}
protected function cleanupAuthToken()
@@ -223,7 +223,7 @@ class Cleanup implements Job
])
->build();
$this->entityManager->getQueryExecutor()->run($delete);
$this->entityManager->getQueryExecutor()->execute($delete);
}
protected function cleanupAuthLog()
@@ -239,7 +239,7 @@ class Cleanup implements Job
])
->build();
$this->entityManager->getQueryExecutor()->run($delete);
$this->entityManager->getQueryExecutor()->execute($delete);
}
protected function getCleanupJobFromDate()
@@ -356,7 +356,7 @@ class Cleanup implements Job
])
->build();
$this->entityManager->getQueryExecutor()->run($delete);
$this->entityManager->getQueryExecutor()->execute($delete);
}
protected function cleanupEmails()
@@ -391,7 +391,7 @@ class Cleanup implements Job
])
->build();
$this->entityManager->getQueryExecutor()->run($delete);
$this->entityManager->getQueryExecutor()->execute($delete);
$delete = $this->entityManager->getQueryBuilder()->delete()
->from('EmailUser')
@@ -400,7 +400,7 @@ class Cleanup implements Job
])
->build();
$this->entityManager->getQueryExecutor()->run($delete);
$this->entityManager->getQueryExecutor()->execute($delete);
}
}
@@ -497,7 +497,7 @@ class Cleanup implements Job
->where($where)
->build();
$this->entityManager->getQueryExecutor()->run($delete);
$this->entityManager->getQueryExecutor()->execute($delete);
} catch (\Exception $e) {
$GLOBALS['log']->error("Cleanup: " . $e->getMessage());
application/Espo/Modules/Crm/Services/Activities.php
+7 -7
View File
@@ -769,7 +769,7 @@ class Activities implements
->select('COUNT:(c.id)', 'count')
->build();
$sth = $this->entityManager->getQueryExecutor()->run($countQuery);
$sth = $this->entityManager->getQueryExecutor()->execute($countQuery);
$row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -791,7 +791,7 @@ class Activities implements
$unionQuery = $builder->build();
$sth = $this->entityManager->getQueryExecutor()->run($unionQuery);
$sth = $this->entityManager->getQueryExecutor()->execute($unionQuery);
$rowList = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -923,7 +923,7 @@ class Activities implements
->select('COUNT:(c.id)', 'count')
->build();
$sth = $this->entityManager->getQueryExecutor()->run($countQuery);
$sth = $this->entityManager->getQueryExecutor()->execute($countQuery);
$row = $sth->fetch(\PDO::FETCH_ASSOC);
@@ -1702,7 +1702,7 @@ class Activities implements
$unionQuery = $builder->build();
$sth = $this->entityManager->getQueryExecutor()->run($unionQuery);
$sth = $this->entityManager->getQueryExecutor()->execute($unionQuery);
$rowList = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1731,7 +1731,7 @@ class Activities implements
$deleteQuery = $builder->build();
$this->getEntityManager()->getQueryExecutor()->run($deleteQuery);
$this->getEntityManager()->getQueryExecutor()->execute($deleteQuery);
return true;
}
@@ -1945,7 +1945,7 @@ class Activities implements
->select('COUNT:(c.id)', 'count')
->build();
$sth = $this->entityManager->getQueryExecutor()->run($countQuery);
$sth = $this->entityManager->getQueryExecutor()->execute($countQuery);
$row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -1961,7 +1961,7 @@ class Activities implements
->limit($offset, $maxSize)
->build();
$sth = $this->entityManager->getQueryExecutor()->run($unionQuery);
$sth = $this->entityManager->getQueryExecutor()->execute($unionQuery);
$rows = $sth->fetchAll(PDO::FETCH_ASSOC);
application/Espo/Modules/Crm/Services/MassEmail.php
+2 -2
View File
@@ -94,7 +94,7 @@ class MassEmail extends \Espo\Services\Record implements
])
->build();
$this->getEntityManager()->getQueryExecutor()->run($delete);
$this->getEntityManager()->getQueryExecutor()->execute($delete);
}
protected function cleanupQueueItems(Entity $massEmail)
@@ -108,7 +108,7 @@ class MassEmail extends \Espo\Services\Record implements
])
->build();
$this->getEntityManager()->getQueryExecutor()->run($delete);
$this->getEntityManager()->getQueryExecutor()->execute($delete);
}
public function createQueue(Entity $massEmail, bool $isTest = false, $additionalTargetList = [])
application/Espo/ORM/QueryExecutor.php
+5 -2
View File
@@ -36,7 +36,7 @@ use Espo\ORM\{
use PDOStatement;
/**
* Runs queries by given query params instances.
* Executes queries by given query params instances.
*/
class QueryExecutor
{
@@ -47,7 +47,10 @@ class QueryExecutor
$this->entityManager = $entityManager;
}
public function run(Query $query) : PDOStatement
/**
* Execute a query.
*/
public function execute(Query $query) : PDOStatement
{
$sql = $this->entityManager->getQueryComposer()->compose($query);
application/Espo/Repositories/EmailAddress.php
+4 -4
View File
@@ -420,7 +420,7 @@ class EmailAddress extends \Espo\Core\Repositories\Database implements
])
->build();
$this->getEntityManager()->getQueryExecutor()->run($delete);
$this->getEntityManager()->getQueryExecutor()->execute($delete);
}
foreach ($toUpdateList as $address) {
@@ -508,7 +508,7 @@ class EmailAddress extends \Espo\Core\Repositories\Database implements
])
->build();
$this->getEntityManager()->getQueryExecutor()->run($update);
$this->getEntityManager()->getQueryExecutor()->execute($update);
$update = $this->getEntityManager()->getQueryBuilder()
->update()
@@ -522,7 +522,7 @@ class EmailAddress extends \Espo\Core\Repositories\Database implements
])
->build();
$this->getEntityManager()->getQueryExecutor()->run($update);
$this->getEntityManager()->getQueryExecutor()->execute($update);
}
}
@@ -587,7 +587,7 @@ class EmailAddress extends \Espo\Core\Repositories\Database implements
])
->build();
$this->getEntityManager()->getQueryExecutor()->run($update);
$this->getEntityManager()->getQueryExecutor()->execute($update);
} else {
if (
application/Espo/Repositories/Import.php
+1 -1
View File
@@ -105,7 +105,7 @@ class Import extends \Espo\Core\Repositories\Database
])
->build();
$this->getEntityManager()->getQueryExecutor()->run($delete);
$this->getEntityManager()->getQueryExecutor()->execute($delete);
parent::afterRemove($entity, $options);
}
application/Espo/Repositories/PhoneNumber.php
+4 -4
View File
@@ -347,7 +347,7 @@ class PhoneNumber extends \Espo\Core\Repositories\Database implements
])
->build();
$this->getEntityManager()->getQueryExecutor()->run($delete);
$this->getEntityManager()->getQueryExecutor()->execute($delete);
}
foreach ($toUpdateList as $number) {
@@ -438,7 +438,7 @@ class PhoneNumber extends \Espo\Core\Repositories\Database implements
])
->build();
$this->getEntityManager()->getQueryExecutor()->run($update);
$this->getEntityManager()->getQueryExecutor()->execute($update);
$update = $this->getEntityManager()->getQueryBuilder()
->update()
@@ -452,7 +452,7 @@ class PhoneNumber extends \Espo\Core\Repositories\Database implements
])
->build();
$this->getEntityManager()->getQueryExecutor()->run($update);
$this->getEntityManager()->getQueryExecutor()->execute($update);
}
}
@@ -517,7 +517,7 @@ class PhoneNumber extends \Espo\Core\Repositories\Database implements
])
->build();
$this->getEntityManager()->getQueryExecutor()->run($update);
$this->getEntityManager()->getQueryExecutor()->execute($update);
} else {
if (
application/Espo/Repositories/Preferences.php
+4 -4
View File
@@ -93,7 +93,7 @@ class Preferences extends Repository implements
->limit(0, 1)
->build();
$sth = $this->getEntityManager()->getQueryExecutor()->run($select);
$sth = $this->getEntityManager()->getQueryExecutor()->execute($select);
while ($row = $sth->fetch(PDO::FETCH_ASSOC)) {
$data = Json::decode($row['data']);
@@ -174,7 +174,7 @@ class Preferences extends Repository implements
])
->build();
$this->entityManager->getQueryExecutor()->run($delete);
$this->entityManager->getQueryExecutor()->execute($delete);
$entityTypeList = array_filter($entityTypeList, function ($item) {
return (bool) $this->metadata->get(['scopes', $item, 'stream']);
@@ -218,7 +218,7 @@ class Preferences extends Repository implements
])
->build();
$this->getEntityManager()->getQueryExecutor()->run($insert);
$this->getEntityManager()->getQueryExecutor()->execute($insert);
$user = $this->entityManager->getEntity('User', $entity->id);
if ($user && !$user->isPortal()) {
@@ -238,7 +238,7 @@ class Preferences extends Repository implements
])
->build();
$this->getEntityManager()->getQueryExecutor()->run($delete);
$this->getEntityManager()->getQueryExecutor()->execute($delete);
}
public function remove(Entity $entity, array $options = [])
application/Espo/Services/Email.php
+10 -10
View File
@@ -532,7 +532,7 @@ class Email extends Record implements
])
->build();
$this->entityManager->getQueryExecutor()->run($update);
$this->entityManager->getQueryExecutor()->execute($update);
$update = $this->entityManager->getQueryBuilder()->update()
->from('Notification')
@@ -546,7 +546,7 @@ class Email extends Record implements
])
->build();
$this->entityManager->getQueryExecutor()->run($update);
$this->entityManager->getQueryExecutor()->execute($update);
return true;
}
@@ -565,7 +565,7 @@ class Email extends Record implements
])
->build();
$this->entityManager->getQueryExecutor()->run($update);
$this->entityManager->getQueryExecutor()->execute($update);
$this->markNotificationAsRead($id, $userId);
@@ -586,7 +586,7 @@ class Email extends Record implements
])
->build();
$this->entityManager->getQueryExecutor()->run($update);
$this->entityManager->getQueryExecutor()->execute($update);
return true;
}
@@ -605,7 +605,7 @@ class Email extends Record implements
])
->build();
$this->entityManager->getQueryExecutor()->run($update);
$this->entityManager->getQueryExecutor()->execute($update);
return true;
}
@@ -624,7 +624,7 @@ class Email extends Record implements
])
->build();
$this->entityManager->getQueryExecutor()->run($update);
$this->entityManager->getQueryExecutor()->execute($update);
return true;
}
@@ -643,7 +643,7 @@ class Email extends Record implements
])
->build();
$this->entityManager->getQueryExecutor()->run($update);
$this->entityManager->getQueryExecutor()->execute($update);
$this->markNotificationAsRead($id, $userId);
@@ -664,7 +664,7 @@ class Email extends Record implements
])
->build();
$this->entityManager->getQueryExecutor()->run($update);
$this->entityManager->getQueryExecutor()->execute($update);
return true;
}
@@ -684,7 +684,7 @@ class Email extends Record implements
])
->build();
$this->entityManager->getQueryExecutor()->run($update);
$this->entityManager->getQueryExecutor()->execute($update);
}
public function moveToFolder(string $id, ?string $folderId, ?string $userId = null)
@@ -705,7 +705,7 @@ class Email extends Record implements
])
->build();
$this->entityManager->getQueryExecutor()->run($update);
$this->entityManager->getQueryExecutor()->execute($update);
return true;
}
application/Espo/Services/GlobalSearch.php
+1 -1
View File
@@ -139,7 +139,7 @@ class GlobalSearch implements
$sql = $this->entityManager->getQueryComposer()->compose($unionQuery);
$sth = $this->entityManager->getQueryExecutor()->run($unionQuery);
$sth = $this->entityManager->getQueryExecutor()->execute($unionQuery);
$rows = $sth->fetchAll(PDO::FETCH_ASSOC);
application/Espo/Services/Notification.php
+2 -2
View File
@@ -184,7 +184,7 @@ class Notification extends \Espo\Services\Record implements
])
->build();
$this->entityManager->getQueryExecutor()->run($update);
$this->entityManager->getQueryExecutor()->execute($update);
return true;
}
@@ -284,7 +284,7 @@ class Notification extends \Espo\Services\Record implements
'id' => $ids,
])
->build();
$this->entityManager->getQueryExecutor()->run($update);
$this->entityManager->getQueryExecutor()->execute($update);
}
return new RecordCollection($collection, $count);
application/Espo/Services/Stream.php
+3 -3
View File
@@ -252,7 +252,7 @@ class Stream
])
->build();
$this->entityManager->getQueryExecutor()->run($delete);
$this->entityManager->getQueryExecutor()->execute($delete);
$collection = new EntityCollection();
@@ -321,7 +321,7 @@ class Stream
])
->build();
$this->entityManager->getQueryExecutor()->run($delete);
$this->entityManager->getQueryExecutor()->execute($delete);
return true;
}
@@ -341,7 +341,7 @@ class Stream
])
->build();
$this->entityManager->getQueryExecutor()->run($delete);
$this->entityManager->getQueryExecutor()->execute($delete);
}
public function findUserStream($userId, $params = [])