mirror of
https://github.com/turbot/steampipe.git
synced 2025-12-19 18:12:43 -05:00
07782a2b13
- JSON output format has changed to move the rows to under a `rows` property, with timing information under the `metadata` property - Update timing display to show rows returned and rows fetched, as well as adding verbose mode which lists all scans - Use enums for output mode and timing mode - timing is now either `on`, `off` or `verbose` - Bugfix: ensure error is returned from ExecuteSystemClientCall. Closes #4246
44 lines
1.2 KiB
Go
44 lines
1.2 KiB
Go
package db_common
|
|
|
|
import (
|
|
"log"
|
|
"time"
|
|
|
|
"github.com/jackc/pgx/v5/pgxpool"
|
|
)
|
|
|
|
// DatabaseSession wraps over the raw database connection
|
|
// the purpose is to be able
|
|
// - to store the current search path of the connection without having to make a database round-trip
|
|
// - To store the last scan_metadata id used on this connection
|
|
type DatabaseSession struct {
|
|
BackendPid uint32 `json:"backend_pid"`
|
|
SearchPath []string `json:"-"`
|
|
|
|
// this gets rewritten, since the database/sql gives back a new instance everytime
|
|
Connection *pgxpool.Conn `json:"-"`
|
|
}
|
|
|
|
func NewDBSession(backendPid uint32) *DatabaseSession {
|
|
return &DatabaseSession{
|
|
BackendPid: backendPid,
|
|
}
|
|
}
|
|
|
|
func (s *DatabaseSession) Close(waitForCleanup bool) {
|
|
if s.Connection != nil {
|
|
if waitForCleanup {
|
|
log.Printf("[TRACE] DatabaseSession.Close wait for connection cleanup")
|
|
select {
|
|
case <-time.After(5 * time.Second):
|
|
log.Printf("[TRACE] DatabaseSession.Close timed out waiting for connection cleanup")
|
|
case <-s.Connection.Conn().PgConn().CleanupDone():
|
|
log.Printf("[TRACE] DatabaseSession.Close connection cleanup complete")
|
|
}
|
|
}
|
|
s.Connection.Release()
|
|
}
|
|
s.Connection = nil
|
|
|
|
}
|