MB-67993

Merge remote-tracking branch 'couchbase/trinity' into HEAD

Change-Id: I43bf826f1f933e8952c1ba73f5b1c5ae20c4ccab

Author: ebenhaber

query-ui/angular-services/qw.query.workbench.service.js

@@ -1654,11 +1654,12 @@ function getQwQueryService(
 
     //
     // run the explain version of the query, if appropriate
+    // we can't explain DDL statements, transactions, prepared statements, or explain or advise statements
     //
 
-    if (!queryIsExplain && !queryIsTransaction && !queryIsAdvise &&
-      (explainOnly || (qwConstantsService.autoExplain && !queryIsPrepare))) {
+    const queryIsExplainable = /^\s*(select|merge|update|delete|with)/gi.test(queryText);
 
+    if (queryIsExplainable && (explainOnly || qwConstantsService.autoExplain)) {
       var explain_request = buildQueryRequest("explain " + queryText, false, qwQueryService.options, null, null, newResult);
       if (!explain_request) {
         newResult.result = '{"status": "query failed"}';