Merge pull request #1360 from ryanrath/remove_roles_user_roles

Finally removing Roles / UserRole tables
ubccr · Jun 29, 2020 · 98489a4 · 98489a4
2 parents 58a8718 + 209fe05
commit 98489a4
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 65 deletions.
diff --git a/configuration/etl/etl.d/xdb.json b/configuration/etl/etl.d/xdb.json
@@ -45,7 +45,6 @@
                 "xdb/report-templates.json",
                 "xdb/reports.json",
                 "xdb/restx509.json",
-                "xdb/roles.json",
                 "xdb/schema-version-history.json",
                 "xdb/session-manager.json",
                 "xdb/users.json",
@@ -91,18 +90,6 @@
                 }
             }
         },
-        {
-            "name": "roles",
-            "definition_file": "xdb/roles.json",
-            "description": "roles + data",
-            "endpoints": {
-                "source": {
-                    "type": "jsonfile",
-                    "name": "roles",
-                    "path": "xdb/roles.json"
-                }
-            }
-        },
         {
             "name": "schema-version",
             "definition_file": "xdb/schema-version-history.json",

diff --git a/configuration/etl/etl.d/xdmod-migration-8_5_1-9_0_0.json b/configuration/etl/etl.d/xdmod-migration-8_5_1-9_0_0.json
@@ -488,6 +488,24 @@
                     "schema": "modw"
                 }
             }
+        },
+        {
+            "name": "remove-role-tables",
+            "description": "Remove the Role related tables as they are no longer used.",
+            "namespace": "ETL\\Maintenance",
+            "class": "ExecuteSql",
+            "options_class": "MaintenanceOptions",
+            "sql_file_list": [
+                "migrations/8.5.1-9.0.0/role-table-cleanup.sql"
+            ],
+            "endpoints": {
+                "destination": {
+                    "type": "mysql",
+                    "name": "Logger Database",
+                    "config": "database",
+                    "schema": "moddb"
+                }
+            }
         }
     ]
 }
diff --git a/configuration/etl/etl_action_defs.d/xdb/roles.json b/configuration/etl/etl_action_defs.d/xdb/roles.json
diff --git a/configuration/etl/etl_data.d/xdb/roles.json b/configuration/etl/etl_data.d/xdb/roles.json
diff --git a/configuration/etl/etl_sql.d/migrations/8.5.1-9.0.0/role-table-cleanup.sql b/configuration/etl/etl_sql.d/migrations/8.5.1-9.0.0/role-table-cleanup.sql
@@ -0,0 +1,4 @@
+-- These tables are no longer user and as such are being removed.
+DROP TABLE IF EXISTS moddb.UserRoleParameters;
+DROP TABLE IF EXISTS moddb.UserRoles;
+DROP TABLE IF EXISTS moddb.Roles;
diff --git a/configuration/etl/etl_tables.d/xdb/roles.json b/configuration/etl/etl_tables.d/xdb/roles.json