public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove sqlDatasourceDatabaseSelection feature toggle (#109391)

Browse Source 
* Remove `sqlDatasourceDatabaseSelection` feature toggle

* Update e2e tests
This commit is contained in:
Zoltán Bedi
2025-08-12 15:22:30 +02:00
committed by GitHub
parent 6c106a85ac
commit db0a1bc30f
14 changed files with 19 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/grafana-sql/src/datasource/SqlDatasource.ts
+4 -8
View File
@@ -35,8 +35,6 @@ import { MACRO_NAMES } from '../constants';
import { DB, SQLQuery, SQLOptions, SqlQueryModel, QueryFormat } from '../types';
import migrateAnnotation from '../utils/migration';
import { isSqlDatasourceDatabaseSelectionFeatureFlagEnabled } from './../components/QueryEditorFeatureFlag.utils';
export abstract class SqlDatasource extends DataSourceWithBackend<SQLQuery, SQLOptions> {
id: number;
responseParser: ResponseParser;
@@ -127,13 +125,11 @@ export abstract class SqlDatasource extends DataSourceWithBackend<SQLQuery, SQLO
query(request: DataQueryRequest<SQLQuery>): Observable<DataQueryResponse> {
// This logic reenables the previous SQL behavior regarding what databases are available for the user to query.
if (isSqlDatasourceDatabaseSelectionFeatureFlagEnabled()) {
const databaseIssue = this.checkForDatabaseIssue(request);
const databaseIssue = this.checkForDatabaseIssue(request);
if (!!databaseIssue) {
const error = new Error(databaseIssue);
return throwError(() => error);
}
if (!!databaseIssue) {
const error = new Error(databaseIssue);
return throwError(() => error);
}
request.targets.forEach((target) => {