From 2a24c61379b21bc72c44831efd85afe7642cdbaa Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Wed, 02 Mar 2016 13:43:10 -0500
Subject: [PATCH] Merge branch 'stable-3.1'
---
install/sql/incremental/upd_dev_collection.sql | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/install/sql/incremental/upd_dev_collection.sql b/install/sql/incremental/upd_dev_collection.sql
index 56cef0c..ed23e82 100644
--- a/install/sql/incremental/upd_dev_collection.sql
+++ b/install/sql/incremental/upd_dev_collection.sql
@@ -220,3 +220,9 @@
ALTER TABLE `sys_user`
ADD COLUMN `lost_password_hash` VARCHAR(50) NOT NULL DEFAULT '',
ADD COLUMN `lost_password_reqtime` DATETIME NULL default NULL;
+
+ALTER TABLE `web_database` ADD COLUMN `quota_exceeded` enum('n','y') NOT NULL DEFAULT 'n' AFTER `database_quota`;
+
+ALTER TABLE `client` ADD COLUMN `limit_database_user` int(11) NOT NULL DEFAULT '-1' after limit_database;
+ALTER TABLE `client_template` ADD COLUMN `limit_database_user` int(11) NOT NULL DEFAULT '-1' after limit_database;
+
--
Gitblit v1.9.1