From e3c0b8e38531427131db7cedab8c3807467a5205 Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared@osticket.com>
Date: Tue, 3 Mar 2015 14:52:14 -0600
Subject: [PATCH] forms: Drop `private`, `required`, and `edit_mask` on install

---
 .../streams/core/9143a511-959aca6e.cleanup.sql        | 11 +++++++++++
 .../upgrader/streams/core/9143a511-959aca6e.patch.sql | 11 +++++++++++
 setup/inc/streams/core/install-mysql.sql              |  3 ---
 3 files changed, 22 insertions(+), 3 deletions(-)
 create mode 100644 include/upgrader/streams/core/9143a511-959aca6e.cleanup.sql
 create mode 100644 include/upgrader/streams/core/9143a511-959aca6e.patch.sql

diff --git a/include/upgrader/streams/core/9143a511-959aca6e.cleanup.sql b/include/upgrader/streams/core/9143a511-959aca6e.cleanup.sql
new file mode 100644
index 000000000..1961edddc
--- /dev/null
+++ b/include/upgrader/streams/core/9143a511-959aca6e.cleanup.sql
@@ -0,0 +1,11 @@
+/**
+ * @signature 959aca6ed189cd918d227a3ea8a135a3
+ * @version v1.9.6
+ * @title Retire `private`, `required`, and `edit_mask` for fields
+ *
+ */
+
+ALTER TABLE `%TABLE_PREFIX%form_field`
+    DROP `private`,
+    DROP `required`,
+    DROP `edit_mask`;
diff --git a/include/upgrader/streams/core/9143a511-959aca6e.patch.sql b/include/upgrader/streams/core/9143a511-959aca6e.patch.sql
new file mode 100644
index 000000000..706c255b3
--- /dev/null
+++ b/include/upgrader/streams/core/9143a511-959aca6e.patch.sql
@@ -0,0 +1,11 @@
+/**
+ * @signature 959aca6ed189cd918d227a3ea8a135a3
+ * @version v1.9.6
+ * @title Retire `private`, `required`, and `edit_mask` for fields
+ *
+ */
+
+-- Finished with patch
+UPDATE `%TABLE_PREFIX%config`
+    SET `value` = '959aca6ed189cd918d227a3ea8a135a3'
+    WHERE `key` = 'schema_signature' AND `namespace` = 'core';
diff --git a/setup/inc/streams/core/install-mysql.sql b/setup/inc/streams/core/install-mysql.sql
index 3ecb6bff6..7914d88d4 100644
--- a/setup/inc/streams/core/install-mysql.sql
+++ b/setup/inc/streams/core/install-mysql.sql
@@ -134,9 +134,6 @@ CREATE TABLE `%TABLE_PREFIX%form_field` (
     `flags` int(10) unsigned DEFAULT 1,
     `type` varchar(255) NOT NULL DEFAULT 'text',
     `label` varchar(255) NOT NULL,
-    `required` tinyint(1) NOT NULL DEFAULT 0,
-    `private` tinyint(1) NOT NULL DEFAULT 0,
-    `edit_mask` tinyint(1) NOT NULL DEFAULT 0,
     `name` varchar(64) NOT NULL,
     `configuration` text,
     `sort` int(11) unsigned NOT NULL,
-- 
GitLab