From 171f4bf376a2218c8ff391073a74b0a617d0bc82 Mon Sep 17 00:00:00 2001
From: Petr Duda <petrduda@seznam.cz>
Date: Sat, 12 Sep 2020 00:17:54 +0200
Subject: [PATCH] Fix #16342 Alias in multi-table query

Signed-off-by: Petr Duda <petrduda@seznam.cz>
---
 js/database/multi_table_query.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/database/multi_table_query.js b/js/database/multi_table_query.js
index 34b793c5b5..16936af6a9 100644
--- a/js/database/multi_table_query.js
+++ b/js/database/multi_table_query.js
@@ -91,7 +91,7 @@ AJAX.registerOnload('database/multi_table_query.js', function () {
             query += '`' + Functions.escapeBacktick(columns[0][1]) + '`';
         }
         if (columns[0][2] !== '') {
-            query += ' AS ' + columns[0][2];
+            query += ' AS `' + Functions.escapeBacktick(columns[0][2]) + '`';
         }
         for (var i = 1; i < columns.length; i++) {
             query += ', `' + Functions.escapeBacktick(columns[i][0]) + '`.';
@@ -101,7 +101,7 @@ AJAX.registerOnload('database/multi_table_query.js', function () {
                 query += '`' + Functions.escapeBacktick(columns[i][1]) + '`';
             }
             if (columns[i][2] !== '') {
-                query += ' AS `' + Functions.escapeBacktick(columns[0][2]) + '`';
+                query += ' AS `' + Functions.escapeBacktick(columns[i][2]) + '`';
             }
         }
         query += '\nFROM ';