http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71775

Revision: 71775
Author:   reedy
Date:     2010-08-27 00:19:34 +0000 (Fri, 27 Aug 2010)

Log Message:
-----------
Add basic inserts to article_assessment_ratings

Fix primary key of article_assessment


Brackets, not braces!!!

Modified Paths:
--------------
    trunk/extensions/ArticleAssessmentPilot/ArticleAssessmentPilot.sql
    trunk/extensions/ArticleAssessmentPilot/api/ApiListArticleAssessment.php

Modified: trunk/extensions/ArticleAssessmentPilot/ArticleAssessmentPilot.sql
===================================================================
--- trunk/extensions/ArticleAssessmentPilot/ArticleAssessmentPilot.sql  
2010-08-27 00:08:04 UTC (rev 71774)
+++ trunk/extensions/ArticleAssessmentPilot/ArticleAssessmentPilot.sql  
2010-08-27 00:19:34 UTC (rev 71775)
@@ -1,10 +1,11 @@
 -- Store mapping of i18n key of "rating" to an ID
-CREATE TABLE IF NOT EXISTS /*$wgDBprefix*/article_assessment_ratings {
+CREATE TABLE IF NOT EXISTS /*$wgDBprefix*/article_assessment_ratings (
   aam_id int unsigned NOT NULL PRIMARY KEY AUTO_INCREMENT,
   aam_rating varchar(255) binary NOT NULL
-} /*$wgDBTableOptions*/;
+) /*$wgDBTableOptions*/;
 
--- INSERT INTO /*$wgDBprefix*/article_assessment_ratings(aam_rating) 
VALUES('blah');
+-- INSERT INTO /*$wgDBprefix*/article_assessment_ratings(aam_rating) 
VALUES('articleassessment-rating-wellsourced'),
+--  ('articleassessment-rating-neutrality'), 
('articleassessment-rating-completeness'), 
('articleassessment-rating-readability');
 
 -- Store article assessments
 CREATE TABLE IF NOT EXISTS /*$wgDBprefix*/article_assessment (
@@ -21,7 +22,7 @@
   aa_rating_id int unsigned NOT NULL,
   aa_rating_value int unsigned NOT NULL,
   -- 1 vote per user per revision
-  PRIMARY KEY (aa_revision, aa_user_text)
+  PRIMARY KEY (aa_revision, aa_user_text, aa_rating_id)
 ) /*$wgDBTableOptions*/;
 
 -- Store article assessments

Modified: 
trunk/extensions/ArticleAssessmentPilot/api/ApiListArticleAssessment.php
===================================================================
--- trunk/extensions/ArticleAssessmentPilot/api/ApiListArticleAssessment.php    
2010-08-27 00:08:04 UTC (rev 71774)
+++ trunk/extensions/ArticleAssessmentPilot/api/ApiListArticleAssessment.php    
2010-08-27 00:19:34 UTC (rev 71775)
@@ -23,7 +23,7 @@
                $this->addWhereFld( 'aap_rating_id', 'aam_rating_id' );
 
                if ( isset( $params['pageid'] ) ) {
-                       $this->addWhereFld( 'aa_page_id', $params['pageid'] );
+                       $this->addWhereFld( 'aap_page_id', $params['pageid'] );
                }
 
                $res = $this->select( __METHOD__ );



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

Reply via email to