From 82849d043f091f6376dc840f9601d29d861ee57b Mon Sep 17 00:00:00 2001
From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Wed, 18 Oct 2017 16:09:17 -0400
Subject: [PATCH] rolling back previous database changes

fixing database update script errors, rolling back previous changes
---
 index.php                                       |  2 +-
 ...se_V0.0.6.sql => create_database_V0.0.4.sql} |  4 ++--
 setup/databaseScripts/dbVersions.php            |  2 --
 .../databaseScripts/update_database_V0.0.4.sql  | 12 ++++++++++++
 .../databaseScripts/update_database_V0.0.5.sql  | 17 -----------------
 .../databaseScripts/update_database_V0.0.6.sql  | 17 -----------------
 6 files changed, 15 insertions(+), 39 deletions(-)
 rename setup/databaseScripts/{create_database_V0.0.6.sql => create_database_V0.0.4.sql} (94%)
 delete mode 100644 setup/databaseScripts/update_database_V0.0.5.sql
 delete mode 100644 setup/databaseScripts/update_database_V0.0.6.sql

diff --git a/index.php b/index.php
index a83dedf..5d83803 100644
--- a/index.php
+++ b/index.php
@@ -38,7 +38,7 @@
  *  version from this plugin.
  */
 define('GLM_MEMBERS_FIELDS_PLUGIN_VERSION', '1.0.3');
-define('GLM_MEMBERS_FIELDS_PLUGIN_DB_VERSION', '0.0.6');
+define('GLM_MEMBERS_FIELDS_PLUGIN_DB_VERSION', '0.0.4');
 
 // This is the minimum version of the GLM Members DB plugin require for this plugin.
 define('GLM_MEMBERS_FIELDS_PLUGIN_MIN_MEMBERS_REQUIRED_VERSION', '2.8.0');
diff --git a/setup/databaseScripts/create_database_V0.0.6.sql b/setup/databaseScripts/create_database_V0.0.4.sql
similarity index 94%
rename from setup/databaseScripts/create_database_V0.0.6.sql
rename to setup/databaseScripts/create_database_V0.0.4.sql
index af8452b..75a0f58 100644
--- a/setup/databaseScripts/create_database_V0.0.6.sql
+++ b/setup/databaseScripts/create_database_V0.0.4.sql
@@ -1,6 +1,6 @@
 -- Gaslight Media Members Database - Fields Add-On
 -- File Created: 2017-03-27
--- Database Version: 0.0.5
+-- Database Version: 0.0.4
 -- Database Creation Script
 --
 -- This file is called to create a new set of tables for this
@@ -21,7 +21,7 @@ CREATE TABLE {prefix}custom_fields (
   admin_search BOOLEAN NOT NULL DEFAULT '0',    -- If the field is added to member list filters.
   required BOOLEAN NOT NULL DEFAULT '0',        -- If the field is required.
   uid INT NOT NULL,                             -- id for the series of custom fields associated with an entity
-  entity_id INT NULL,                           -- id for the specific field associated with an entity
+  entity_id INT NOT NULL DEFAULT '0',           -- id for the specific field associated with an entity
   PRIMARY KEY (id),
   INDEX(field_name(20))
 );
diff --git a/setup/databaseScripts/dbVersions.php b/setup/databaseScripts/dbVersions.php
index 297ac95..dc0810e 100644
--- a/setup/databaseScripts/dbVersions.php
+++ b/setup/databaseScripts/dbVersions.php
@@ -18,7 +18,5 @@ $glmMembersFieldsDbVersions = array(
     '0.0.2' => array('version' => '0.0.2', 'tables' => 2, 'date' => '04/14/2017'),
     '0.0.3' => array('version' => '0.0.3', 'tables' => 2, 'date' => '04/24/2017'),
     '0.0.4' => array('version' => '0.0.4', 'tables' => 2, 'date' => '10/18/2017'),
-    '0.0.5' => array('version' => '0.0.5', 'tables' => 2, 'date' => '10/18/2017'),
-    '0.0.6' => array('version' => '0.0.6', 'tables' => 2, 'date' => '10/18/2017'),
 );
 
diff --git a/setup/databaseScripts/update_database_V0.0.4.sql b/setup/databaseScripts/update_database_V0.0.4.sql
index c88a0eb..122845d 100644
--- a/setup/databaseScripts/update_database_V0.0.4.sql
+++ b/setup/databaseScripts/update_database_V0.0.4.sql
@@ -7,3 +7,15 @@
 -- all queries must be separated by a line with four dashes
 
 ALTER TABLE {prefix}custom_fields ADD COLUMN required BOOLEAN DEFAULT '0';
+
+----
+
+ALTER TABLE {prefix}custom_fields ADD COLUMN uid INT NOT NULL;
+
+----
+
+ALTER TABLE {prefix}custom_field_data ADD COLUMN entity_id INT NOT NULL;
+
+----
+
+ALTER TABLE {prefix}custom_fields ADD COLUMN entity_id INT NOT NULL DEFAULT '0';
diff --git a/setup/databaseScripts/update_database_V0.0.5.sql b/setup/databaseScripts/update_database_V0.0.5.sql
deleted file mode 100644
index 749ad8e..0000000
--- a/setup/databaseScripts/update_database_V0.0.5.sql
+++ /dev/null
@@ -1,17 +0,0 @@
--- Gaslit Media Members Database
--- File Created: 2017-04-14
--- Database Version: 0.0.5
--- Database Update From Previous Version Script
---
--- To permit each query below to be executed separately,
--- all queries must be separated by a line with four dashes
-
-ALTER TABLE {prefix}custom_fields ADD COLUMN uid INT;
-
-----
-
-ALTER TABLE {prefix}custom_field_data ADD COLUMN entity_id INT;
-
-----
-
-ALTER TABLE {prefix}custom_field_data ADD COLUMN uid INT;
\ No newline at end of file
diff --git a/setup/databaseScripts/update_database_V0.0.6.sql b/setup/databaseScripts/update_database_V0.0.6.sql
deleted file mode 100644
index 36b0adf..0000000
--- a/setup/databaseScripts/update_database_V0.0.6.sql
+++ /dev/null
@@ -1,17 +0,0 @@
--- Gaslit Media Members Database
--- File Created: 2017-04-14
--- Database Version: 0.0.6
--- Database Update From Previous Version Script
---
--- To permit each query below to be executed separately,
--- all queries must be separated by a line with four dashes
-
-ALTER TABLE {prefix}custom_fields ADD COLUMN uid INT NOT NULL;
-
-----
-
-ALTER TABLE {prefix}custom_field_data ADD COLUMN entity_id INT NOT NULL;
-
-----
-
-ALTER TABLE {prefix}custom_fields ADD COLUMN entity_id INT NULL;
\ No newline at end of file
-- 
2.17.1