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

Fix #1477 : let the upgrade crash if the upgrade procedure fails

Browse Source
This commit is contained in:
Romain Neutron
2013-09-19 13:55:58 +02:00
parent 1fb7390a92
commit 87d6dddddf
1 changed files with 59 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

119
lib/classes/patch/380a3.php
View File

@@ -58,70 +58,69 @@ class patch_380a3 implements patchInterface
{ {
$conn = $databox->get_connection(); $conn = $databox->get_connection();
try { $removeProc = "DROP PROCEDURE IF EXISTS explode_log_table";
$removeProc = "DROP PROCEDURE IF EXISTS explode_log_table";
$stmt = $conn->prepare($removeProc); $stmt = $conn->prepare($removeProc);
$stmt->execute(); $stmt->execute();
$stmt->closeCursor(); $stmt->closeCursor();
unset($stmt); unset($stmt);
$procedure = " $procedure = "
CREATE PROCEDURE explode_log_table(bound VARCHAR(255)) CREATE PROCEDURE explode_log_table(bound VARCHAR(255))
BEGIN BEGIN
DECLARE l_log_id INT UNSIGNED DEFAULT 0; DECLARE l_log_id INT UNSIGNED DEFAULT 0;
DECLARE l_coll_list TEXT; DECLARE l_coll_list TEXT;
DECLARE occurance INT DEFAULT 0; DECLARE occurance INT DEFAULT 0;
DECLARE i INT DEFAULT 0; DECLARE i INT DEFAULT 0;
DECLARE dest_coll_id INT; DECLARE dest_coll_id INT;
DECLARE done INT DEFAULT 0; DECLARE done INT DEFAULT 0;
DECLARE result_set CURSOR FOR DECLARE result_set CURSOR FOR
SELECT l.id, l.coll_list SELECT l.id, l.coll_list
FROM log l FROM log l
LEFT JOIN log_colls lc ON (lc.log_id = l.id) LEFT JOIN log_colls lc ON (lc.log_id = l.id)
WHERE (lc.log_id IS NULL) AND coll_list != ''; WHERE (lc.log_id IS NULL) AND coll_list != '';
DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = 1; DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = 1;
OPEN result_set; OPEN result_set;
read_loop: LOOP read_loop: LOOP
FETCH result_set INTO l_log_id, l_coll_list; FETCH result_set INTO l_log_id, l_coll_list;
IF done THEN IF done THEN
LEAVE read_loop; LEAVE read_loop;
END IF; END IF;
SET occurance = (SELECT LENGTH(l_coll_list) - LENGTH(REPLACE(l_coll_list, bound, ''))+1); SET occurance = (SELECT LENGTH(l_coll_list) - LENGTH(REPLACE(l_coll_list, bound, ''))+1);
SET i=1; SET i=1;
START TRANSACTION; START TRANSACTION;
WHILE i <= occurance DO WHILE i <= occurance DO
SET dest_coll_id = (SELECT REPLACE( SET dest_coll_id = (SELECT REPLACE(
SUBSTRING( SUBSTRING(
SUBSTRING_INDEX(l_coll_list, bound, i), SUBSTRING_INDEX(l_coll_list, bound, i),
LENGTH(SUBSTRING_INDEX(l_coll_list, bound, i - 1)) + 1 LENGTH(SUBSTRING_INDEX(l_coll_list, bound, i - 1)) + 1
), ),
',', ',',
'' ''
)); ));
IF dest_coll_id > 0 THEN IF dest_coll_id > 0 THEN
INSERT INTO log_colls VALUES (null, l_log_id, dest_coll_id); INSERT INTO log_colls VALUES (null, l_log_id, dest_coll_id);
END IF; END IF;
SET i = i + 1; SET i = i + 1;
END WHILE; END WHILE;
COMMIT; COMMIT;
END LOOP; END LOOP;
CLOSE result_set; CLOSE result_set;
END;"; END;";
$stmt = $conn->prepare($procedure); $stmt = $conn->prepare($procedure);
$stmt->execute(); $stmt->execute();
$stmt->closeCursor(); $stmt->closeCursor();
unset($stmt);
$sql = "CALL explode_log_table(',')"; $sql = "CALL explode_log_table(',')";
$stmt = $conn->prepare($sql); $stmt = $conn->prepare($sql);
$stmt->execute(); $stmt->execute();
$stmt->closeCursor(); $stmt->closeCursor();
unset($stmt);
} catch (\PDOEXception $e) {
return false; $stmt = $conn->prepare($removeProc);
} $stmt->execute();
$stmt->closeCursor();
return true; return true;
} }