IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove limitation in the query

Browse Source
This commit is contained in:
ismail simsek 2023-09-29 14:55:01 +02:00
parent 61b856c7dc
commit 8a347bc487
No known key found for this signature in database
GPG Key ID: 49C1495B93911633
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/app/features/plugins/sql/components/QueryEditor.tsx
View File

@ -15,6 +15,7 @@ import { VisualEditor } from './visual-query-builder/VisualEditor';
interface SqlQueryEditorProps extends QueryEditorProps<SqlDatasource, SQLQuery, SQLOptions> {
queryHeaderProps?: Pick<QueryHeaderProps, 'isPostgresInstance'>;
overrideQueryDefaults?: Partial<SQLQuery>;
}
export function SqlQueryEditor({
@ -24,6 +25,7 @@ export function SqlQueryEditor({
onRunQuery,
range,
queryHeaderProps,
overrideQueryDefaults,
}: SqlQueryEditorProps) {
const [isQueryRunnable, setIsQueryRunnable] = useState(true);
const db = datasource.getDB();
@ -38,7 +40,7 @@ export function SqlQueryEditor({
};
}, [datasource]);
const queryWithDefaults = applyQueryDefaults(query);
const queryWithDefaults = applyQueryDefaults(query, overrideQueryDefaults);
const [queryRowFilter, setQueryRowFilter] = useState<QueryRowFilter>({
filter: !!queryWithDefaults.sql?.whereString,
group: !!queryWithDefaults.sql?.groupBy?.[0]?.property.name,

4
public/app/features/plugins/sql/defaults.ts
View File

@ -3,7 +3,7 @@ import { EditorMode } from '@grafana/experimental';
import { QueryFormat, SQLQuery } from './types';
import { createFunctionField, setGroupByField } from './utils/sql.utils';
export function applyQueryDefaults(q?: SQLQuery): SQLQuery {
export function applyQueryDefaults(q?: SQLQuery, override: Partial<SQLQuery> = { sql: {} }): SQLQuery {
let editorMode = q?.editorMode || EditorMode.Builder;
// Switching to code editor if the query was created before visual query builder was introduced.
@ -17,10 +17,12 @@ export function applyQueryDefaults(q?: SQLQuery): SQLQuery {
format: q?.format !== undefined ? q.format : QueryFormat.Table,
rawSql: q?.rawSql || '',
editorMode,
...override,
sql: q?.sql ?? {
columns: [createFunctionField()],
groupBy: [setGroupByField()],
limit: 50,
...override?.sql,
},
};

1
public/app/plugins/datasource/influxdb/components/editor/query/fsql/FSQLEditor.tsx
View File

@ -90,6 +90,7 @@ class UnthemedSQLQueryEditor extends PureComponent<Props> {
query={this.transformQuery(query)}
onRunQuery={onRunSQLQuery}
onChange={onSQLChange}
overrideQueryDefaults={{ sql: { limit: undefined } }}
/>
<div className={cx('gf-form-inline', styles.editorActions)}>
<LinkButton