Update feature matrix versions etc

8.5 -> 9.0
add 8.1
bugfix typo for loading of 8.5/9.0 values

diff --git a/pgweb/featurematrix/models.py b/pgweb/featurematrix/models.py
index 36cca5ac07d9fec5e40b08ef0ebaf3ca71b080ec..1d215cd5c69d2567a1b50fb6ae12e6bc9f1ed665 100644 (file)
--- a/pgweb/featurematrix/models.py
+++ b/pgweb/featurematrix/models.py
@@ -35,7 +35,8 @@ class Feature(PgModel, models.Model):
        v82 = models.IntegerField(null=False, blank=False, default=0, verbose_name="8.2", choices=choices)
        v83 = models.IntegerField(null=False, blank=False, default=0, verbose_name="8.3", choices=choices)
        v84 = models.IntegerField(null=False, blank=False, default=0, verbose_name="8.4", choices=choices)
-       v85 = models.IntegerField(null=False, blank=False, default=0, verbose_name="8.5a3", choices=choices)
+       v90 = models.IntegerField(null=False, blank=False, default=0, verbose_name="9.0", choices=choices)
+       v91 = models.IntegerField(null=False, blank=False, default=0, verbose_name="9.1", choices=choices)
 
        purge_urls = ('about/featurematrix/.*', )
 

diff --git a/tools/migrate/1_crunch_in_sql.sql b/tools/migrate/1_crunch_in_sql.sql
index fec3cb32f47f50928f0011059dcd707279bd1d87..ad6d28c2b70f5cf495dea35bc64ab58941701095 100644 (file)
--- a/tools/migrate/1_crunch_in_sql.sql
+++ b/tools/migrate/1_crunch_in_sql.sql
@@ -18,7 +18,7 @@ INSERT INTO featurematrix_featuregroup(id, groupname, groupsort)
 
 /* for each version */
 INSERT INTO featurematrix_feature (id, group_id, featurename, featuredescription,
-       v74, v80, v81, v82, v83, v84, v85)
+       v74, v80, v81, v82, v83, v84, v90, v91)
  SELECT
   f.featureid, f.groupid, f.featurename, COALESCE(f.featuredescription,''),
   COALESCE(f74.state, 0),
@@ -27,7 +27,8 @@ INSERT INTO featurematrix_feature (id, group_id, featurename, featuredescription
   COALESCE(f82.state, 0),
   COALESCE(f83.state, 0),
   COALESCE(f84.state, 0),
-  COALESCE(f85.state, 0)
+  COALESCE(f90.state, 0),
+  COALESCE(f91.state, 0)
  FROM oldweb.features_features f
  LEFT JOIN oldweb.features_matrix f74 ON (f.featureid = f74.feature AND f74.version=1)
  LEFT JOIN oldweb.features_matrix f80 ON (f.featureid = f80.feature AND f80.version=2)
@@ -35,7 +36,8 @@ INSERT INTO featurematrix_feature (id, group_id, featurename, featuredescription
  LEFT JOIN oldweb.features_matrix f82 ON (f.featureid = f82.feature AND f82.version=4)
  LEFT JOIN oldweb.features_matrix f83 ON (f.featureid = f83.feature AND f83.version=5)
  LEFT JOIN oldweb.features_matrix f84 ON (f.featureid = f84.feature AND f84.version=6)
- LEFT JOIN oldweb.features_matrix f85 ON (f.featureid = f85.feature AND f85.version=6)
+ LEFT JOIN oldweb.features_matrix f90 ON (f.featureid = f90.feature AND f90.version=7)
+ LEFT JOIN oldweb.features_matrix f91 ON (f.featureid = f91.feature AND f91.version=8)
 ;
 
 SELECT setval('featurematrix_feature_id_seq', max(id)) FROM featurematrix_feature;