Skip to content

Commit c7acd17

Browse files
committed
Fix showing connection errors
1 parent 27987e4 commit c7acd17

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

src/datasource.test.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ describe('Trino datasource', () => {
5454

5555
const ds = new DataSource({ name: '', id: 0, jsonData: {} } as any);
5656
const result = await ds.testDatasource();
57-
expect(result.status).toEqual(400);
58-
expect(result.message).toEqual('Query error: 400 Bad Request');
57+
expect(result.status).toEqual("error");
58+
expect(result.message).toEqual('Query error: Bad Request');
5959
});
6060
});
6161
});

src/datasource.ts

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { DataSourceInstanceSettings, ScopedVars } from '@grafana/data';
2-
import { DataSourceWithBackend, getBackendSrv, getTemplateSrv, toDataQueryError } from '@grafana/runtime';
2+
import { DataSourceWithBackend, getBackendSrv, getTemplateSrv } from '@grafana/runtime';
33
import { TrinoDataSourceOptions, TrinoQuery } from './types';
44
import { TrinoDataVariableSupport } from './variable';
55
import { lastValueFrom, of } from 'rxjs';
@@ -40,7 +40,10 @@ export class DataSource extends DataSourceWithBackend<TrinoQuery, TrinoDataSourc
4040
.pipe(
4141
mapTo({ status: 'success', message: 'Database Connection OK' }),
4242
catchError((err) => {
43-
return of(toDataQueryError(err));
43+
return of({
44+
status: 'error',
45+
message: err.error ? err.error : (err.statusText ? ("Query error: " + err.statusText) : "Error connecting to Trino"),
46+
});
4447
})
4548
)
4649
);

0 commit comments

Comments
 (0)