You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@druid.apache.org by gi...@apache.org on 2022/09/09 18:22:48 UTC
[druid] branch master updated: quote columns, datasources in auto complete if needed (#13060)
This is an automated email from the ASF dual-hosted git repository.
gian pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git
The following commit(s) were added to refs/heads/master by this push:
new 5cc5f7b60c quote columns, datasources in auto complete if needed (#13060)
5cc5f7b60c is described below
commit 5cc5f7b60c8d2591eb01d273cc37dc4dd18b99be
Author: Vadim Ogievetsky <va...@ogievetsky.com>
AuthorDate: Fri Sep 9 11:22:40 2022 -0700
quote columns, datasources in auto complete if needed (#13060)
---
web-console/src/views/query-view/query-input/query-input.tsx | 7 ++++---
.../workbench-view/flexible-query-input/flexible-query-input.tsx | 7 ++++---
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/web-console/src/views/query-view/query-input/query-input.tsx b/web-console/src/views/query-view/query-input/query-input.tsx
index d4fd3fe6ae..9f85c9de08 100644
--- a/web-console/src/views/query-view/query-input/query-input.tsx
+++ b/web-console/src/views/query-view/query-input/query-input.tsx
@@ -20,6 +20,7 @@ import { ResizeEntry } from '@blueprintjs/core';
import { ResizeSensor2 } from '@blueprintjs/popover2';
import type { Ace } from 'ace-builds';
import ace from 'ace-builds';
+import { SqlRef, SqlTableRef } from 'druid-query-toolkit';
import escape from 'lodash.escape';
import React from 'react';
import AceEditor from 'react-ace';
@@ -150,7 +151,7 @@ export class QueryInput extends React.PureComponent<QueryInputProps, QueryInputS
) {
const completions = ([] as any[]).concat(
uniq(columnMetadata.map(d => d.TABLE_SCHEMA)).map(v => ({
- value: v,
+ value: SqlTableRef.create(v).toString(),
score: 10,
meta: 'schema',
})),
@@ -159,7 +160,7 @@ export class QueryInput extends React.PureComponent<QueryInputProps, QueryInputS
.filter(d => (currentSchema ? d.TABLE_SCHEMA === currentSchema : true))
.map(d => d.TABLE_NAME),
).map(v => ({
- value: v,
+ value: SqlTableRef.create(v).toString(),
score: 49,
meta: 'datasource',
})),
@@ -172,7 +173,7 @@ export class QueryInput extends React.PureComponent<QueryInputProps, QueryInputS
)
.map(d => d.COLUMN_NAME),
).map(v => ({
- value: v,
+ value: SqlRef.column(v).toString(),
score: 50,
meta: 'column',
})),
diff --git a/web-console/src/views/workbench-view/flexible-query-input/flexible-query-input.tsx b/web-console/src/views/workbench-view/flexible-query-input/flexible-query-input.tsx
index c83865cdb1..1559e7981c 100644
--- a/web-console/src/views/workbench-view/flexible-query-input/flexible-query-input.tsx
+++ b/web-console/src/views/workbench-view/flexible-query-input/flexible-query-input.tsx
@@ -21,6 +21,7 @@ import { ResizeSensor2 } from '@blueprintjs/popover2';
import type { Ace } from 'ace-builds';
import ace from 'ace-builds';
import classNames from 'classnames';
+import { SqlRef, SqlTableRef } from 'druid-query-toolkit';
import escape from 'lodash.escape';
import React from 'react';
import AceEditor from 'react-ace';
@@ -163,7 +164,7 @@ export class FlexibleQueryInput extends React.PureComponent<
) {
const completions = ([] as any[]).concat(
uniq(columnMetadata.map(d => d.TABLE_SCHEMA)).map(v => ({
- value: v,
+ value: SqlTableRef.create(v).toString(),
score: 10,
meta: 'schema',
})),
@@ -172,7 +173,7 @@ export class FlexibleQueryInput extends React.PureComponent<
.filter(d => (currentSchema ? d.TABLE_SCHEMA === currentSchema : true))
.map(d => d.TABLE_NAME),
).map(v => ({
- value: v,
+ value: SqlTableRef.create(v).toString(),
score: 49,
meta: 'datasource',
})),
@@ -185,7 +186,7 @@ export class FlexibleQueryInput extends React.PureComponent<
)
.map(d => d.COLUMN_NAME),
).map(v => ({
- value: v,
+ value: SqlRef.column(v).toString(),
score: 50,
meta: 'column',
})),
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org