From 4e20bc29ad6216da39f3040d6d43eea3380c9279 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 19 May 2020 16:54:35 +0200
Subject: [PATCH] add new field disabledUntil in tblUsers

---
 install/create_tables-innodb.sql         | 1 +
 install/create_tables-postgres.sql       | 1 +
 install/create_tables-sqlite3.sql        | 1 +
 install/update-6.1.0/update-postgres.sql | 2 ++
 install/update-6.1.0/update-sqlite3.sql  | 1 +
 install/update-6.1.0/update.sql          | 2 ++
 6 files changed, 8 insertions(+)

diff --git a/install/create_tables-innodb.sql b/install/create_tables-innodb.sql
index da8a80b58..ec7f4031a 100644
--- a/install/create_tables-innodb.sql
+++ b/install/create_tables-innodb.sql
@@ -81,6 +81,7 @@ CREATE TABLE `tblUsers` (
   `pwdExpiration` datetime DEFAULT NULL,
   `loginfailures` tinyint(4) NOT NULL DEFAULT '0',
   `disabled` smallint(1) NOT NULL DEFAULT '0',
+  `disabledUntil` datetime DEFAULT NULL,
   `quota` bigint(20) DEFAULT NULL,
   `homefolder` int(11) DEFAULT NULL,
   PRIMARY KEY (`id`),
diff --git a/install/create_tables-postgres.sql b/install/create_tables-postgres.sql
index f571edc6b..c068d2a27 100644
--- a/install/create_tables-postgres.sql
+++ b/install/create_tables-postgres.sql
@@ -76,6 +76,7 @@ CREATE TABLE "tblUsers" (
   "pwdExpiration" TIMESTAMP default NULL,
   "loginfailures" INTEGER NOT NULL default '0',
   "disabled" INTEGER NOT NULL default '0',
+  "disabledUntil" TIMESTAMP default NULL
   "quota" BIGINT,
   "homefolder" INTEGER default NULL,
   UNIQUE ("login")
diff --git a/install/create_tables-sqlite3.sql b/install/create_tables-sqlite3.sql
index 6ac0483ea..ea7aca40b 100644
--- a/install/create_tables-sqlite3.sql
+++ b/install/create_tables-sqlite3.sql
@@ -77,6 +77,7 @@ CREATE TABLE `tblUsers` (
   `pwdExpiration` TEXT default NULL,
   `loginfailures` INTEGER NOT NULL default '0',
   `disabled` INTEGER NOT NULL default '0',
+  `disabledUntil` TEXT default NULL,
   `quota` INTEGER,
   `homefolder` INTEGER default NULL REFERENCES `tblFolders` (`id`),
   UNIQUE (`login`)
diff --git a/install/update-6.1.0/update-postgres.sql b/install/update-6.1.0/update-postgres.sql
index 32988e6e8..08dffefe8 100644
--- a/install/update-6.1.0/update-postgres.sql
+++ b/install/update-6.1.0/update-postgres.sql
@@ -8,6 +8,8 @@ ALTER TABLE "tblUserPasswordRequest" ALTER COLUMN "hash" varchar(255) DEFAULT NU
 
 ALTER TABLE "tblUsers" ADD COLUMN "webauthn" TYPE text DEFAULT NULL;
 
+ALTER TABLE "tblUsers" ADD COLUMN "disabledUntil" TYPE TIMESTAMP DEFAULT NULL;
+
 CREATE TABLE "tblAttributeDefinitionGroups" (
   "id" SERIAL UNIQUE,
   "name" varchar(100) default NULL,
diff --git a/install/update-6.1.0/update-sqlite3.sql b/install/update-6.1.0/update-sqlite3.sql
index dadc312c8..0b2fad2a3 100644
--- a/install/update-6.1.0/update-sqlite3.sql
+++ b/install/update-6.1.0/update-sqlite3.sql
@@ -16,6 +16,7 @@ CREATE TABLE `new_tblUsers` (
   `pwdExpiration` TEXT default NULL,
   `loginfailures` INTEGER NOT NULL default '0',
   `disabled` INTEGER NOT NULL default '0',
+  `disabledUntil` TEXT default NULL,
   `quota` INTEGER,
   `homefolder` INTEGER default NULL REFERENCES `tblFolders` (`id`),
   UNIQUE (`login`)
diff --git a/install/update-6.1.0/update.sql b/install/update-6.1.0/update.sql
index 57fd4c568..2ad3a2e1a 100644
--- a/install/update-6.1.0/update.sql
+++ b/install/update-6.1.0/update.sql
@@ -8,6 +8,8 @@ ALTER TABLE `tblUserPasswordRequest` CHANGE `hash` `hash` varchar(255) DEFAULT N
 
 ALTER TABLE `tblUsers` ADD COLUMN `webauthn` text DEFAULT NULL AFTER `pwd`;
 
+ALTER TABLE `tblUsers` ADD COLUMN `disabledUntil` datetime DEFAULT NULL AFTER `disabled`;
+
 CREATE TABLE `tblAttributeDefinitionGroups` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `name` varchar(100) DEFAULT NULL,