From 5f3f48446cb0dceee963084a14d5f63a162a89f1 Mon Sep 17 00:00:00 2001 From: Aswani Prakash Date: Tue, 24 Apr 2018 10:26:01 +0530 Subject: [PATCH] #14049 issue fix Query builder doesn't work when the selected column is * Signed-off-by: Aswani Prakash --- js/db_multi_table_query.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/js/db_multi_table_query.js b/js/db_multi_table_query.js index da27b0a1c7..33b0b0fd68 100644 --- a/js/db_multi_table_query.js +++ b/js/db_multi_table_query.js @@ -73,12 +73,18 @@ AJAX.registerOnload('db_multi_table_query.js', function () { } query = 'SELECT '; - query += '`' + escapeBacktick(columns[0][0]) + '`.`' + escapeBacktick(columns[0][1]) + '`'; + if(columns[0][1] == '*') + query += '`' + escapeBacktick(columns[0][0]) + '`.' + escapeBacktick(columns[0][1]) + ''; + else + query += '`' + escapeBacktick(columns[0][0]) + '`.`' + escapeBacktick(columns[0][1]) + '`'; if (columns[0][2] !== '') { query += ' AS ' + columns[0][2]; } for (var i = 1; i < columns.length; i++) { - query += ', `' + escapeBacktick(columns[i][0]) + '`.`' + escapeBacktick(columns[i][1]) + '`'; + if(columns[i][1] == '*') + query += ', `' + escapeBacktick(columns[i][0]) + '`.' + escapeBacktick(columns[i][1]) + ''; + else + query += ', `' + escapeBacktick(columns[i][0]) + '`.`' + escapeBacktick(columns[i][1]) + '`'; if (columns[i][2] !== '') { query += ' AS `' + escapeBacktick(columns[0][2]) + '`'; }