Add PostgreSQL current database to client params and prompt

lib/postgres/postgres-pr/connection.rb

@@ -60,7 +60,7 @@ def initialize(database, user, password=nil, uri = nil)
     uri ||= DEFAULT_URI
 
     @transaction_status = nil
-    @params = {}
+    @params = { 'username' => user, 'database' => database }
     establish_connection(uri)
 
     # Check if the password supplied is a Postgres-style md5 hash

lib/rex/post/postgresql/ui/console.rb

@@ -26,8 +26,8 @@ def initialize(session)
             self.session = session
             self.client = session.client
             prompt = "%undPostgreSQL @ #{self.client.conn.peerinfo}%clr"
-            history_manager = self.session.framework&.history_manager&.with_context(name: :postgresql)
-            super(prompt, '>', history_manager, self.session&.framework, :postgresql)
+            history_manager = Msf::Config.postgresql_session_history
+            super(prompt, '>', history_manager, nil, :postgresql)
 
             # Queued commands array
             self.commands = []
@@ -112,23 +112,20 @@ def log_error(msg)
           # @return [PostgreSQL::Client]
           attr_reader :client # :nodoc:
 
-          # TODO Should this belong elsewhere - it's required for prompt details
           # @return [String]
           attr_accessor :cwd
 
           def format_prompt(val)
-            # TODO: How can the currently selected DB/Table/Module impact the prompt?
-            super
+            cwd = client.params['database']
+            prompt = "%undPostgreSQL @ #{client.conn.peerinfo} (#{cwd})%clr  > "
+            substitute_colors(prompt, true)
           end
 
           protected
 
-          attr_writer :session # :nodoc:
-          attr_writer :client # :nodoc:
+          attr_writer :session, :client # :nodoc:
           attr_accessor :commands # :nodoc:
-
         end
-
       end
     end
   end