From da27403b1bc0ff27f4e8666739846f4f0f5ffd37 Mon Sep 17 00:00:00 2001
From: Ralf Becker <RalfBecker@outdoor-training.de>
Date: Wed, 16 Sep 2020 16:44:46 +0200
Subject: [PATCH] * eSyncPro: fix SQL error in device list

---
 api/src/Storage/Base.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/api/src/Storage/Base.php b/api/src/Storage/Base.php
index d26a1fdb35..05056723b5 100644
--- a/api/src/Storage/Base.php
+++ b/api/src/Storage/Base.php
@@ -949,6 +949,11 @@ class Base
 				{
 					if (!in_array($col, $colums) && !in_array($col, $as_columns))
 					{
+						// make sure column-name is not ambigous
+						if ($join && strpos($join, $this->table_name.'.'.$col))
+						{
+							$col = $this->table_name.'.'.$col.' AS '.$col;
+						}
 						$colums[] = $col;
 					}
 				}