diff --git a/src/datasource-zabbix/specs/dbConnector.test.js b/src/datasource-zabbix/specs/dbConnector.test.js index cca08f1..b41276c 100644 --- a/src/datasource-zabbix/specs/dbConnector.test.js +++ b/src/datasource-zabbix/specs/dbConnector.test.js @@ -15,7 +15,7 @@ describe('DBConnector', () => { }; }); - it('should load datasource by name by default', () => { + it('should try to load datasource by name first', () => { ctx.options = { datasourceName: 'bar' }; @@ -35,13 +35,13 @@ describe('DBConnector', () => { it('should throw error if no name and id specified', () => { ctx.options = {}; const dbConnector = new DBConnector(ctx.options, datasourceSrv); - return expect(dbConnector.loadDBDataSource()).rejects.toBe('SQL Data Source name should be specified'); + return expect(dbConnector.loadDBDataSource()).rejects.toBe('Data Source name should be specified'); }); it('should throw error if datasource with given id is not found', () => { ctx.options.datasourceId = 45; const dbConnector = new DBConnector(ctx.options, datasourceSrv); - return expect(dbConnector.loadDBDataSource()).rejects.toBe('SQL Data Source with ID 45 not found'); + return expect(dbConnector.loadDBDataSource()).rejects.toBe('Data Source with ID 45 not found'); }); }); }); diff --git a/src/datasource-zabbix/zabbix/connectors/sql/sqlConnector.js b/src/datasource-zabbix/zabbix/connectors/sql/sqlConnector.js index 575f72d..7c03e4e 100644 --- a/src/datasource-zabbix/zabbix/connectors/sql/sqlConnector.js +++ b/src/datasource-zabbix/zabbix/connectors/sql/sqlConnector.js @@ -113,7 +113,6 @@ export class SQLConnector extends DBConnector { } } - function compactSQLQuery(query) { return query.replace(/\s+/g, ' '); }