Convert generic SQL mixin into a class

Author: sjanusz-r7

lib/msf/base/sessions/mssql.rb

@@ -2,10 +2,7 @@
 
 require 'rex/post/mssql'
 
-class Msf::Sessions::MSSQL
-
-  include Msf::Sessions::Scriptable
-  include Msf::Sessions::Sql
+class Msf::Sessions::MSSQL < Msf::Sessions::Sql
 
   # @return [String] The address MSSQL is running on
   attr_accessor :address

lib/msf/base/sessions/mysql.rb

@@ -2,10 +2,7 @@
 
 require 'rex/post/mysql'
 
-class Msf::Sessions::MySQL
-
-  include Msf::Sessions::Scriptable
-  include Msf::Sessions::Sql
+class Msf::Sessions::MySQL < Msf::Sessions::Sql
 
   # @param[Rex::IO::Stream] rstream
   # @param [Hash] opts

lib/msf/base/sessions/postgresql.rb

@@ -2,10 +2,7 @@
 
 require 'rex/post/postgresql'
 
-class Msf::Sessions::PostgreSQL
-
-  include Msf::Sessions::Scriptable
-  include Msf::Sessions::Sql
+class Msf::Sessions::PostgreSQL < Msf::Sessions::Sql
 
   # @param[Rex::IO::Stream] rstream
   # @param [Hash] opts

lib/msf/base/sessions/sql.rb

@@ -1,9 +1,10 @@
 # -*- coding: binary -*-
 
-module Msf::Sessions::Sql
+class Msf::Sessions::Sql
 
   # This interface supports basic interaction.
   include Msf::Session::Basic
+  include Msf::Sessions::Scriptable
 
   # @return console The interactive console
   attr_accessor :console