diff dbdefs.inc.php @ 1092:95b74632cfe2

Rename votekeys table to userkeys, and all related variables and settings.
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 26 Jan 2017 13:38:19 +0200
parents 48e16e856646
children 563fc90de965
line wrap: on
line diff
--- a/dbdefs.inc.php	Thu Jan 26 01:59:33 2017 +0200
+++ b/dbdefs.inc.php	Thu Jan 26 13:38:19 2017 +0200
@@ -1,6 +1,6 @@
 <?php
 
-$dbVersion = 30;
+$dbVersion = 31;
 
 //
 // Site settings and defaults we put in
@@ -288,7 +288,7 @@
     array("preview_id"   , "INT", "DEFAULT 0"), // uploaded preview file id from "files" table
     array("preview_type" , "INT", "DEFAULT 0"), // see EFILE_*, overrides compo's general type if != 0
     array("utime"        , "INT", "DEFAULT 0"),
-    array("owner_id"     , "INT", "DEFAULT 0"), // 0 = admin, otherwise votekey id
+    array("owner_id"     , "INT", "DEFAULT 0"), // 0 = admin, otherwise userkey id
   ),
 
   "files" => array(
@@ -299,7 +299,7 @@
     array("uploadtype"   , "VARCHAR(32)", "DEFAULT NULL"), // "preview", "entry"
     array("filesize"     , "INT", "DEFAULT 0"), // uploaded size
     array("entry_id"     , "INT", "DEFAULT 0"), // belongs to this entry (0 = none)
-    array("uploader_id"  , "INT", "DEFAULT 0"), // 0 = admin, otherwise votekey id
+    array("uploader_id"  , "INT", "DEFAULT 0"), // 0 = admin, otherwise userkey id
     array("deleted"      , "INT", "DEFAULT 0"), // 1 = to be deleted
     array("utime"        , "INT", "DEFAULT 0"),
   ),
@@ -317,9 +317,9 @@
     array("adm_flags"    , "INT", "DEFAULT 0"),
   ),
 
-  "votekeys" => array(
+  "userkeys" => array(
     array("id"           , "INTEGER", "PRIMARY KEY", "AUTOINCREMENT"),
-    array("key"          , "VARCHAR(".SET_LEN_VOTEKEY.")"),
+    array("key"          , "VARCHAR(".SET_LEN_USERKEY.")"),
     array("active"       , "INT", "DEFAULT 0"),
   ),
 
@@ -404,7 +404,7 @@
     array("Good news, everybody!", "...", "The Professor"),
   ),
 
-  "votekeys" => array(
+  "userkeys" => array(
     "key",
     "%s",
     array("test1"),
@@ -482,6 +482,10 @@
     "ctype" => array("key" => "type"),
     "cpath" => array("key" => "path"),
   ),
+
+  31 => array(
+    "userkeys" => array("table" => "votekeys"),
+  ),
 );