OpencachingDeutschland/oc-server3
1
0
Fork 0
Code Issues Pull Requests Releases Activity

merged stable

Browse Source
This commit is contained in:
following
2013-03-16 09:30:57 +01:00
parent f850b3372b a795ead0c4
commit 57489bb01d
2 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
htdocs/doc/sql/db-changes.txt
+1 -1
View File
@@ -50,4 +50,4 @@ date commit ID change
2013-03-10 f8738936 added field 'mappreview' in pictures and pictures_modified
2013-03-14 69abeb67 added fields coordinates_type.preposition and pp_trans_id
2013-03-15 discarded table 'data_license'
2013-03-15 a15b5582 discarded table 'data_license'
htdocs/doc/sql/stored-proc/maintain.php
+21 -4
View File
@@ -1007,10 +1007,12 @@
CALL sp_update_cache_picturestat(NEW.`object_id`, FALSE);
END IF;
ELSEIF @archive_picop AND
NEW.`object_type`=2 AND
(OLD.`date_created` < LEFT(NOW(),10)) AND
(SELECT `status` FROM `caches` WHERE `caches`.`cache_id`=OLD.`object_id`) != 5 AND
(NEW.`title` != OLD.`title` OR NEW.`spoiler` != OLD.`spoiler` OR NEW.`display` != OLD.`display`) THEN
( ( NEW.`object_type`=2 AND
OLD.`date_created` < LEFT(NOW(),10) AND
(SELECT `status` FROM `caches` WHERE `caches`.`cache_id`=OLD.`object_id`) != 5
) OR
NEW.`object_type`=1 ) AND
(NEW.`title` != OLD.`title` OR NEW.`spoiler` != OLD.`spoiler` OR NEW.`display` != OLD.`display`) THEN
INSERT IGNORE INTO `pictures_modified` (`id`, `date_modified`, `operation`, `date_created`, `url`, `title`, `object_id`, `object_type`, `spoiler`, `unknown_format`, `display`, `restored_by`) VALUES (OLD.`id`, NOW(), 'U', OLD.`date_created`, OLD.`url`, OLD.`title`, OLD.`object_id`, OLD.`object_type`, OLD.`spoiler`, OLD.`unknown_format`, OLD.`display`, IFNULL(@restoredby,0));
/* mappreview is not archived, can be safely set to 0 on restore */
END IF;
@@ -1148,6 +1150,21 @@
END IF;
END;");
sql_dropTrigger('userBeforeDelete');
sql("CREATE TRIGGER `userBeforeDelete` BEFORE DELETE ON `user`
FOR EACH ROW
BEGIN
DELETE FROM `cache_adoption` WHERE `user_id`=OLD.user_id;
DELETE FROM `cache_ignore` WHERE `user_id`=OLD.user_id;
DELETE FROM `cache_rating` WHERE `user_id`=OLD.user_id;
DELETE FROM `cache_watches` WHERE `user_id`=OLD.user_id;
DELETE FROM `stat_user` WHERE `user_id`=OLD.user_id;
DELETE FROM `user_options` WHERE `user_id`=OLD.user_id;
DELETE FROM `user_statpic` WHERE `user_id`=OLD.user_id;
DELETE FROM `watches_waiting` WHERE `user_id`=OLD.user_id;
DELETE FROM `notify_waiting` WHERE `user_id`=OLD.user_id;
END;");
sql_dropTrigger('userAfterDelete');
sql("CREATE TRIGGER `userAfterDelete` AFTER DELETE ON `user`
FOR EACH ROW