From 55162129ff26dbea9255eb328dd39e3ce8b92fd0 Mon Sep 17 00:00:00 2001
From: Tony Murray <murraytony@gmail.com>
Date: Wed, 5 Apr 2017 09:06:11 -0500
Subject: [PATCH] Update schema manually (#6362)

Allow build-schema.php to be run by hand more easily.
---
 misc/db_schema.yaml      | 4 ----
 scripts/build-schema.php | 7 +++----
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/misc/db_schema.yaml b/misc/db_schema.yaml
index b81f28d9fa..ac6e1926bb 100644
--- a/misc/db_schema.yaml
+++ b/misc/db_schema.yaml
@@ -1482,14 +1482,12 @@ users:
   Columns:
     can_modify_passwd: { Field: can_modify_passwd, Type: tinyint(4), 'Null': false, Default: '1', Extra: '' }
     created_at: { Field: created_at, Type: timestamp, 'Null': false, Default: '1970-01-02 00:00:01', Extra: '' }
-    dashboard: { Field: dashboard, Type: int(11), 'Null': false, Default: '0', Extra: '' }
     descr: { Field: descr, Type: char(30), 'Null': false, Default: null, Extra: '' }
     email: { Field: email, Type: varchar(64), 'Null': false, Default: null, Extra: '' }
     level: { Field: level, Type: tinyint(4), 'Null': false, Default: '0', Extra: '' }
     password: { Field: password, Type: varchar(60), 'Null': true, Default: null, Extra: '' }
     realname: { Field: realname, Type: varchar(64), 'Null': false, Default: null, Extra: '' }
     remember_token: { Field: remember_token, Type: varchar(100), 'Null': true, Default: null, Extra: '' }
-    twofactor: { Field: twofactor, Type: varchar(255), 'Null': false, Default: null, Extra: '' }
     updated_at: { Field: updated_at, Type: timestamp, 'Null': false, Default: CURRENT_TIMESTAMP, Extra: '' }
     username: { Field: username, Type: char(30), 'Null': false, Default: null, Extra: '' }
     user_id: { Field: user_id, Type: int(11), 'Null': false, Default: null, Extra: auto_increment }
@@ -1502,9 +1500,7 @@ users_prefs:
     user_id: { Field: user_id, Type: int(16), 'Null': false, Default: null, Extra: '' }
     value: { Field: value, Type: varchar(128), 'Null': false, Default: null, Extra: '' }
   Indexes:
-    PRIMARY: { Name: PRIMARY, Columns: [user_id], Unique: true, Type: BTREE }
     user_id.pref: { Name: user_id.pref, Columns: [user_id, pref], Unique: true, Type: BTREE }
-    pref: { Name: pref, Columns: [pref], Unique: false, Type: BTREE }
 users_widgets:
   Columns:
     col: { Field: col, Type: tinyint(4), 'Null': false, Default: null, Extra: '' }
diff --git a/scripts/build-schema.php b/scripts/build-schema.php
index db20f9c5cd..0af71be319 100755
--- a/scripts/build-schema.php
+++ b/scripts/build-schema.php
@@ -26,8 +26,7 @@ if (getenv('DBTEST')) {
     }
 
     sleep(60);//Sleep for 60 seconds to ensure db work has completed
-
-    $output = dump_db_schema();
-
-    echo Symfony\Component\Yaml\Yaml::dump($output, 3, 2);
 }
+
+$output = dump_db_schema();
+echo Symfony\Component\Yaml\Yaml::dump($output, 3, 2);