adding entity id and uid for group id to the database tables and the data class

adding new columns for entity id and uid for the data abstract and the database tables

diff --git a/classes/data/dataCustomFields.php b/classes/data/dataCustomFields.php
index b860f62..d6cc38b 100644 (file)
--- a/classes/data/dataCustomFields.php
+++ b/classes/data/dataCustomFields.php
@@ -129,7 +129,20 @@ class GlmDataFieldsCustomFields extends GlmDataAbstract
                 'required' => true,
                 'use'      => 'a'
             ),
-
+            // Entity ID (event, member, package)
+            'entity_id' => array (
+                'field'     => 'entity_id',
+                'type'      => 'integer',
+                'view_only' => false,
+                'use'       => 'a'
+            ),
+            // group id
+            'uid' => array (
+                'field'     => 'uid',
+                'type'      => 'integer',
+                'view_only' => false,
+                'use'       => 'a'
+            ),
             // Category ID
             'field_type' => array(
                 'field'    => 'field_type',

diff --git a/classes/data/dataCustomFieldsData.php b/classes/data/dataCustomFieldsData.php
index c7a7148..0bcbd3e 100644 (file)
--- a/classes/data/dataCustomFieldsData.php
+++ b/classes/data/dataCustomFieldsData.php
@@ -121,7 +121,13 @@ class GlmDataFieldsCustomFieldsData extends GlmDataAbstract
                 'view_only' => true,
                 'use'       => 'a'
             ),
-
+            // Entity ID (event, member, package)
+            'entity_id' => array (
+                'field'     => 'entity_id',
+                'type'      => 'integer',
+                'view_only' => false,
+                'use'       => 'a'
+            ),
             // Event ID
             'field_id' => array(
                 'field'    => 'field_id',

diff --git a/index.php b/index.php
index 5d83803..b6da06a 100644 (file)
--- 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.4');
+define('GLM_MEMBERS_FIELDS_PLUGIN_DB_VERSION', '0.0.5');
 
 // 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.4.sql b/setup/databaseScripts/create_database_V0.0.4.sql
deleted file mode 100644 (file)
index cdb4b53..0000000
--- a/setup/databaseScripts/create_database_V0.0.4.sql
+++ /dev/null
@@ -1,38 +0,0 @@
--- Gaslight Media Members Database - Fields Add-On
--- File Created: 2017-03-27
--- Database Version: 0.0.4
--- Database Creation Script
---
--- This file is called to create a new set of tables for this
--- add-on for the most recent database version for this add-on.
---
--- There should only be one such file in this directory
---
--- To permit each query below to be executed separately,
--- all queries must be separated by a line with four dashes
-
-
--- Field Setup Table
-CREATE TABLE {prefix}custom_fields (
-  id INT NOT NULL AUTO_INCREMENT,
-  field_name TINYTEXT NOT NULL DEFAULT '',      -- Field Name
-  field_type TINYTEXT NOT NULL DEFAULT '',      -- Field Type
-  field_order SMALLINT NOT NULL DEFAULT 0,      -- Order for Field
-  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 arequired.
-  PRIMARY KEY (id),
-  INDEX(field_name(20))
-);
-
-----
-
--- Data Table
-CREATE TABLE {prefix}custom_field_data (
-  id INT NOT NULL AUTO_INCREMENT,
-  field_id INT NOT NULL DEFAULT 0,              -- Field Id
-  ref_dest INT NOT NULL DEFAULT 0,              -- Member Info Id
-  field_data TEXT NOT NULL DEFAULT '',          -- Data for the field
-  PRIMARY KEY (id),
-  INDEX(field_id),
-  INDEX(ref_dest)
-);

diff --git a/setup/databaseScripts/create_database_V0.0.5.sql b/setup/databaseScripts/create_database_V0.0.5.sql
new file mode 100644 (file)
index 0000000..976ec62
--- /dev/null
+++ b/setup/databaseScripts/create_database_V0.0.5.sql
@@ -0,0 +1,41 @@
+-- Gaslight Media Members Database - Fields Add-On
+-- File Created: 2017-03-27
+-- Database Version: 0.0.5
+-- Database Creation Script
+--
+-- This file is called to create a new set of tables for this
+-- add-on for the most recent database version for this add-on.
+--
+-- There should only be one such file in this directory
+--
+-- To permit each query below to be executed separately,
+-- all queries must be separated by a line with four dashes
+
+
+-- Field Setup Table
+CREATE TABLE {prefix}custom_fields (
+  id INT NOT NULL AUTO_INCREMENT,
+  field_name TINYTEXT NOT NULL DEFAULT '',      -- Field Name
+  field_type TINYTEXT NOT NULL DEFAULT '',      -- Field Type
+  field_order SMALLINT NOT NULL DEFAULT 0,      -- Order for Field
+  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 NOT NULL,                       -- id for the specific field associated with an entity
+  PRIMARY KEY (id),
+  INDEX(field_name(20))
+);
+
+----
+
+-- Data Table
+CREATE TABLE {prefix}custom_field_data (
+  id INT NOT NULL AUTO_INCREMENT,
+  field_id INT NOT NULL DEFAULT 0,              -- Field Id
+  ref_dest INT NOT NULL DEFAULT 0,              -- Member Info Id
+  field_data TEXT NOT NULL DEFAULT '',          -- Data for the field
+  entity_id INT NOT NULL,                       -- id for the specific field associated with an entity
+  PRIMARY KEY (id),
+  INDEX(field_id),
+  INDEX(ref_dest)
+);

diff --git a/setup/databaseScripts/dbVersions.php b/setup/databaseScripts/dbVersions.php
index dc0810e..e69523e 100644 (file)
--- a/setup/databaseScripts/dbVersions.php
+++ b/setup/databaseScripts/dbVersions.php
@@ -18,5 +18,6 @@ $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'),
 );
 

diff --git a/setup/databaseScripts/update_database_V0.0.5.sql b/setup/databaseScripts/update_database_V0.0.5.sql
new file mode 100644 (file)
index 0000000..749ad8e
--- /dev/null
+++ b/setup/databaseScripts/update_database_V0.0.5.sql
@@ -0,0 +1,17 @@
+-- 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