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

PHRAS-2189_report-v2_MASTER

Browse Source 
change patch version because we need to insert a patch before this one
wip
This commit is contained in:
Jean-Yves Gaulier
2018-09-26 19:24:24 +02:00
parent f7b103af3d
commit 18cff53c61
3 changed files with 42 additions and 7836 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Alchemy/Phrasea/Core/Version.php
View File

@@ -16,7 +16,7 @@ class Version
/** /**
* @var string * @var string
*/ */
private $number = '4.1.0-alpha.12'; private $number = '4.1.0-alpha.13';
/** /**
* @var string * @var string

7786
lib/classes/patch/410alpha12a.php
View File

File diff suppressed because it is too large Load Diff

90
lib/classes/patch/410alpha13a.php
View File

@@ -9,6 +9,10 @@
* file that was distributed with this source code. * file that was distributed with this source code.
*/ */
use Alchemy\Phrasea\Application; use Alchemy\Phrasea\Application;
use Alchemy\Phrasea\Core\Configuration\PropertyAccess;
use Alchemy\Phrasea\Model\Manipulator\ApiApplicationManipulator;
use Alchemy\Phrasea\Model\Entities\ApiApplication;
use Alchemy\Phrasea\Model\Repositories\ApiApplicationRepository;
class patch_410alpha13a implements patchInterface class patch_410alpha13a implements patchInterface
@@ -59,7 +63,28 @@ class patch_410alpha13a implements patchInterface
$sql = "DROP TABLE IF EXISTS `log_colls`"; $sql = "DROP TABLE IF EXISTS `log_colls`";
$databox->get_connection()->prepare($sql)->execute(); $databox->get_connection()->prepare($sql)->execute();
$sql = "ALTER TABLE `log_docs` ADD `coll_id` INT(11) UNSIGNED NULL DEFAULT NULL, ADD INDEX(coll_id)"; /*
* no need to do those ops, it's done by system:upgrade after fixing the xml scheme
*
$sql = "ALTER TABLE `log_docs`\n"
. "CHANGE `action` `action` ENUM(\n"
. " 'push',\n"
. " 'add',\n"
. " 'validate',\n"
. " 'edit',\n"
. " 'collection',\n"
. " 'status',\n"
. " 'print',\n"
. " 'substit',\n"
. " 'publish',\n"
. " 'download',\n"
. " 'mail',\n"
. " 'ftp',\n"
. " 'delete',\n"
. " 'collection_from',\n"
. " ''\n"
. ")\n"
. "CHARACTER SET ascii BINARY NOT NULL DEFAULT ''";
try { try {
$databox->get_connection()->prepare($sql)->execute(); $databox->get_connection()->prepare($sql)->execute();
} }
@@ -67,57 +92,24 @@ class patch_410alpha13a implements patchInterface
// no-op // no-op
} }
$sql = "CREATE TEMPORARY TABLE `tmp_colls` (\n" $sql = "ALTER TABLE `log_docs` ADD `coll_id` INT(11) UNSIGNED NULL DEFAULT NULL,\n"
. " `id` int(11) unsigned NOT NULL,\n" . " ADD INDEX(coll_id)";
. " `coll_id` int(11) unsigned NOT NULL,\n" try {
. " PRIMARY KEY (`id`)\n" $databox->get_connection()->prepare($sql)->execute();
. ")"; }
$databox->get_connection()->prepare($sql)->execute(); catch(\Exception $e) {
// no-op (the field exists ?)
$tsql = [
[
'sql' => "TRUNCATE tmp_colls",
'stmt' => null,
],
[
'sql' => "INSERT INTO tmp_colls\n"
. " SELECT id, COALESCE(SUBSTRING_INDEX(GROUP_CONCAT(final ORDER BY r2_id DESC), ',', 1), 0) AS coll_id FROM\n"
. " (\n"
. " SELECT r1.record_id, r1.id, r2.id AS r2_id, r2.final FROM\n"
. " (select id, record_id FROM log_docs WHERE ISNULL(coll_id) LIMIT 1000000) AS r1\n"
. " LEFT JOIN log_docs AS r2\n"
. " ON r2.record_id=r1.record_id AND r2.action IN('add', 'collection') AND r2.id<=r1.id\n"
. " )\n"
. " AS t GROUP BY id",
'stmt' => null,
],
[
'sql' => "UPDATE tmp_colls INNER JOIN log_docs USING(id) SET log_docs.coll_id=tmp_colls.coll_id",
'stmt' => null,
]
];
foreach($tsql as $k => $v) {
$tsql[$k]['stmt'] = $databox->get_connection()->prepare($v['sql']);
} }
$sql = "ALTER TABLE `log_view` ADD `coll_id` INT(11) UNSIGNED NULL DEFAULT NULL,\n"
$nchanged = 0; . " ADD INDEX(coll_id)";
do { try {
foreach($tsql as $k => $v) { $databox->get_connection()->prepare($sql)->execute();
printf("%s\n\n", $v['sql']);
/** @var \Doctrine\DBAL\Driver\Statement $stmt */
$stmt = $v['stmt'];
$stmt->execute();
$nchanged = $stmt->rowCount();
$stmt->closeCursor();
}
} }
while($nchanged != 0); catch(\Exception $e) {
// no-op (the field exists ?)
}
$sql = "DROP TABLE `tmp_colls`"; */
$databox->get_connection()->prepare($sql)->execute();
return true; return true;
} }