hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '2.3' into develop

Browse Source
This commit is contained in:
Markus Mäkelä
2019-04-12 13:23:49 +03:00
parent 382d485c2e 4131f09c16
commit c643f9bc8d
31 changed files with 625 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
maxctrl/lib/classify.js
View File

@ -28,11 +28,13 @@ exports.handler = function (argv) {
return doRequest(host,
'maxscale/query_classifier/classify?sql=' + argv.statement,
(res) => {
var a = res.data.attributes.parameters.functions.map((f) => {
return f.name + ': (' + f.arguments.join(', ') + ')'
});
if (res.data.attributes.parameters.functions) {
var a = res.data.attributes.parameters.functions.map((f) => {
return f.name + ': (' + f.arguments.join(', ') + ')'
});
res.data.attributes.parameters.functions = a;
res.data.attributes.parameters.functions = a;
}
return formatResource(classify_fields, res.data)
})
@ -44,14 +46,6 @@ exports.builder = function(yargs) {
.epilog('Classify the statement using MaxScale and display the result. ' +
'The possible values for "Parse result", "Type mask" and "Operation" ' +
'can be looked up in ' +
'https://github.com/mariadb-corporation/MaxScale/blob/' +
'2.3/include/maxscale/query_classifier.h')
'https://github.com/mariadb-corporation/MaxScale/blob/2.3/include/maxscale/query_classifier.h')
.help()
.command('*', 'the default command', {}, function(argv) {
console.log("*");
maxctrl(argv, function(host) {
console.log(argv.statement);
return error('Unknown command. See output of `help stop` for a list of commands.')
})
})
}