changeset 301:e13be68e73a7

Layout of the votes table has changed, so add an upgrade path.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 26 Nov 2013 05:40:58 +0200
parents fd8296895588
children 828fc30e3c94
files createdb.php
diffstat 1 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/createdb.php	Tue Nov 26 01:37:35 2013 +0200
+++ b/createdb.php	Tue Nov 26 05:40:58 2013 +0200
@@ -11,7 +11,7 @@
   die();
 }
 
-$dbVersion = 5;
+$dbVersion = 6;
 
 $dbMeta = array(
   "dbVersion" => array(VT_INT, $dbVersion, "Database version"),
@@ -175,7 +175,7 @@
   "attendees" => "id INTEGER PRIMARY KEY AUTOINCREMENT, regtime INT, name VARCHAR(".SET_LEN_USERNAME."), groups VARCHAR(".SET_LEN_GROUPS."), oneliner VARCHAR(".SET_LEN_ONELINER."), email VARCHAR(".SET_LEN_EMAIL."), key_id INT DEFAULT NULL",
 
   "votekeys" => "id INTEGER PRIMARY KEY AUTOINCREMENT, key VARCHAR(64), active INT DEFAULT 0",
-  "votes" => "id INTEGER PRIMARY KEY AUTOINCREMENT, entry_id INT DEFAULT NULL, voter_id INT DEFAULT NULL, value INT DEFAULT 0",
+  "votes" => "id INTEGER PRIMARY KEY AUTOINCREMENT, entry_id INT DEFAULT NULL, key_id INT DEFAULT NULL, value INT DEFAULT 0",
 
   "displayVars" => "key VARCHAR(32) PRIMARY KEY, vtype INT, vstr VARCHAR(128), vtext TEXT, vint INT, desc VARCHAR(128)",
   "displaySlides" => "id INTEGER PRIMARY KEY AUTOINCREMENT, title VARCHAR(128), text VARCHAR(4096)",
@@ -532,6 +532,11 @@
     {
       echo "Database at version ".$currVersion.", upgrading to ".$dbVersion."\n";
       // Possibly bail out incompatible upgrades here
+      if ($currVersion < 6)
+      {
+        // Table format change
+        stExecSQL("DROP TABLE votes");
+      }
       
       // Create tables
       if (!stCreateTables(TRUE))