Remove unused database table column (moddb.Users.parent_user_id)

bin/xdmod-upgrade

@@ -25,7 +25,7 @@ ini_set('memory_limit', -1);
  * @var array
  */
 $supportedUpgrades = array(
-    '6.0.0' => '6.5.0',
+    '6.5.0' => '6.6.0',
 );
 
 /**

classes/OpenXdmod/Migration/Version650To660/ConfigFilesMigration.php

@@ -0,0 +1,26 @@
+<?php
+/**
+ * @author Jeffrey T. Palmer <jtpalmer@buffalo.edu>
+ */
+
+namespace OpenXdmod\Migration\Version650To660;
+
+use OpenXdmod\Migration\ConfigFilesMigration as AbstractConfigFilesMigration;
+
+/**
+ * Update config files from version 6.5.0 to 6.6.0.
+ */
+class ConfigFilesMigration extends AbstractConfigFilesMigration
+{
+    /**
+     * Execute the migration.
+     */
+    public function execute()
+    {
+        // Make sure all the config files that will be changed are writable.
+        $this->assertPortalSettingsIsWritable();
+
+        // Set new options in portal_settings.ini.
+        $this->writePortalSettingsFile();
+    }
+}

classes/OpenXdmod/Migration/Version650To660/DatabasesMigration.php

@@ -0,0 +1,13 @@
+<?php
+/**
+ * @author Jeffrey T. Palmer <jtpalmer@buffalo.edu>
+ */
+
+namespace OpenXdmod\Migration\Version650To660;
+
+/**
+ * Migrate databases from version 6.5.0 to 6.6.0.
+ */
+class DatabasesMigration extends \OpenXdmod\Migration\DatabasesMigration
+{
+}

configuration/portal_settings.ini

@@ -6,7 +6,7 @@ contact_page_recipient = ""
 tech_support_recipient = ""
 
 ; The version number is updated during the upgrade process.
-version = "6.5.0"
+version = "6.6.0"
 
 debug_mode = "off"
 debug_recipient = ""

db/data/moddb.sql

@@ -37,4 +37,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
-INSERT INTO `schema_version_history` VALUES ('moddb', '6.0.0', NOW(), 'created', 'N/A');
+INSERT INTO `schema_version_history` VALUES ('moddb', '6.6.0', NOW(), 'created', 'N/A');

db/migrations/6.5.0-6.6.0/moddb.sql

@@ -0,0 +1,3 @@
+ALTER TABLE `Users` DROP COLUMN `parent_user_id`;
+
+INSERT INTO `schema_version_history` VALUES ('moddb', '6.6.0', NOW(), 'upgraded', 'N/A');

db/schema/moddb.sql

@@ -272,7 +272,6 @@ CREATE TABLE `Users` (
   `field_of_science` int(11) DEFAULT NULL,
   `token` varchar(32) DEFAULT NULL,
   `token_expiration` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
-  `parent_user_id` int(11) NOT NULL,
   `user_type` int(11) NOT NULL,
   PRIMARY KEY (`id`),
   KEY `person_id_idx` (`person_id`)

docs/simpleSAMLphp.md

@@ -81,7 +81,6 @@ $config = array(
         'personId' => 'person_id',
         'orgId' => 'organization_id',
         'fieldOfScience' => 'field_of_science',
-        'parentId' => 'parent_user_id',
         'itname' => 'username'
       )
     )

open_xdmod/modules/xdmod/build.json

@@ -1,6 +1,6 @@
 {
     "name": "xdmod",
-    "version": "6.5.0",
+    "version": "6.6.0",
     "release": "1.0",
     "files": {
         "include_paths": [

package.json

@@ -1,6 +1,6 @@
 {
     "name": "xdmod",
-    "version": "6.5.0",
+    "version": "6.6.0",
     "description": "An open framework for collecting and analyzing HPC metrics.",
     "dependencies": {},
     "devDependencies": {