hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 15:03:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Multiple ORMs for all database

Browse Source
This commit is contained in:
Nicolas Le Goff
2014-10-16 20:00:27 +02:00
parent 007d83fe57
commit 9a3e92ed9c
252 changed files with 2901 additions and 2417 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/classes/patch/320alpha2a.php
View File

@@ -58,21 +58,21 @@ class patch_320alpha2a extends patchAbstract
public function apply(base $appbox, Application $app)
{
$dql = 'SELECT u FROM Phraseanet:User u WHERE u.nonce IS NULL';
$q = $app['EM']->createQuery($dql);
$q = $app['orm.em']->createQuery($dql);
$q->setHint(Query::HINT_FORCE_PARTIAL_LOAD, true);
$users = $q->getResult();
$n = 0;
foreach ($users as $user) {
$user->setNonce($app['random.medium']->generateString(64));
$app['EM']->persist($user);
$app['orm.em']->persist($user);
$n++;
if ($n %100 === 0) {
$app['EM']->flush();
$app['orm.em']->flush();
}
}
$app['EM']->flush();
$app['orm.em']->flush();
$sql = 'SELECT task_id, `class` FROM task2';
$stmt = $appbox->get_connection()->prepare($sql);

35
lib/classes/patch/320alpha4b.php
View File

@@ -16,6 +16,7 @@ use Alchemy\Phrasea\Model\Entities\FeedItem;
use Alchemy\Phrasea\Model\Entities\FeedPublisher;
use Gedmo\Timestampable\TimestampableListener;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Alchemy\Phrasea\Model\Entities\User;
class patch_320alpha4b extends patchAbstract
{
@@ -84,9 +85,9 @@ class patch_320alpha4b extends patchAbstract
$date_ref = new DateTime();
$n = 0;
$app['EM']->getEventManager()->removeEventSubscriber(new TimestampableListener());
$app['orm.em']->getEventManager()->removeEventSubscriber(new TimestampableListener());
foreach ($rs as $row) {
if (null === $user = $this->loadUser($app['EM'], $row['usr_id'])) {
if (null === $user = $this->loadUser($app['orm.em'], $row['usr_id'])) {
continue;
}
@@ -99,8 +100,8 @@ class patch_320alpha4b extends patchAbstract
$publishers = $feed->getPublishers();
$entry = new FeedEntry();
$entry->setAuthorEmail($user->getEmail());
$entry->setAuthorName($user->getDisplayName());
$entry->setAuthorEmail((string) $user->getEmail());
$entry->setAuthorName((string) $user->getDisplayName());
$entry->setFeed($feed);
$entry->setPublisher($publishers->first());
$entry->setTitle($row['name']);
@@ -134,31 +135,31 @@ class patch_320alpha4b extends patchAbstract
$entry->addItem($item);
$item->setRecordId($record->get_record_id());
$item->setSbasId($record->get_sbas_id());
$app['EM']->persist($item);
$app['orm.em']->persist($item);
} catch (NotFoundHttpException $e) {
}
}
$app['EM']->persist($entry);
$app['orm.em']->persist($entry);
$sql = 'UPDATE ssel SET deleted = "1", migrated="1"
WHERE ssel_id = :ssel_id';
$stmt = $appbox->get_connection()->prepare($sql);
$stmt->execute([':ssel_id' => $row['ssel_id']]);
$stmt->closeCursor();
$app['EM']->persist($feed);
$app['orm.em']->persist($feed);
$n++;
if ($n % 1000 == 0) {
$app['EM']->flush();
$app['EM']->clear();
$app['orm.em']->flush();
$app['orm.em']->clear();
}
}
$this->set_feed_dates($date_ref);
$app['EM']->flush();
$app['EM']->clear();
$app['orm.em']->flush();
$app['orm.em']->clear();
$app['EM']->getEventManager()->removeEventSubscriber(new TimestampableListener());
$app['orm.em']->getEventManager()->removeEventSubscriber(new TimestampableListener());
return true;
}
@@ -200,15 +201,15 @@ class patch_320alpha4b extends patchAbstract
$feed->setSubtitle('');
$feed->addPublisher($publisher);
$publisher->setFeed($feed);
$publisher->setOwner(true);
$publisher->setIsOwner(true);
$publisher->setUser($user);
if ($homelink) {
$feed->setPublic(true);
$feed->setIsPublic(true);
$app['EM']->persist($feed);
$app['EM']->persist($user);
$app['EM']->flush();
$app['orm.em']->persist($feed);
$app['orm.em']->persist($user);
$app['orm.em']->flush();
} elseif ($pub_restrict == 1) {
$collections = $app['acl']->get($user)->get_granted_base();

221
lib/classes/patch/360alpha1a.php
View File

@@ -67,9 +67,14 @@ class patch_360alpha1a extends patchAbstract
$stories = [];
$sql = 'SELECT sbas_id, rid as record_id, usr_id
FROM ssel
WHERE temporaryType = "1"';
$sql = <<<SQL
SELECT
sbas_id,
rid as record_id,
usr_id
FROM ssel
WHERE temporaryType = "1"
SQL;
$stmt = $appbox->get_connection()->prepare($sql);
$stmt->execute();
@@ -88,9 +93,13 @@ class patch_360alpha1a extends patchAbstract
$current[$serial] = $serial;
}
$sql = 'DELETE FROM ssel
WHERE temporaryType="1" AND record_id = :record_id
AND usr_id = :usr_id AND sbas_id = :sbas_id';
$sql = <<<SQL
DELETE FROM ssel
WHERE temporaryType="1"
AND record_id = :record_id
AND usr_id = :usr_id
AND sbas_id = :sbas_id
SQL;
$stmt = $appbox->get_connection()->prepare($sql);
@@ -105,30 +114,52 @@ class patch_360alpha1a extends patchAbstract
$stmt->closeCursor();
$sql = 'INSERT INTO StoryWZ
(
SELECT null as id, sbas_id, rid as record_id, usr_id, date as created
FROM ssel
WHERE temporaryType = "1"
)';
$sql = <<<SQL
INSERT INTO StoryWZ (
SELECT
null as id,
usr_id as user_id,
sbas_id,
rid as record_id,
date as created
FROM ssel
INNER JOIN Users ON usr_id = Users.id
WHERE temporaryType = "1"
)
SQL;
$stmt = $appbox->get_connection()->prepare($sql);
$stmt->execute();
$stmt->closeCursor();
$sql = 'INSERT INTO Baskets
(
SELECT ssel_id as id, name, descript as description, usr_id, 1 as is_read
, pushFrom as pusher_id, 0 as archived, date as created, updater as updated
FROM ssel
WHERE temporaryType = "0"
)';
$sql = <<<SQL
INSERT INTO Baskets (
SELECT
ssel_id as id,
usr_id as user_id,
pushFrom as pusher_id,
name,
descript as description,
1 as is_read,
0 as archived,
date as created,
updater as updated
FROM ssel
INNER JOIN Users a ON ssel.usr_id = a.id
INNER JOIN Users b ON ssel.pushFrom = b.id
WHERE temporaryType = "0"
)
SQL;
$stmt = $appbox->get_connection()->prepare($sql);
$stmt->execute();
$stmt->closeCursor();
$sql = 'SELECT ssel_id FROM ssel WHERE temporaryType = "0"';
$sql = <<<SQL
SELECT ssel_id
FROM ssel
WHERE temporaryType = "0"
SQL;
$stmt = $appbox->get_connection()->prepare($sql);
$stmt->execute();
$rs = $stmt->fetchAll(PDO::FETCH_ASSOC);
@@ -137,10 +168,18 @@ class patch_360alpha1a extends patchAbstract
$sselcont_ids = [];
foreach ($rs as $row) {
$sql = 'SELECT c.sselcont_id, c.record_id, b.sbas_id
FROM sselcont c, bas b, ssel s
WHERE s.temporaryType = "0" AND b.base_id = c.base_id
AND c.ssel_id = :ssel_id AND s.ssel_id = c.ssel_id';
$sql = <<<SQL
SELECT
c.sselcont_id,
c.record_id,
b.sbas_id
FROM sselcont c
INNER JOIN bas b ON (b.base_id = c.base_id)
INNER JOIN ssel s ON (s.ssel_id = c.ssel_id)
INNER JOIN Baskets ba ON (ba.id = s.ssel_id)
WHERE s.temporaryType = "0"
AND c.ssel_id = :ssel_id
SQL;
$stmt = $appbox->get_connection()->prepare($sql);
$stmt->execute([':ssel_id' => $row['ssel_id']]);
@@ -160,7 +199,10 @@ class patch_360alpha1a extends patchAbstract
}
}
$sql = 'DELETE FROM sselcont WHERE sselcont_id = :sselcont_id';
$sql = <<<SQL
DELETE FROM sselcont
WHERE sselcont_id = :sselcont_id
SQL;
$stmt = $appbox->get_connection()->prepare($sql);
foreach ($sselcont_ids as $sselcont_id) {
@@ -169,68 +211,111 @@ class patch_360alpha1a extends patchAbstract
$stmt->closeCursor();
$sql = 'INSERT INTO BasketElements
(
SELECT sselcont_id as id, c.ssel_id as basket_id, record_id, b.sbas_id, c.ord,
s.date as created, s.updater as updated
FROM sselcont c, ssel s, bas b
WHERE temporaryType = "0" AND b.base_id = c.base_id AND s.ssel_id = c.ssel_id
)';
$sql = <<<SQL
INSERT INTO BasketElements (
SELECT
sselcont_id as id,
c.ssel_id as basket_id,
record_id,
b.sbas_id,
c.ord,
s.date as created,
s.updater as updated
FROM sselcont c
INNER JOIN ssel s ON (s.ssel_id = c.ssel_id)
INNER JOIN Baskets a ON (a.id = s.ssel_id)
INNER JOIN bas b ON (b.base_id = c.base_id)
WHERE s.temporaryType = "0"
)
SQL;
$stmt = $appbox->get_connection()->prepare($sql);
$stmt->execute();
$stmt->closeCursor();
$sql = 'UPDATE Baskets SET pusher_id = NULL WHERE pusher_id = 0';
$sql = <<<SQL
UPDATE Baskets
SET pusher_id = NULL
WHERE pusher_id = 0
SQL;
$stmt = $appbox->get_connection()->prepare($sql);
$stmt->execute();
$stmt->closeCursor();
$sql = 'INSERT INTO ValidationSessions
(
SELECT null as id, v.ssel_id as basket_id ,created_on as created
,updated_on as updated ,expires_on as expires
,v.usr_id as initiator_id
FROM ssel s, validate v
WHERE v.ssel_id = s.ssel_id AND v.usr_id = s.usr_id
)';
$sql = <<<SQL
INSERT INTO ValidationSessions (
SELECT null as id,
v.usr_id as initiator_id,
v.ssel_id as basket_id,
v.created_on as created,
v.updated_on as updated,
v.expires_on as expires
FROM validate v
INNER JOIN Baskets b ON (b.id = v.ssel_id)
INNER JOIN Users u ON (u.id = v.usr_id)
)
SQL;
$stmt = $appbox->get_connection()->prepare($sql);
$stmt->execute();
$stmt->closeCursor();
$sql = 'INSERT INTO ValidationParticipants
(
SELECT v.id as id, v.usr_id
, 1 AS is_aware, confirmed as is_confirmed, 1 as can_agree
, can_see_others, last_reminder AS reminded
, vs.`id` AS ValidationSession_id
FROM validate v, ssel s, ValidationSessions vs
WHERE s.ssel_id = v.ssel_id AND vs.basket_id = v.ssel_id
)';
$sql = <<<SQL
INSERT INTO ValidationParticipants (
SELECT
v.id AS id,
v.usr_id AS user_id,
1 AS is_aware,
confirmed AS is_confirmed,
1 AS can_agree,
can_see_others,
last_reminder AS reminded,
vs.`id` AS validation_session_id
FROM validate v
INNER JOIN Baskets b ON (b.id = v.ssel_id)
INNER JOIN ValidationSessions vs ON (vs.basket_id = b.id)
INNER JOIN Users u ON (u.id = v.usr_id)
)
SQL;
$stmt = $appbox->get_connection()->prepare($sql);
$stmt->execute();
$stmt->closeCursor();
$sql = 'SELECT user_id, basket_id, p.id as participant_id
FROM ValidationParticipants p, ValidationSessions s
WHERE p.ValidationSession_Id = s.id';
$sql = <<<SQL
SELECT
p.user_id,
s.basket_id,
p.id as participant_id
FROM ValidationParticipants p
INNER JOIN ValidationSessions s ON (s.id = p.validation_session_id)
INNER JOIN Users u ON (u.id = p.user_id)
INNER JOIN Baskets b ON (b.id = s.basket_id)
SQL;
$stmt = $appbox->get_connection()->prepare($sql);
$stmt->execute();
$rs = $stmt->fetchAll(PDO::FETCH_ASSOC);
$stmt->closeCursor();
$sql = 'INSERT INTO ValidationDatas
(
SELECT d.id , :participant_id as participant_id, d.sselcont_id, d.agreement
,d.note, d.updated_on as updated
FROM validate v, validate_datas d, sselcont c
WHERE c.sselcont_id = d.sselcont_id AND v.id = d.validate_id
AND v.usr_id = :usr_id AND v.ssel_id = :basket_id
)';
$sql = <<<SQL
INSERT INTO ValidationDatas (
SELECT
d.id ,
:participant_id AS participant_id,
d.sselcont_id AS basket_element_id,
d.agreement,
d.note, d.updated_on AS updated
FROM validate v
INNER JOIN validate_datas d ON (v.id = d.validate_id)
INNER JOIN Baskets b ON (v.ssel_id = b.id)
INNER JOIN BasketElements be ON (be.id = d.sselcont_id)
AND v.usr_id = :usr_id AND v.ssel_id = :basket_id
)
SQL;
$stmt = $appbox->get_connection()->prepare($sql);
foreach ($rs as $row) {
$params = [
@@ -243,15 +328,21 @@ class patch_360alpha1a extends patchAbstract
$stmt->closeCursor();
$sql = 'UPDATE ValidationDatas
SET agreement = NULL where agreement = "0"';
$sql = <<<SQL
UPDATE ValidationDatas
SET agreement = NULL
WHERE agreement = "0"
SQL;
$stmt = $appbox->get_connection()->prepare($sql);
$stmt->execute();
$stmt->closeCursor();
$sql = 'UPDATE ValidationDatas
SET agreement = "0" where agreement = "-1"';
$sql = <<<SQL
UPDATE ValidationDatas
SET agreement = "0"
WHERE agreement = "-1"
SQL;
$stmt = $appbox->get_connection()->prepare($sql);
$stmt->execute();

2
lib/classes/patch/360alpha2a.php
View File

@@ -56,7 +56,7 @@ class patch_360alpha2a extends patchAbstract
*/
public function apply(base $appbox, Application $app)
{
$app['EM']->getConnection()->executeUpdate('UPDATE Users u SET u.email = NULL WHERE u.email IS NOT NULL AND u.deleted = 1');
$app['orm.em']->getConnection()->executeUpdate('UPDATE Users u SET u.email = NULL WHERE u.email IS NOT NULL AND u.deleted = 1');
return true;
}

11
lib/classes/patch/361alpha1a.php
View File

@@ -69,7 +69,8 @@ class patch_361alpha1a extends patchAbstract
$sbas_id = (int) $row['sbas_id'];
try {
$connbas = $app['phraseanet.appbox']->get_databox($sbas_id)->get_connection()->connect();
$connbas = $app['phraseanet.appbox']->get_databox($sbas_id)->get_connection();
$connbas->connect();
} catch (\Exception $e) {
$conn->exec('DELETE FROM ValidationDatas WHERE basket_element_id = ' . $row['id']);
$conn->exec('DELETE FROM BasketElements WHERE id = ' . $row['id']);
@@ -93,7 +94,7 @@ class patch_361alpha1a extends patchAbstract
$n = 0;
$perPage = 100;
$query = $app['EM']->createQuery($dql)
$query = $app['orm.em']->createQuery($dql)
->setFirstResult($n)
->setMaxResults($perPage);
@@ -102,7 +103,7 @@ class patch_361alpha1a extends patchAbstract
$count = count($paginator);
while ($n < $count) {
$query = $app['EM']->createQuery($dql)
$query = $app['orm.em']->createQuery($dql)
->setFirstResult($n)
->setMaxResults($perPage);
@@ -121,10 +122,10 @@ class patch_361alpha1a extends patchAbstract
}
$n += $perPage;
$app['EM']->flush();
$app['orm.em']->flush();
}
$app['EM']->flush();
$app['orm.em']->flush();
return true;
}

20
lib/classes/patch/370alpha7a.php
View File

@@ -81,16 +81,16 @@ class patch_370alpha7a extends patchAbstract
//order matters for foreign keys constraints
//truncate all altered tables
$this->truncateTable($app['EM'], 'Alchemy\\Phrasea\\Model\\Entities\\LazaretAttribute');
$this->truncateTable($app['EM'], 'Alchemy\\Phrasea\\Model\\Entities\\LazaretCheck');
$this->truncateTable($app['EM'], 'Alchemy\\Phrasea\\Model\\Entities\\LazaretFile');
$this->truncateTable($app['EM'], 'Alchemy\\Phrasea\\Model\\Entities\\LazaretSession');
$this->truncateTable($app['orm.em'], 'Alchemy\\Phrasea\\Model\\Entities\\LazaretAttribute');
$this->truncateTable($app['orm.em'], 'Alchemy\\Phrasea\\Model\\Entities\\LazaretCheck');
$this->truncateTable($app['orm.em'], 'Alchemy\\Phrasea\\Model\\Entities\\LazaretFile');
$this->truncateTable($app['orm.em'], 'Alchemy\\Phrasea\\Model\\Entities\\LazaretSession');
$i = 0;
foreach ($rs as $row) {
$filePath = $app['tmp.lazaret.path'].'/'.$row['filepath'];
if (null === $user = $this->loadUser($app['EM'], $row['usr_id'])) {
if (null === $user = $this->loadUser($app['orm.em'], $row['usr_id'])) {
continue;
}
@@ -140,17 +140,17 @@ class patch_370alpha7a extends patchAbstract
$lazaretFile->setCreated(new \DateTime($row['created_on']));
$lazaretFile->setSession($lazaretSession);
$app['EM']->persist($lazaretFile);
$app['orm.em']->persist($lazaretFile);
if (0 === ++$i % 100) {
$app['EM']->flush();
$app['EM']->clear();
$app['orm.em']->flush();
$app['orm.em']->clear();
}
}
}
$app['EM']->flush();
$app['EM']->clear();
$app['orm.em']->flush();
$app['orm.em']->clear();
$stmt->closeCursor();

4
lib/classes/patch/370alpha8a.php
View File

@@ -212,9 +212,9 @@ class patch_370alpha8a extends patchAbstract
->setSettings($settings)
->setPeriod($period)
->setStatus(Task::STATUS_STARTED);
$app['EM']->persist($task);
$app['orm.em']->persist($task);
}
$app['EM']->flush();
$app['orm.em']->flush();
return true;
}

8
lib/classes/patch/380alpha11a.php
View File

@@ -73,7 +73,7 @@ class patch_380alpha11a extends patchAbstract
}
foreach ($rs as $row) {
if (null === $user = $this->loadUser($app['EM'], $row['usr_id'])) {
if (null === $user = $this->loadUser($app['orm.em'], $row['usr_id'])) {
continue;
}
@@ -117,14 +117,14 @@ class patch_380alpha11a extends patchAbstract
$session->addModule($module);
$app['EM']->persist($module);
$app['orm.em']->persist($module);
}
}
$app['EM']->persist($session);
$app['orm.em']->persist($session);
}
$app['EM']->flush();
$app['orm.em']->flush();
return true;
}

10
lib/classes/patch/380alpha4a.php
View File

@@ -78,16 +78,16 @@ class patch_380alpha4a extends patchAbstract
$failure->setLocked(!!$row['locked']);
$failure->setUsername($row['login']);
$app['EM']->persist($failure);
$app['orm.em']->persist($failure);
if (0 === $n++ % 1000) {
$app['EM']->flush();
$app['EM']->clear();
$app['orm.em']->flush();
$app['orm.em']->clear();
}
}
$app['EM']->flush();
$app['EM']->clear();
$app['orm.em']->flush();
$app['orm.em']->clear();
return true;
}

10
lib/classes/patch/383alpha1a.php
View File

@@ -70,19 +70,19 @@ class patch_383alpha1a extends patchAbstract
foreach ($rows as $row) {
if (null !== $session = $app['repo.sessions']->find($row['id'])) {
$app['EM']->remove($session);
$app['orm.em']->remove($session);
}
}
// Remove API sessions
$query = $app['EM']->createQuery('SELECT s FROM Phraseanet:Session s WHERE s.user_agent LIKE :guzzle');
$query = $app['orm.em']->createQuery('SELECT s FROM Phraseanet:Session s WHERE s.user_agent LIKE :guzzle');
$query->setParameter(':guzzle', 'Guzzle%');
foreach ($query->getResult() as $session) {
$app['EM']->remove($session);
$app['orm.em']->remove($session);
}
$app['EM']->flush();
$app['orm.em']->flush();
return true;
}
@@ -92,7 +92,7 @@ class patch_383alpha1a extends patchAbstract
$rsm = (new ResultSetMapping())->addScalarResult('Name', 'Name');
$ret = false;
foreach ($app['EM']->createNativeQuery('SHOW TABLE STATUS', $rsm)->getResult() as $row) {
foreach ($app['orm.em']->createNativeQuery('SHOW TABLE STATUS', $rsm)->getResult() as $row) {
if ('Session' === $row['Name']) {
$ret = true;
break;

6
lib/classes/patch/383alpha2a.php
View File

@@ -66,17 +66,17 @@ class patch_383alpha2a extends patchAbstract
foreach ($rows as $row) {
try {
$vsession = $app['EM']->createQuery('SELECT PARTIAL s.{id} FROM Phraseanet:ValidationSession s WHERE s.id = :id')
$vsession = $app['orm.em']->createQuery('SELECT PARTIAL s.{id} FROM Phraseanet:ValidationSession s WHERE s.id = :id')
->setParameters(['id' => $row['validation_session_id']])
->setHint(Query::HINT_FORCE_PARTIAL_LOAD, true)
->getSingleResult();
$app['EM']->remove($vsession);
$app['orm.em']->remove($vsession);
} catch (NoResultException $e) {
}
}
$app['EM']->flush();
$app['orm.em']->flush();
return true;
}

10
lib/classes/patch/386alpha4a.php
View File

@@ -42,7 +42,7 @@ class patch_386alpha4a implements patchInterface
*/
public function getDoctrineMigrations()
{
return array();
return array('user-list');
}
/**
@@ -58,12 +58,12 @@ class patch_386alpha4a implements patchInterface
*/
public function apply(base $appbox, Application $app)
{
$repo = $app['EM']->getRepository('Phraseanet:UsrList');
foreach ($app['EM']->getRepository('Phraseanet:User')->findDeleted() as $user) {
$repo = $app['orm.em']->getRepository('Phraseanet:UsrList');
foreach ($app['orm.em']->getRepository('Phraseanet:User')->findDeleted() as $user) {
foreach ($repo->findUserLists($user) as $list) {
$app['EM']->remove($list);
$app['orm.em']->remove($list);
}
$app['EM']->flush();
$app['orm.em']->flush();
}
return true;

2
lib/classes/patch/390alpha12a.php
View File

@@ -69,7 +69,7 @@ class patch_390alpha12a extends patchAbstract
$finder = new Finder();
$finder
->depth(0)
->in($app['plugins.directory'])
->in($app['plugin.path'])
->directories();
$plugins = [];

2
lib/classes/patch/390alpha13a.php
View File

@@ -60,7 +60,7 @@ class patch_390alpha13a implements patchInterface
*/
public function apply(base $appbox, Application $app)
{
$em = $app['EM'];
$em = $app['orm.em'];
$sql = "SELECT date_modif, usr_id, base_id, en_cours, refuser
FROM demand";

2
lib/classes/patch/390alpha14a.php
View File

@@ -58,7 +58,7 @@ class patch_390alpha14a extends patchAbstract
{
$app['conf']->remove(['main', 'api-timers']);
if ($this->tableHasField($app['EM'], 'api_logs', 'api_log_ressource')) {
if ($this->tableHasField($app['orm.em'], 'api_logs', 'api_log_ressource')) {
$sql = "ALTER TABLE api_logs CHANGE api_log_ressource api_log_resource varchar(64)";
$app['phraseanet.appbox']->get_connection()->executeUpdate($sql);
}

4
lib/classes/patch/390alpha15a.php
View File

@@ -56,11 +56,11 @@ class patch_390alpha15a extends patchAbstract
*/
public function apply(base $appbox, Application $app)
{
if (!$this->tableExists($app['EM'], 'tokens_backup')) {
if (!$this->tableExists($app['orm.em'], 'tokens_backup')) {
return true;
}
$app['EM']->getConnection()->executeUpdate('
$app['orm.em']->getConnection()->executeUpdate('
INSERT INTO Tokens
(
`value`, user_id, `type`, `data`,

4
lib/classes/patch/390alpha16a.php
View File

@@ -61,11 +61,11 @@ class patch_390alpha16a extends patchAbstract
$sql = ' SELECT edit_preset_id, creation_date, title, xml, usr_id, sbas_id
FROM edit_presets';
$em = $app['EM'];
$em = $app['orm.em'];
$n = 0;
$em->getEventManager()->removeEventSubscriber(new TimestampableListener());
foreach ($app['phraseanet.appbox']->get_connection()->fetchAll($sql) as $row) {
if (null === $user = $this->loadUser($app['EM'], $row['usr_id'])) {
if (null === $user = $this->loadUser($app['orm.em'], $row['usr_id'])) {
continue;
}
$preset = new Preset();

16
lib/classes/patch/390alpha17a.php
View File

@@ -57,14 +57,14 @@ class patch_390alpha17a extends patchAbstract
*/
public function apply(base $appbox, Application $app)
{
$this->fillApplicationTable($app['EM']);
$this->fillAccountTable($app['EM']);
$this->fillLogTable($app['EM']);
$this->fillCodeTable($app['EM']);
$this->fillRefreshTokenTable($app['EM']);
$this->fillOauthTokenTable($app['EM']);
$this->setOauthTokenExpiresToNull($app['EM']);
$this->updateLogsTable($app['EM']);
$this->fillApplicationTable($app['orm.em']);
$this->fillAccountTable($app['orm.em']);
$this->fillLogTable($app['orm.em']);
$this->fillCodeTable($app['orm.em']);
$this->fillRefreshTokenTable($app['orm.em']);
$this->fillOauthTokenTable($app['orm.em']);
$this->setOauthTokenExpiresToNull($app['orm.em']);
$this->updateLogsTable($app['orm.em']);
}
private function fillApplicationTable(EntityManager $em)

10
lib/classes/patch/390alpha18a.php
View File

@@ -56,33 +56,33 @@ class patch_390alpha18a extends patchAbstract
*/
public function apply(base $appbox, Application $app)
{
$app['EM']->getConnection()->executeUpdate('
$app['orm.em']->getConnection()->executeUpdate('
DELETE lf FROM LazaretFiles lf
INNER JOIN LazaretSessions ls ON (ls.id = lf.lazaret_session_id)
LEFT JOIN Users u ON (ls.user_id = u.id)
WHERE u.id IS NULL'
);
$app['EM']->getConnection()->executeUpdate('
$app['orm.em']->getConnection()->executeUpdate('
DELETE ls FROM LazaretSessions AS ls
LEFT JOIN Users u ON (ls.user_id = u.id)
WHERE u.id IS NULL'
);
$app['EM']->getConnection()->executeUpdate('
$app['orm.em']->getConnection()->executeUpdate('
DELETE fi FROM FeedItems AS fi
INNER JOIN FeedEntries fe ON (fe.id = fi.entry_id)
LEFT JOIN Users u ON (fe.publisher_id = u.id)
WHERE u.id IS NULL'
);
$app['EM']->getConnection()->executeUpdate('
$app['orm.em']->getConnection()->executeUpdate('
DELETE fe FROM FeedEntries AS fe
LEFT JOIN Users u ON (fe.publisher_id = u.id)
WHERE u.id IS NULL'
);
$app['EM']->getConnection()->executeUpdate(
$app['orm.em']->getConnection()->executeUpdate(
'DELETE se FROM Sessions AS se
LEFT JOIN Users u ON (se.user_id = u.id)
WHERE u.id IS NULL'

8
lib/classes/patch/390alpha1a.php
View File

@@ -79,7 +79,7 @@ class patch_390alpha1a extends patchAbstract
$stmt->closeCursor();
$n = 0;
$em = $app['EM'];
$em = $app['orm.em'];
$em->getEventManager()->removeEventSubscriber(new TimestampableListener());
foreach ($rs as $row) {
@@ -93,12 +93,12 @@ class patch_390alpha1a extends patchAbstract
$todo = $stmt->fetch(\PDO::FETCH_ASSOC);
$stmt->closeCursor();
if (null === $user = $this->loadUser($app['EM'], $row['usr_id'])) {
if (null === $user = $this->loadUser($app['orm.em'], $row['usr_id'])) {
continue;
}
try {
$basket = $app['EM']->createQuery('SELECT PARTIAL b.{id} FROM Phraseanet:Basket b WHERE b.id = :id')
$basket = $app['orm.em']->createQuery('SELECT PARTIAL b.{id} FROM Phraseanet:Basket b WHERE b.id = :id')
->setParameters(['id' => $row['ssel_id']])
->setHint(Query::HINT_FORCE_PARTIAL_LOAD, true)
->getSingleResult();
@@ -127,7 +127,7 @@ class patch_390alpha1a extends patchAbstract
foreach ($elements as $element) {
$orderElement = new OrderElement();
$user = $this->loadUser($app['EM'], $row['usr_id']);
$user = $this->loadUser($app['orm.em'], $row['usr_id']);
$orderElement->setBaseId($element['base_id'])
->setDeny($element['deny'] === null ? null : (Boolean) $element['deny'])
->setOrder($order)

4
lib/classes/patch/390alpha3a.php
View File

@@ -70,10 +70,10 @@ class patch_390alpha3a extends patchAbstract
$stmt->closeCursor();
$n = 0;
$em = $app['EM'];
$em = $app['orm.em'];
foreach ($rs as $row) {
if (null === $user = $this->loadUser($app['EM'], $row['usr_id'])) {
if (null === $user = $this->loadUser($app['orm.em'], $row['usr_id'])) {
continue;
}

4
lib/classes/patch/390alpha4a.php
View File

@@ -70,14 +70,14 @@ class patch_390alpha4a extends patchAbstract
$stmt->closeCursor();
$n = 0;
$em = $app['EM'];
$em = $app['orm.em'];
foreach ($rs as $row) {
if (substr($row['prop'], 0, 13) === "notification_") {
continue;
}
if (null === $user = $this->loadUser($app['EM'], $row['usr_id'])) {
if (null === $user = $this->loadUser($app['orm.em'], $row['usr_id'])) {
continue;
}

4
lib/classes/patch/390alpha5a.php
View File

@@ -71,10 +71,10 @@ class patch_390alpha5a extends patchAbstract
$stmt->closeCursor();
$n = 0;
$em = $app['EM'];
$em = $app['orm.em'];
foreach ($rs as $row) {
if (null === $user = $this->loadUser($app['EM'], $row['usr_id'])) {
if (null === $user = $this->loadUser($app['orm.em'], $row['usr_id'])) {
continue;
}

4
lib/classes/patch/390alpha6a.php
View File

@@ -71,7 +71,7 @@ class patch_390alpha6a extends patchAbstract
$conn = $app['phraseanet.appbox']->get_connection();
$em = $app['EM'];
$em = $app['orm.em'];
$em->getEventManager()->removeEventSubscriber(new TimestampableListener());
$sql = 'SELECT `id`, `crash`, `nbretry`, `mail`, `addr`, `ssl`,
@@ -93,7 +93,7 @@ class patch_390alpha6a extends patchAbstract
$n = 0;
foreach ($rs as $row) {
if (null === $user = $this->loadUser($app['EM'], $row['usr_id'])) {
if (null === $user = $this->loadUser($app['orm.em'], $row['usr_id'])) {
continue;
}

14
lib/classes/patch/390alpha7a.php
View File

@@ -106,7 +106,7 @@ class patch_390alpha7a extends patchAbstract
$stmt->closeCursor();
$n = 0;
$em = $app['EM'];
$em = $app['orm.em'];
$fpSql = 'SELECT id, usr_id, owner, created_on FROM feed_publishers WHERE feed_id = :feed_id;';
$fpStmt = $conn->prepare($fpSql);
@@ -133,7 +133,7 @@ class patch_390alpha7a extends patchAbstract
$fpRes = $fpStmt->fetchAll(\PDO::FETCH_ASSOC);
foreach ($fpRes as $fpRow) {
if (null === $user = $this->loadUser($app['EM'], $fpRow['usr_id'])) {
if (null === $user = $this->loadUser($app['orm.em'], $fpRow['usr_id'])) {
continue;
}
@@ -154,8 +154,8 @@ class patch_390alpha7a extends patchAbstract
$feedEntry->setPublisher($feedPublisher);
$feedEntry->setTitle($feRow['title']);
$feedEntry->setSubtitle($feRow['description']);
$feedEntry->setAuthorName($feRow['author_name']);
$feedEntry->setAuthorEmail($feRow['author_email']);
$feedEntry->setAuthorName((string) $feRow['author_name']);
$feedEntry->setAuthorEmail((string) $feRow['author_email']);
$feedEntry->setCreatedOn(new \DateTime($feRow['created_on']));
$feedEntry->setUpdatedOn(new \DateTime($feRow['updated_on']));
@@ -181,7 +181,7 @@ class patch_390alpha7a extends patchAbstract
$ftRes = $ftStmt->fetchAll(\PDO::FETCH_ASSOC);
foreach ($ftRes as $ftRow) {
if (null === $user = $this->loadUser($app['EM'], $ftRow['usr_id'])) {
if (null === $user = $this->loadUser($app['orm.em'], $ftRow['usr_id'])) {
continue;
}
@@ -212,7 +212,7 @@ class patch_390alpha7a extends patchAbstract
$faRes = $faStmt->fetchAll(\PDO::FETCH_ASSOC);
foreach ($faRes as $faRow) {
if (null === $user = $this->loadUser($app['EM'], $faRow['usr_id'])) {
if (null === $user = $this->loadUser($app['orm.em'], $faRow['usr_id'])) {
continue;
}
@@ -242,7 +242,7 @@ class patch_390alpha7a extends patchAbstract
$rsm = (new ResultSetMapping())->addScalarResult('Name', 'Name');
$backup = false;
foreach ($app['EM']->createNativeQuery('SHOW TABLE STATUS', $rsm)->getResult() as $row) {
foreach ($app['orm.em']->createNativeQuery('SHOW TABLE STATUS', $rsm)->getResult() as $row) {
if ('feeds_backup' === $row['Name']) {
$backup = true;
break;

4
lib/classes/patch/390alpha8a.php
View File

@@ -91,9 +91,9 @@ class patch_390alpha8a extends patchAbstract
->setSettings($row['settings'])
->setStatus($row['active'] ? Task::STATUS_STARTED : Task::STATUS_STOPPED);
$app['EM']->persist($task);
$app['orm.em']->persist($task);
}
$app['EM']->flush();
$app['orm.em']->flush();
}
private function createJob(Application $app, $class)

6
lib/classes/patch/390alpha9a.php
View File

@@ -80,14 +80,14 @@ class patch_390alpha9a extends patchAbstract
private function updateDoctrineUsers(Application $app)
{
$dql = 'SELECT u FROM Phraseanet:User u WHERE u.locale IS NOT NULL';
$users = $app['EM']->createQuery($dql)->getResult();
$users = $app['orm.em']->createQuery($dql)->getResult();
foreach ($users as $user) {
$user->setLocale($this->extractLocale($user->getLocale()));
$app['EM']->persist($user);
$app['orm.em']->persist($user);
}
$app['EM']->flush();
$app['orm.em']->flush();
}
private function updateDataboxPrefs(\appbox $appbox)