Replace waiting column with wait_event_type and wait_event

The pg_stat_activity view changed in PG 9.6 Fixes ManageIQ#13200
carbonin · Feb 19, 2019 · b93ef85 · b93ef85
1 parent 25f2e3d
commit b93ef85
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/lib/extensions/ar_adapter/ar_dba.rb b/lib/extensions/ar_adapter/ar_dba.rb
@@ -24,7 +24,8 @@ def client_connections
                   SELECT client_addr   AS client_address
                        , datname       AS database
                        , pid           AS spid
-                       , waiting       AS is_waiting
+                       , wait_event_type
+                       , wait_event
                        , query
                     FROM pg_stat_activity
                    ORDER BY 1, 2

diff --git a/spec/models/vmdb_database_spec.rb b/spec/models/vmdb_database_spec.rb
@@ -89,7 +89,7 @@
       connections = described_class.report_client_connections
       expect(connections).to be_kind_of(Array)
 
-      expected_keys = ["client_address", "database", "spid", "is_waiting", "query"]
+      expected_keys = ["client_address", "database", "spid", "wait_event_type", "wait_event", "query"]
       expect(connections.first.keys).to match_array(expected_keys)
 
       expect(connections.first['spid']).to be_kind_of(Integer)