Optionally require mdm, as well

MSP-11412

Author: mbuck-r7

lib/metasploit/framework/common_engine.rb

@@ -10,8 +10,7 @@
 
 require 'metasploit/model/engine'
 require 'metasploit/concern/engine'
-require 'metasploit_data_models/engine'
-Metasploit::Framework::Require.optionally_require_metasploit_credential_engine
+Metasploit::Framework::Require.optionally_require_metasploit_db_gems
 
 # `Rails::Engine` behavior common to both {Metasploit::Framework::Application} and {Metasploit::Framework::Engine}.
 module Metasploit::Framework::CommonEngine

lib/metasploit/framework/require.rb

@@ -72,16 +72,20 @@ def self.optionally_include_metasploit_credential_creation(including_module)
         end
       end
 
-      # Tries to `require 'metasploit/credential/engine'`.
+      # Tries to require gems necessary for using a database with the framework.
       #
       # @example
-      #   Metasploit::Framework::Require.optionally_require_metasploit_credential_engine
+      #   Metasploit::Framework::Require.optionally_require_metasploit_db_gems
       #
       # @return [void]
-      def self.optionally_require_metasploit_credential_engine
+      def self.optionally_require_metasploit_db_gems
         optionally(
           'metasploit/credential/engine',
-          "metasploit-credential not in the bundle",
+          'metasploit-credential not in the bundle',
+        )
+        optionally(
+          'metasploit_data_models/engine',
+          'metaspoit_data_models not in the bundle'
         )
       end