From b270eed3370b2c6524e7202482ffe80c0cf28162 Mon Sep 17 00:00:00 2001
From: gmantele <gmantele@ari.uni-heidelberg.de>
Date: Thu, 17 Mar 2016 19:27:40 +0100
Subject: [PATCH] [ADQL] In the list of DBColumns returned by ADQLJoin, put the
 common columns in first position. This should be totally harmless and should
 be conform to the behaviour of a NATURAL or USING keywords in DBMS.

---
 src/adql/query/from/ADQLJoin.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/adql/query/from/ADQLJoin.java b/src/adql/query/from/ADQLJoin.java
index 7973b2b..119154c 100644
--- a/src/adql/query/from/ADQLJoin.java
+++ b/src/adql/query/from/ADQLJoin.java
@@ -16,7 +16,7 @@ package adql.query.from;
  * You should have received a copy of the GNU Lesser General Public License
  * along with ADQLLibrary.  If not, see <http://www.gnu.org/licenses/>.
  * 
- * Copyright 2012-2015 - UDS/Centre de Données astronomiques de Strasbourg (CDS),
+ * Copyright 2012-2016 - UDS/Centre de Données astronomiques de Strasbourg (CDS),
  *                       Astronomisches Rechen Institut (ARI)
  */
 
@@ -42,7 +42,7 @@ import adql.query.operand.ADQLColumn;
  * Defines a join between two "tables".
  * 
  * @author Gr&eacute;gory Mantelet (CDS;ARI)
- * @version 1.4 (06/2015)
+ * @version 1.4 (03/2016)
  */
 public abstract class ADQLJoin implements ADQLObject, FromContent {
 
@@ -420,7 +420,7 @@ public abstract class ADQLJoin implements ADQLObject, FromContent {
 			addAllExcept(rightList, list, mapDuplicated);
 
 			/* 4. Add all common columns of mapDuplicated */
-			list.addAll(mapDuplicated.values());
+			list.addAll(0, mapDuplicated.values());
 
 			return list;
 		}catch(UnresolvedJoinException uje){
-- 
GitLab