From 4dbe68f626065a21fe6fa7af6167129a61239f06 Mon Sep 17 00:00:00 2001
From: Livio Amstutz <livio.a@gmail.com>
Date: Fri, 1 Oct 2021 09:45:45 +0200
Subject: [PATCH] fix: identifier for columns w/o table name / alias (#2449)

---
 internal/query/search_query.go | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/internal/query/search_query.go b/internal/query/search_query.go
index deecbb5dde..bbcc206006 100644
--- a/internal/query/search_query.go
+++ b/internal/query/search_query.go
@@ -259,10 +259,13 @@ type Column struct {
 }
 
 func (c Column) identifier() string {
-	if c.table.alias == "" {
+	if c.table.alias != "" {
+		return c.table.alias + "." + c.name
+	}
+	if c.table.name != "" {
 		return c.table.name + "." + c.name
 	}
-	return c.table.alias + "." + c.name
+	return c.name
 }
 
 func (c Column) setTable(t table) Column {