← All changes | includes/Core/Database/DB.php +80 -54 1.4 → 2.7.0 View file →

		@@ -13,33 +13,33 @@
13	13	* Database Migration
14	14	*/
15	15	final class DB
16	16	{
17		- /**
18		- * Undocumented function
19		- *
20		- * @return void
21		- */
22		- public static function migrate()
23		- {
24		- global $wpdb;
25		- global $bitforms_db_version;
26		- $collate = '';
	17	+ /**
	18	+ * Undocumented function
	19	+ *
	20	+ * @return void
	21	+ */
	22	+ public static function migrate()
	23	+ {
	24	+ global $wpdb;
	25	+ global $bitforms_db_version;
	26	+ $collate = '';
27	27
28		- if ($wpdb->has_cap('collation')) {
29		- if (!empty($wpdb->charset)) {
30		- $collate .= "DEFAULT CHARACTER SET $wpdb->charset";
31		- }
	28	+ if ($wpdb->has_cap('collation')) {
	29	+ if (!empty($wpdb->charset)) {
	30	+ $collate .= "DEFAULT CHARACTER SET $wpdb->charset";
	31	+ }
32	32
33		- if (!empty($wpdb->collate)) {
34		- $collate .= " COLLATE $wpdb->collate";
35		- }
36		- }
	33	+ if (!empty($wpdb->collate)) {
	34	+ $collate .= " COLLATE $wpdb->collate";
	35	+ }
	36	+ }
37	37
38		- $max_index_length = 191;
	38	+ $max_index_length = 191;
39	39
40		- $table_schema = array(
41		- "CREATE TABLE IF NOT EXISTS `{$wpdb->prefix}bitforms_reports` (
	40	+ $table_schema = [
	41	+ "CREATE TABLE IF NOT EXISTS `{$wpdb->prefix}bitforms_reports` (
42	42	`id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
43	43	`category` varchar(50) NOT NULL,
44	44	`type` varchar(20) NOT NULL,
45	45	`context` varchar(20) NOT NULL,
		@@ -52,12 +52,15 @@
52	52	`updated_at` datetime DEFAULT NULL,
53	53	PRIMARY KEY (`id`)
54	54	) $collate;",
55	55
56		- "CREATE TABLE IF NOT EXISTS `{$wpdb->prefix}bitforms_form` (
	56	+ "CREATE TABLE IF NOT EXISTS `{$wpdb->prefix}bitforms_form` (
57	57	`id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
58	58	`form_name` varchar(255) DEFAULT NULL,
59	59	`form_content` longtext DEFAULT NULL,
	60	+ `builder_helper_state` longtext DEFAULT NULL,
	61	+ `atomic_class_map` longtext DEFAULT NULL,
	62	+ `generated_script_page_ids` longtext DEFAULT NULL,
60	63	`user_id` bigint(20) unsigned DEFAULT NULL,
61	64	`user_ip` int(11) unsigned DEFAULT NULL,
62	65	`views` int(11) unsigned DEFAULT 0,
63	66	`entries` int(11) unsigned DEFAULT 0,
		@@ -67,9 +70,9 @@
67	70	`updated_at` datetime DEFAULT NULL,
68	71	PRIMARY KEY (`id`)
69	72	) $collate;",
70	73
71		- "CREATE TABLE IF NOT EXISTS `{$wpdb->prefix}bitforms_workflows` (
	74	+ "CREATE TABLE IF NOT EXISTS `{$wpdb->prefix}bitforms_workflows` (
72	75	`id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
73	76	`workflow_name` varchar(255) NOT NULL,
74	77	`workflow_type` varchar(50) NOT NULL,
75	78	`workflow_run` varchar(50) NOT NULL,
		@@ -74,9 +77,9 @@
74	77	`workflow_type` varchar(50) NOT NULL,
75	78	`workflow_run` varchar(50) NOT NULL,
76	79	`workflow_behaviour` varchar(25) NOT NULL,
77	80	`workflow_condition` longtext DEFAULT NULL,
78		- `workflow_action` longtext DEFAULT NULL,
	81	+ `workflow_order` int(11) unsigned DEFAULT NULL,
79	82	`form_id` bigint(20) unsigned DEFAULT NULL,
80	83	`user_id` bigint(20) unsigned DEFAULT NULL,
81	84	`user_ip` int(11) unsigned DEFAULT NULL,
82	85	`user_location` text DEFAULT NULL,
		@@ -86,12 +89,13 @@
86	89	PRIMARY KEY (`id`),
87	90	KEY `form_id` (`form_id`)
88	91	) $collate;",
89	92
90		- "CREATE TABLE IF NOT EXISTS `{$wpdb->prefix}bitforms_success_messages` (
	93	+ "CREATE TABLE IF NOT EXISTS `{$wpdb->prefix}bitforms_success_messages` (
91	94	`id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
92	95	`message_title` varchar(255) DEFAULT NULL,
93	96	`message_content` longtext DEFAULT NULL,
	97	+ `message_config` longtext DEFAULT NULL,
94	98	`form_id` bigint(20) unsigned DEFAULT NULL,
95	99	`user_id` bigint(20) unsigned DEFAULT NULL,
96	100	`user_ip` int(11) unsigned DEFAULT NULL,
97	101	`created_at` datetime DEFAULT NULL,
		@@ -98,9 +102,9 @@
98	102	`updated_at` datetime DEFAULT NULL,
99	103	PRIMARY KEY (`id`)
100	104	) $collate;",
101	105
102		- "CREATE TABLE IF NOT EXISTS `{$wpdb->prefix}bitforms_email_template` (
	106	+ "CREATE TABLE IF NOT EXISTS `{$wpdb->prefix}bitforms_email_template` (
103	107	`id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
104	108	`title` text DEFAULT NULL,
105	109	`sub` text DEFAULT NULL,
106	110	`body` longtext DEFAULT NULL,
		@@ -111,9 +115,9 @@
111	115	`updated_at` datetime DEFAULT NULL,
112	116	PRIMARY KEY (`id`)
113	117	) $collate;",
114	118
115		- "CREATE TABLE IF NOT EXISTS `{$wpdb->prefix}bitforms_integration` (
	119	+ "CREATE TABLE IF NOT EXISTS `{$wpdb->prefix}bitforms_integration` (
116	120	`id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
117	121	`category` varchar(50) NOT NULL,
118	122	`integration_name` varchar(255) DEFAULT NULL,
119	123	`integration_type` varchar(50) NOT NULL,
		@@ -126,13 +130,13 @@
126	130	`updated_at` datetime DEFAULT NULL,
127	131	PRIMARY KEY (`id`)
128	132	) $collate;",
129	133
130		- "CREATE TABLE IF NOT EXISTS `{$wpdb->prefix}bitforms_form_entries` (
	134	+ "CREATE TABLE IF NOT EXISTS `{$wpdb->prefix}bitforms_form_entries` (
131	135	`id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
132	136	`form_id` bigint(20) unsigned DEFAULT NULL,
133	137	`user_id` bigint(20) unsigned DEFAULT NULL,
134		- `user_ip` int(11) unsigned DEFAULT NULL,
	138	+ `user_ip` varchar(255) DEFAULT NULL,
135	139	`user_location` text DEFAULT NULL,
136	140	`user_device` varchar(50) DEFAULT NULL,
137	141	`referer` varchar(255) DEFAULT NULL,
138	142	`status` tinyint(1) DEFAULT 0,/* 0 not viewed, 1 viewed, 2 trashed */
		@@ -141,9 +145,9 @@
141	145	PRIMARY KEY (`id`),
142	146	KEY `form_id` (`form_id`)
143	147	) $collate;",
144	148
145		- "CREATE TABLE IF NOT EXISTS `{$wpdb->prefix}bitforms_form_entrymeta` (
	149	+ "CREATE TABLE IF NOT EXISTS `{$wpdb->prefix}bitforms_form_entrymeta` (
146	150	`meta_id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
147	151	`bitforms_form_entry_id` bigint(20) unsigned DEFAULT NULL,
148	152	`meta_key` varchar(255) DEFAULT NULL,
149	153	`meta_value` longtext,
		@@ -151,9 +155,9 @@
151	155	KEY `meta_key` (`meta_key`({$max_index_length})),
152	156	KEY `entry_id` (`bitforms_form_entry_id`)
153	157	) $collate;",
154	158
155		- "CREATE TABLE IF NOT EXISTS `{$wpdb->prefix}bitforms_form_entry_log` (
	159	+ "CREATE TABLE IF NOT EXISTS `{$wpdb->prefix}bitforms_form_entry_log` (
156	160	`id` int(11) unsigned NOT NULL AUTO_INCREMENT,
157	161	`user_id` int(11) NOT NULL,
158	162	`log_type` varchar(50) DEFAULT NULL,
159	163	`ip` int(11) DEFAULT NULL,
		@@ -166,9 +170,9 @@
166	170	KEY `form_id` (`form_id`),
167	171	KEY `form_entry_id` (`form_entry_id`)
168	172	) $collate;",
169	173
170		- "CREATE TABLE IF NOT EXISTS `{$wpdb->prefix}bitforms_form_log_details` (
	174	+ "CREATE TABLE IF NOT EXISTS `{$wpdb->prefix}bitforms_form_log_details` (
171	175	`id` int(11) unsigned NOT NULL AUTO_INCREMENT,
172	176	`log_id` bigint(20) NOT NULL,
173	177	`integration_id` bigint(20) DEFAULT NULL,
174	178	`api_type` varchar(255) DEFAULT NULL,
		@@ -178,9 +182,9 @@
178	182	PRIMARY KEY (`id`),
179	183	KEY `log_id` (`log_id`),
180	184	KEY `integration_id` (`integration_id`)
181	185	) $collate;",
182		- "CREATE TABLE IF NOT EXISTS `{$wpdb->prefix}bitforms_form_entry_relatedinfo` (
	186	+ "CREATE TABLE IF NOT EXISTS `{$wpdb->prefix}bitforms_form_entry_relatedinfo` (
183	187	`id` INT(11) UNSIGNED NOT NULL AUTO_INCREMENT,
184	188	`info_type` VARCHAR(50) NOT NULL,
185	189	`info_details` LONGTEXT NULL,
186	190	`form_id` BIGINT(20) UNSIGNED NOT NULL,
		@@ -192,36 +196,58 @@
192	196	`updated_at` DATETIME NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
193	197	PRIMARY KEY (`id`),
194	198	KEY `form_id` (`form_id`),
195	199	KEY `entry_id` (`entry_id`)
196		- ) $collate;"
197		- );
	200	+ ) $collate;",
	201	+ ];
198	202
199		- $table_schema_update = array(
200		- "ALTER TABLE `{$wpdb->prefix}bitforms_form_entry_log`
	203	+ $table_schema_update = [
	204	+ "ALTER TABLE `{$wpdb->prefix}bitforms_form_entry_log`
201	205	CHANGE COLUMN `log_type` `log_type` VARCHAR(50) NULL DEFAULT NULL,
202	206	ADD COLUMN `action_type` VARCHAR(50) NULL DEFAULT NULL,
203	207	CHANGE COLUMN `meta_key` `content` LONGTEXT NULL,
204	208	CHANGE COLUMN `created_at` `created_at` DATETIME NOT NULL",
205		- "ALTER TABLE `{$wpdb->prefix}bitforms_form_log_details`
	209	+ "ALTER TABLE `{$wpdb->prefix}bitforms_form_log_details`
206	210	CHANGE COLUMN `api_type` `api_type` VARCHAR(255) NULL DEFAULT NULL,
207	211	CHANGE COLUMN `response_obj` `response_obj` LONGTEXT NULL,
208	212	CHANGE COLUMN `created_at` `created_at` DATETIME NOT NULL",
209		- );
	213	+ ];
210	214
211		- include_once ABSPATH . 'wp-admin/includes/upgrade.php';
212		- foreach ($table_schema as $table) {
213		- dbDelta($table);
214		- }
215		- $installed_db_version = get_site_option("bitforms_db_version");
216		- if ($installed_db_version && version_compare('1.1', $installed_db_version, '<=')) {
217		- // if new db version is equal or higher than 1.1
218		- foreach ($table_schema_update as $table) {
219		- $wpdb->query($table);
220		- }
221		- }
222		- update_site_option(
223		- 'bitforms_db_version',
224		- $bitforms_db_version
225		- );
	215	+ include_once ABSPATH . 'wp-admin/includes/upgrade.php';
	216	+ foreach ($table_schema as $table) {
	217	+ dbDelta($table);
226	218	}
	219	+ $installed_db_version = get_site_option('bitforms_db_version');
	220	+ if ($installed_db_version && version_compare('1.1', $installed_db_version, '>=')) {
	221	+ // if new db version is equal or higher than 1.1
	222	+ foreach ($table_schema_update as $table) {
	223	+ $wpdb->query($table);
	224	+ }
	225	+ }
	226	+ if ($installed_db_version && version_compare('1.3', $installed_db_version, '>=')) {
	227	+ // if new db version is equal or higher than 1.3
	228	+ $wpdb->query("ALTER TABLE `{$wpdb->prefix}bitforms_form_entries` CHANGE `user_ip` `user_ip` VARCHAR(255) NULL DEFAULT NULL");
	229	+ }
	230	+
	231	+ if ($installed_db_version && version_compare('2.0', $installed_db_version, '>=')) {
	232	+ $wpdb->query(
	233	+ "ALTER TABLE `{$wpdb->prefix}bitforms_success_messages`
	234	+ ADD `message_config` LONGTEXT NULL AFTER `message_content`"
	235	+ );
	236	+ $wpdb->query(
	237	+ "ALTER TABLE `{$wpdb->prefix}bitforms_form`
	238	+ ADD `builder_helper_state` LONGTEXT NULL AFTER `form_content`,
	239	+ ADD `atomic_class_map` LONGTEXT NULL AFTER `builder_helper_state`,
	240	+ ADD `generated_script_page_ids` LONGTEXT NULL AFTER `atomic_class_map`"
	241	+ );
	242	+ $wpdb->query(
	243	+ "ALTER TABLE `{$wpdb->prefix}bitforms_workflows`
	244	+ ADD `workflow_order` INT(11) DEFAULT NULL AFTER `workflow_condition`"
	245	+ );
	246	+ }
	247	+
	248	+ update_site_option(
	249	+ 'bitforms_db_version',
	250	+ $bitforms_db_version
	251	+ );
	252	+ }
227	253	}