This is an automated email from the ASF dual-hosted git repository. volodymyr pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/drill.git
commit b39bc2bec9e69a467ff749a25f04e39995193648 Author: Volodymyr Vysotskyi <[email protected]> AuthorDate: Wed Mar 4 15:01:32 2020 +0200 DRILL-7623: Link error is displayed at the log content page on Web UI closes #2011 --- exec/java-exec/src/main/resources/ace.mode-sql.template.js | 7 ++++--- exec/java-exec/src/main/resources/rest/generic.ftl | 2 +- exec/java-exec/src/main/resources/rest/query/result.ftl | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/exec/java-exec/src/main/resources/ace.mode-sql.template.js b/exec/java-exec/src/main/resources/ace.mode-sql.template.js index 057d8df..2020d49 100644 --- a/exec/java-exec/src/main/resources/ace.mode-sql.template.js +++ b/exec/java-exec/src/main/resources/ace.mode-sql.template.js @@ -15,17 +15,18 @@ var SqlHighlightRules = function() { //Covered: https://drill.apache.org/docs/supported-sql-commands/ var keywords = ( "select|insert|update|delete|from|where|and|or|group|by|order|limit|offset|having|as|case|" + - "when|else|end|type|left|right|join|on|outer|desc|asc|union|create|table|key|if|lateral|apply|unnest|" + + "when|else|end|type|left|right|cross|join|on|outer|desc|asc|union|create|table|key|if|lateral|apply|unnest|" + "not|default|null|inner|database|drop|" + "flatten|kvgen|columns|" + "set|reset|alter|session|system|" + "temporary|function|using|jar|between|distinct|" + "partition|view|schema|files|" + "explain|plan|with|without|implementation|" + - "show|describe|use" + "show|describe|use|" + + "analyze|refresh|metadata|none|level|compute|estimate|statistics|sample|percent|exists" ); //Confirmed to be UnSupported as of Drill-1.12.0 - /* cross|natural|primary|foreign|references|grant */ + /* natural|primary|foreign|references|grant */ var builtinConstants = ( "true|false" diff --git a/exec/java-exec/src/main/resources/rest/generic.ftl b/exec/java-exec/src/main/resources/rest/generic.ftl index 5b2dc45..95b13e8 100644 --- a/exec/java-exec/src/main/resources/rest/generic.ftl +++ b/exec/java-exec/src/main/resources/rest/generic.ftl @@ -35,7 +35,7 @@ <link href="/static/css/bootstrap.min.css" rel="stylesheet"> - <script type="text/javascript" language="javascript" src="../static/js/jquery-3.2.1.min.js"></script> + <script type="text/javascript" language="javascript" src="/static/js/jquery-3.2.1.min.js"></script> <script src="/static/js/bootstrap.min.js"></script> <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries --> diff --git a/exec/java-exec/src/main/resources/rest/query/result.ftl b/exec/java-exec/src/main/resources/rest/query/result.ftl index 0b9d696..f13113c 100644 --- a/exec/java-exec/src/main/resources/rest/query/result.ftl +++ b/exec/java-exec/src/main/resources/rest/query/result.ftl @@ -19,8 +19,8 @@ --> <#include "*/generic.ftl"> <#macro page_head> - <script type="text/javascript" language="javascript" src="../static/js/jquery.dataTables-1.10.0.min.js"> </script> - <script type="text/javascript" language="javascript" src="../static/js/dataTables.colVis-1.1.0.min.js"></script> + <script type="text/javascript" language="javascript" src="/static/js/jquery.dataTables-1.10.0.min.js"> </script> + <script type="text/javascript" language="javascript" src="/static/js/dataTables.colVis-1.1.0.min.js"></script> <link href="/static/css/dataTables.colVis-1.1.0.min.css" rel="stylesheet"> <link href="/static/css/dataTables.jqueryui.css" rel="stylesheet"> <link href="/static/css/jquery-ui-1.10.3.min.css" rel="stylesheet">
