Skip to content
Snippets Groups Projects
Commit b270eed3 authored by gmantele's avatar gmantele
Browse files

[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.
parent 0003e343
No related branches found
No related tags found
No related merge requests found
......@@ -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){
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment