https://www.mediawiki.org/wiki/Special:Code/MediaWiki/106322

Revision: 106322
Author:   catrope
Date:     2011-12-15 14:16:04 +0000 (Thu, 15 Dec 2011)
Log Message:
-----------
Merge r106279 from 1.18wmf1: fix syntax errors in the .sql file

Modified Paths:
--------------
    trunk/extensions/ArticleFeedbackv5/sql/ArticleFeedbackv5.sql

Modified: trunk/extensions/ArticleFeedbackv5/sql/ArticleFeedbackv5.sql
===================================================================
--- trunk/extensions/ArticleFeedbackv5/sql/ArticleFeedbackv5.sql        
2011-12-15 14:10:26 UTC (rev 106321)
+++ trunk/extensions/ArticleFeedbackv5/sql/ArticleFeedbackv5.sql        
2011-12-15 14:16:04 UTC (rev 106322)
@@ -89,26 +89,24 @@
   PRIMARY KEY (aa_feedback_id, aa_field_id)
 ) /*$wgDBTableOptions*/;
 
-/*
-These next four are rollup tables used by the articlefeedback special page.
-The revision tables store per-revision numers, as we (in meetings with WMF)
-agreed that per-revision numbers could be useful in reporting, though
-they aren't currently used on the feedback page. The page-level ones only
-count back to wgArticleFeedbackv5RatingLifetime, so they're a rolling window.
-
-There are tables for ratings and select (ratings includes booleans as well),
-because while the value of the rating/boolean is important (Rated 3/5), for
-selects we only want the count for each input, not the value of that input or
-the sum of the values (which will be numerical option_ids, not meaningful 
-rating values). The queries were sufficiently different that we deemed multiple
-tables worthwhile.
-*/
+--These next four are rollup tables used by the articlefeedback special page.
+--The revision tables store per-revision numers, as we (in meetings with WMF)
+--agreed that per-revision numbers could be useful in reporting, though
+--they aren't currently used on the feedback page. The page-level ones only
+--count back to wgArticleFeedbackv5RatingLifetime, so they're a rolling window.
+--
+--There are tables for ratings and select (ratings includes booleans as well),
+--because while the value of the rating/boolean is important (Rated 3/5), for
+--selects we only want the count for each input, not the value of that input or
+--the sum of the values (which will be numerical option_ids, not meaningful 
+--rating values). The queries were sufficiently different that we deemed 
multiple
+--tables worthwhile.
 CREATE TABLE IF NOT EXISTS /*_*/aft_article_feedback_ratings_rollup (
   arr_page_id   integer unsigned NOT NULL,
   arr_field_id  integer unsigned NOT NULL,
   arr_total     integer unsigned NOT NULL,
   arr_count     integer unsigned NOT NULL,
-  PRIMARY KEY (arr_page_id, arr_rating_id)
+  PRIMARY KEY (arr_page_id, arr_field_id)
 ) /*$wgDBTableOptions*/;
 
 CREATE TABLE IF NOT EXISTS /*_*/aft_article_revision_feedback_ratings_rollup (
@@ -117,7 +115,7 @@
   afrr_field_id     integer unsigned NOT NULL,
   afrr_total        integer unsigned NOT NULL,
   afrr_count        integer unsigned NOT NULL,
-  PRIMARY KEY (afrr_page_id, afrr_rating_id, afrr_revision_id)
+  PRIMARY KEY (afrr_page_id, afrr_field_id, afrr_revision_id)
 ) /*$wgDBTableOptions*/;
 
 CREATE TABLE IF NOT EXISTS /*_*/aft_article_feedback_select_rollup (


_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to