Merge remote-tracking branch 'upstream/master'

1 files changed, 19 insertions, 2 deletions

diff --git a/app/Schema/Mysql.php b/app/Schema/Mysql.php
index d3b111f9..5c7e256f 100644
--- a/app/Schema/Mysql.php
+++ b/app/Schema/Mysql.php
@@ -2,7 +2,24 @@
 
 namespace Schema;
 
-const VERSION = 17;
+const VERSION = 18;
+
+function version_18($pdo)
+{
+    $pdo->exec("
+        CREATE TABLE task_has_subtasks (
+            id INT NOT NULL AUTO_INCREMENT,
+            title VARCHAR(255),
+            status INT DEFAULT 0,
+            time_estimated INT DEFAULT 0,
+            time_spent INT DEFAULT 0,
+            task_id INT,
+            user_id INT,
+            PRIMARY KEY (id),
+            FOREIGN KEY(task_id) REFERENCES tasks(id) ON DELETE CASCADE
+        ) ENGINE=InnoDB CHARSET=utf8"
+    );
+}
 
 function version_17($pdo)
 {
@@ -246,6 +263,6 @@ function version_1($pdo)
     $pdo->exec("
         INSERT INTO config
         (webhooks_token)
-        VALUES ('".\Model\Base::generateToken()."')
+        VALUES ('".\Core\Security::generateToken()."')
     ");
 }