From cdc4c8a219079cbef7c448fecc05469d21906457 Mon Sep 17 00:00:00 2001
From: Chuck Scott <cscott@gaslightmedia.com>
Date: Tue, 8 Mar 2016 13:33:29 -0500
Subject: [PATCH] Added old_member_id to members table.

---
 classes/data/dataMembers.php                           |  8 ++++++++
 glm-member-db.php                                      |  2 +-
 models/admin/management/import.php                     |  6 ++++--
 ..._database_V1.1.0.sql => create_database_V1.1.1.sql} |  1 +
 setup/databaseScripts/dbVersions.php                   |  3 ++-
 setup/databaseScripts/update_database_V1.1.1.sql       | 10 ++++++++++
 6 files changed, 26 insertions(+), 4 deletions(-)
 rename setup/databaseScripts/{create_database_V1.1.0.sql => create_database_V1.1.1.sql} (99%)
 create mode 100644 setup/databaseScripts/update_database_V1.1.1.sql

diff --git a/classes/data/dataMembers.php b/classes/data/dataMembers.php
index 6a73c1d6..ab547838 100644
--- a/classes/data/dataMembers.php
+++ b/classes/data/dataMembers.php
@@ -119,6 +119,14 @@ class GlmDataMembers extends GlmDataAbstract {
                 'use' => 'a'
             ),
 
+            // Old Member ID from Imported Database
+            'old_member_id' => array (
+                'field' => 'old_member_id',
+                'type' => 'integer',
+                'view_only' => true,
+                'use' => 'a'
+            ),
+
             // Status
             'access' => array (
                 'field' => 'access',
diff --git a/glm-member-db.php b/glm-member-db.php
index bf208495..3cdcd790 100644
--- a/glm-member-db.php
+++ b/glm-member-db.php
@@ -39,7 +39,7 @@
  */
 
 define('GLM_MEMBERS_PLUGIN_VERSION', '1.0.58');
-define('GLM_MEMBERS_PLUGIN_DB_VERSION', '1.1.0');
+define('GLM_MEMBERS_PLUGIN_DB_VERSION', '1.1.1');
 
 // Check if plugin version is not current in WordPress option and if needed updated it
 if (GLM_MEMBERS_PLUGIN_VERSION != get_option('glmMembersDatabasePluginVersion')) {
diff --git a/models/admin/management/import.php b/models/admin/management/import.php
index e3f65069..919543b5 100644
--- a/models/admin/management/import.php
+++ b/models/admin/management/import.php
@@ -902,13 +902,15 @@ class GlmMembersAdmin_management_import
                                         'created' => date('Y-m-d'),
                                         'name' => $membName,
                                         'member_slug' => sanitize_title($val['member_name']),
+                                        'old_member_id' => $val('member_id')
                                 ),
                                 array(
                                         '%d',
                                         '%d',
                                         '%s',
                                         '%s',
-                                        '%s'
+                                        '%s',
+                                        '%d'
                                 )
                         );
                         $membID = $this->wpdb->insert_id;
@@ -960,7 +962,7 @@ class GlmMembersAdmin_management_import
                                         'logo' => '',
                                         'cc_type' => $ccBits,
                                         'notes' => '',
-                                        'create_time' => $val['create_date'],
+                                        'create_time' => $val['create_date'],updateEntry
                                         'modify_time' => $val['last_update']
                                 ),
                                 array(
diff --git a/setup/databaseScripts/create_database_V1.1.0.sql b/setup/databaseScripts/create_database_V1.1.1.sql
similarity index 99%
rename from setup/databaseScripts/create_database_V1.1.0.sql
rename to setup/databaseScripts/create_database_V1.1.1.sql
index 0ecf511b..a47fc1b7 100644
--- a/setup/databaseScripts/create_database_V1.1.0.sql
+++ b/setup/databaseScripts/create_database_V1.1.1.sql
@@ -154,6 +154,7 @@ CREATE TABLE {prefix}members (
   name TINYTEXT NULL,                       -- Member name
   member_slug TINYTEXT NULL,                -- Member name slug for canonical URLs (lowercase, "-" for spaces, no punctuation)
   notes TEXT NULL,                          -- General notes - Not displayed in front-end
+  old_member_id INT NULL,                   -- Old member ID if imported from old database
   PRIMARY KEY (id),
   INDEX(name(20)),
   INDEX(member_slug(20)),
diff --git a/setup/databaseScripts/dbVersions.php b/setup/databaseScripts/dbVersions.php
index 81b61970..5c9e5f50 100644
--- a/setup/databaseScripts/dbVersions.php
+++ b/setup/databaseScripts/dbVersions.php
@@ -28,7 +28,8 @@ $glmMembersDbVersions = array(
     '1.0.28' => array('version' => '1.0.28', 'tables' => 26),
     '1.0.30' => array('version' => '1.0.30', 'tables' => 26),
     '1.0.43' => array('version' => '1.0.43', 'tables' => 26),
-    '1.1.0' => array('version' => '1.1.0', 'tables' => 13)
+    '1.1.0' => array('version' => '1.1.0', 'tables' => 13),
+    '1.1.1' => array('version' => '1.1.1', 'tables' => 13)
 );
 
 
diff --git a/setup/databaseScripts/update_database_V1.1.1.sql b/setup/databaseScripts/update_database_V1.1.1.sql
new file mode 100644
index 00000000..6d397416
--- /dev/null
+++ b/setup/databaseScripts/update_database_V1.1.1.sql
@@ -0,0 +1,10 @@
+-- Gaslight Media Members Database 
+-- File Created: 12/09/14 15:27:15
+-- Database Version: 1.0.28
+-- 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 dashses
+
+ALTER TABLE {prefix}members ADD COLUMN old_member_id INTEGER;
+
-- 
2.17.1