Commit b4275067 authored by Eric Windham's avatar Eric Windham

Revert "Merge branch 'issue#3645' into 'develop'"

This reverts merge request !3634
parent c3a3b7d7
......@@ -140,9 +140,6 @@ _**nf3_actions**_ (Table of individual Actions)
* active (Whether or not the Action is active)
* tinyint(1)
* DEFAULT 1
* label (The label of the action)
* longtext
* COLLATE DATABASE_DEFAULT
* parent_id (The Form ID this Action is associated with)
* int(11)
* NOT NULL
......@@ -173,12 +170,6 @@ _**nf3_action_meta**_ (Table of Settings associated with each Action)
* value (The value of the Setting)
* longtext
* COLLATE DATABASE_DEFAULT
* meta_key (A properly collated meta_key)
* longtext
* COLLATE DATABASE_DEFAULT
* meta_value (A properly collated meta_value)
* longtext
* COLLATE DATABASE_DEFAULT
### Objects
......@@ -651,21 +642,3 @@ ADDED:
* meta_value (The value of the Setting)
* longtext
* COLLATE utf8mb4_general_ci (fallback to utf8_general_ci)
## Version 1.2
_**nf3_action**_ (Updated the actions table to have a column for the label)
ADDED:
* label (The label of the action)
* longtext
* COLLATE DATABASE_DEFAULT
_**nf3_action_meta**_ (Updated to include meta key and meta value)
ADDED:
* meta_key (A properly collated meta_key)
* longtext
* COLLATE DATABASE_DEFAULT
* meta_value (A properly collated meta_value)
* longtext
* COLLATE DATABASE_DEFAULT
......@@ -17,31 +17,10 @@ class NF_Database_Migrations_ActionMeta extends NF_Abstracts_Migration
`parent_id` int NOT NULL,
`key` longtext NOT NULL,
`value` longtext,
`meta_key` longtext,
`meta_value` longtext,
UNIQUE KEY (`id`)
) {$this->charset_collate()};";
dbDelta( $query );
}
/*
* Do Stage Two
* This method runs as a part of the stage two step processor
* it will add tables that we need that are missing currently.
*
* @since 3.3.12
* @return void
*/
public function do_stage_two()
{
global $wpdb;
$query = "ALTER TABLE {$this->table_name()}
ADD `meta_key` longtext {$this->collate()},
ADD `meta_value` longtext {$this->collate()}";
$wpdb->query( $query );
}
}
......@@ -21,30 +21,10 @@ class NF_Database_Migrations_Actions extends NF_Abstracts_Migration
`parent_id` int NOT NULL,
`created_at` TIMESTAMP,
`updated_at` DATETIME,
`label` longtext,
UNIQUE KEY (`id`)
) {$this->charset_collate()};";
dbDelta( $query );
}
/*
* Do Stage Two
* This method runs as a part of the stage two step processor
* it will add tables that we need that are missing currently.
*
* @since 3.3.12
* @return void
*/
public function do_stage_two()
{
global $wpdb;
$query = "ALTER TABLE {$this->table_name()}
ADD `label` longtext {$this->collate()}";
$wpdb->query( $query );
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment