Add settings field to control project columns (pull-request #244)

3 files changed, 29 insertions, 12 deletions

diff --git a/app/Schema/Mysql.php b/app/Schema/Mysql.php
index 2d3f993e..86685067 100644
--- a/app/Schema/Mysql.php
+++ b/app/Schema/Mysql.php
@@ -4,7 +4,12 @@ namespace Schema;
 
 use Core\Security;
 
-const VERSION = 25;
+const VERSION = 26;
+
+function version_26($pdo)
+{
+    $pdo->exec("ALTER TABLE config ADD COLUMN default_columns VARCHAR(255) DEFAULT ''");
+}
 
 function version_25($pdo)
 {
@@ -100,7 +105,8 @@ function version_20($pdo)
 
 function version_19($pdo)
 {
-    $pdo->exec("ALTER TABLE config ADD COLUMN api_token VARCHAR(255) DEFAULT '".Security::generateToken()."'");
+    $pdo->exec("ALTER TABLE config ADD COLUMN api_token VARCHAR(255) DEFAULT ''");
+    $pdo->exec("UPDATE config SET api_token='".Security::generateToken()."'");
 }
 
 function version_18($pdo)
@@ -205,7 +211,7 @@ function version_1($pdo)
     $pdo->exec("
         CREATE TABLE config (
             language CHAR(5) DEFAULT 'en_US',
-            webhooks_token VARCHAR(255),
+            webhooks_token VARCHAR(255) DEFAULT '',
             timezone VARCHAR(50) DEFAULT 'UTC'
         ) ENGINE=InnoDB CHARSET=utf8
     ");
diff --git a/app/Schema/Postgres.php b/app/Schema/Postgres.php
index b58b9bb3..a7e57d66 100644
--- a/app/Schema/Postgres.php
+++ b/app/Schema/Postgres.php
@@ -4,7 +4,12 @@ namespace Schema;
 
 use Core\Security;
 
-const VERSION = 6;
+const VERSION = 7;
+
+function version_7($pdo)
+{
+    $pdo->exec("ALTER TABLE config ADD COLUMN default_columns VARCHAR(255) DEFAULT ''");
+}
 
 function version_6($pdo)
 {
@@ -95,9 +100,9 @@ function version_1($pdo)
     $pdo->exec("
         CREATE TABLE config (
             language CHAR(5) DEFAULT 'en_US',
-            webhooks_token VARCHAR(255),
+            webhooks_token VARCHAR(255) DEFAULT '',
             timezone VARCHAR(50) DEFAULT 'UTC',
-            api_token VARCHAR(255)
+            api_token VARCHAR(255) DEFAULT ''
         );
 
         CREATE TABLE users (
diff --git a/app/Schema/Sqlite.php b/app/Schema/Sqlite.php
index ecd62c97..cab69fa0 100644
--- a/app/Schema/Sqlite.php
+++ b/app/Schema/Sqlite.php
@@ -4,7 +4,12 @@ namespace Schema;
 
 use Core\Security;
 
-const VERSION = 25;
+const VERSION = 26;
+
+function version_26($pdo)
+{
+    $pdo->exec("ALTER TABLE config ADD COLUMN default_columns TEXT DEFAULT ''");
+}
 
 function version_25($pdo)
 {
@@ -97,7 +102,8 @@ function version_20($pdo)
 
 function version_19($pdo)
 {
-    $pdo->exec("ALTER TABLE config ADD COLUMN api_token TEXT DEFAULT '".Security::generateToken()."'");
+    $pdo->exec("ALTER TABLE config ADD COLUMN api_token TEXT DEFAULT ''");
+    $pdo->exec("UPDATE config SET api_token='".Security::generateToken()."'");
 }
 
 function version_18($pdo)
@@ -307,8 +313,8 @@ function version_1($pdo)
 {
     $pdo->exec("
         CREATE TABLE config (
-            language TEXT,
-            webhooks_token TEXT
+            language TEXT DEFAULT 'en_US',
+            webhooks_token TEXT DEFAULT ''
         )
     ");
 
@@ -366,7 +372,7 @@ function version_1($pdo)
 
     $pdo->exec("
         INSERT INTO config
-        (language, webhooks_token)
-        VALUES ('en_US', '".Security::generateToken()."')
+        (webhooks_token)
+        VALUES ('".Security::generateToken()."')
     ");
 }