From 09e81ed78366066255fab7eb3249d73b5cb4b648 Mon Sep 17 00:00:00 2001
From: gmantele <gmantele@ari.uni-heidelberg.de>
Date: Fri, 4 Mar 2016 20:00:23 +0100
Subject: [PATCH] [ADQL] Return a not NULL name for a SelectItem containing a
Concatenation (indeed, a Concatenation object has no name).
---
src/adql/query/SelectItem.java | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/adql/query/SelectItem.java b/src/adql/query/SelectItem.java
index 803101a..fa3eb3c 100644
--- a/src/adql/query/SelectItem.java
+++ b/src/adql/query/SelectItem.java
@@ -16,13 +16,14 @@ package adql.query;
* 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 Institute (ARI)
*/
import java.util.NoSuchElementException;
import adql.query.operand.ADQLOperand;
+import adql.query.operand.Concatenation;
/**
* <p>Represents an item of a SELECT clause.</p>
@@ -30,7 +31,7 @@ import adql.query.operand.ADQLOperand;
* <p>It merely encapsulates an operand and allows to associate to it an alias (according to the following syntax: "SELECT operand AS alias").</p>
*
* @author Grégory Mantelet (CDS;ARI)
- * @version 1.4 (06/2015)
+ * @version 1.4 (03/2016)
*
* @see ClauseSelect
*/
@@ -185,7 +186,12 @@ public class SelectItem implements ADQLObject {
@Override
public String getName(){
- return hasAlias() ? alias : operand.getName();
+ if (hasAlias())
+ return alias;
+ else if (operand instanceof Concatenation)
+ return "concat";
+ else
+ return operand.getName();
}
@Override
--
GitLab