Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170512.sql
===================================================================
diff -u -r5dbbc7b9946ede2b5de406e9adb39928e1dda083 -r9dd5e4833e3b7b0afe76907df7d5bddfe803652a
--- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170512.sql	(.../patch20170512.sql)	(revision 5dbbc7b9946ede2b5de406e9adb39928e1dda083)
+++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170512.sql	(.../patch20170512.sql)	(revision 9dd5e4833e3b7b0afe76907df7d5bddfe803652a)
@@ -39,35 +39,8 @@
 JOIN tmp_imagegallery_rating_sessionid tmp ON r.uid = tmp.rating_uid
 SET r.tool_session_id = tmp.session_id;
 
--- Update existing Peer Review
-DROP TABLE IF EXISTS tmp_peerreview_rating_sessionid;
-CREATE TEMPORARY TABLE tmp_peerreview_rating_sessionid AS
-SELECT r.uid rating_uid, prs.session_id session_id
-FROM lams_rating r
-JOIN lams_rating_criteria rc ON r.rating_criteria_id = rc.rating_criteria_id
-JOIN tl_laprev11_peerreview pr ON rc.tool_content_id = pr.content_id
-JOIN tl_laprev11_session prs ON pr.uid = prs.peerreview_uid
-JOIN tl_laprev11_user pru ON r.user_id = pru.user_id AND prs.uid = pru.session_uid;
+-- Update existing Peer Review done by the Peer Review tool
 
-UPDATE lams_rating r
-JOIN tmp_peerreview_rating_sessionid tmp ON r.uid = tmp.rating_uid
-SET r.tool_session_id = tmp.session_id;
-
-DROP TABLE tmp_peerreview_rating_sessionid;
-CREATE TEMPORARY TABLE tmp_peerreview_rating_sessionid AS
-SELECT r.uid rating_uid, prs.session_id session_id
-FROM lams_rating_comment r
-JOIN lams_rating_criteria rc ON r.rating_criteria_id = rc.rating_criteria_id
-JOIN tl_laprev11_peerreview pr ON rc.tool_content_id = pr.content_id
-JOIN tl_laprev11_session prs ON pr.uid = prs.peerreview_uid
-JOIN tl_laprev11_user pru ON r.user_id = pru.user_id AND prs.uid = pru.session_uid;
-
-UPDATE lams_rating_comment r
-JOIN tmp_peerreview_rating_sessionid tmp ON r.uid = tmp.rating_uid
-SET r.tool_session_id = tmp.session_id;
-
-DROP TABLE tmp_peerreview_rating_sessionid;
-
 -- Update existing QA
 DROP TABLE IF EXISTS tmp_qa_rating_sessionid;
 CREATE TEMPORARY TABLE tmp_qa_rating_sessionid AS
Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dbupdates/patch20170512.sql
===================================================================
diff -u
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dbupdates/patch20170512.sql	(revision 0)
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dbupdates/patch20170512.sql	(revision 9dd5e4833e3b7b0afe76907df7d5bddfe803652a)
@@ -0,0 +1,40 @@
+-- Turn off autocommit, so nothing is committed if there is an error
+
+SET AUTOCOMMIT = 0;
+SET FOREIGN_KEY_CHECKS=0;
+
+--     LDEV-2999 Include a rating option for viewed resources. The one in 
+-- the core needs to run first but we cannot force that.
+-- Update existing Peer Review
+DROP TABLE IF EXISTS tmp_peerreview_rating_sessionid;
+CREATE TEMPORARY TABLE tmp_peerreview_rating_sessionid AS
+SELECT r.uid rating_uid, prs.session_id session_id
+FROM lams_rating r
+JOIN lams_rating_criteria rc ON r.rating_criteria_id = rc.rating_criteria_id
+JOIN tl_laprev11_peerreview pr ON rc.tool_content_id = pr.content_id
+JOIN tl_laprev11_session prs ON pr.uid = prs.peerreview_uid
+JOIN tl_laprev11_user pru ON r.user_id = pru.user_id AND prs.uid = pru.session_uid;
+
+UPDATE lams_rating r
+JOIN tmp_peerreview_rating_sessionid tmp ON r.uid = tmp.rating_uid
+SET r.tool_session_id = tmp.session_id;
+
+DROP TABLE tmp_peerreview_rating_sessionid;
+CREATE TEMPORARY TABLE tmp_peerreview_rating_sessionid AS
+SELECT r.uid rating_uid, prs.session_id session_id
+FROM lams_rating_comment r
+JOIN lams_rating_criteria rc ON r.rating_criteria_id = rc.rating_criteria_id
+JOIN tl_laprev11_peerreview pr ON rc.tool_content_id = pr.content_id
+JOIN tl_laprev11_session prs ON pr.uid = prs.peerreview_uid
+JOIN tl_laprev11_user pru ON r.user_id = pru.user_id AND prs.uid = pru.session_uid;
+
+UPDATE lams_rating_comment r
+JOIN tmp_peerreview_rating_sessionid tmp ON r.uid = tmp.rating_uid
+SET r.tool_session_id = tmp.session_id;
+
+DROP TABLE tmp_peerreview_rating_sessionid;
+
+-- If there were no errors, commit and restore autocommit to on
+SET FOREIGN_KEY_CHECKS=0;
+COMMIT;
+SET AUTOCOMMIT = 1;