From 6ba9bffbe98bc3671b06f8b3071faa4bca9455c8 Mon Sep 17 00:00:00 2001
From: gmantele <gmantele@ari.uni-heidelberg.de>
Date: Thu, 14 Jul 2016 18:12:04 +0200
Subject: [PATCH] [TAP] Fix an artefact of
19026c1b408e0742ae50bea8bfef379bc77455c9. TAPTable.copy(...) and
TAPColumn.copy(...) use directly the attribute dbName instead using
getDBName() ; indeed getDBName() <> dbName. Because of this bug, queries with
aliased tables did not work anymore.
---
src/tap/metadata/TAPColumn.java | 2 +-
src/tap/metadata/TAPTable.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/tap/metadata/TAPColumn.java b/src/tap/metadata/TAPColumn.java
index aec7097..4dbb743 100644
--- a/src/tap/metadata/TAPColumn.java
+++ b/src/tap/metadata/TAPColumn.java
@@ -945,7 +945,7 @@ public class TAPColumn implements DBColumn {
@Override
public DBColumn copy(final String dbName, final String adqlName, final DBTable dbTable){
TAPColumn copy = new TAPColumn((adqlName == null) ? this.adqlName : adqlName, datatype, description, unit, ucd, utype);
- copy.setDBName((dbName == null) ? this.dbName : dbName);
+ copy.setDBName((dbName == null) ? this.getDBName() : dbName);
copy.setTable(dbTable);
copy.setIndexed(indexed);
diff --git a/src/tap/metadata/TAPTable.java b/src/tap/metadata/TAPTable.java
index c89df9c..02a2402 100644
--- a/src/tap/metadata/TAPTable.java
+++ b/src/tap/metadata/TAPTable.java
@@ -1060,7 +1060,7 @@ public class TAPTable implements DBTable {
@Override
public DBTable copy(final String dbName, final String adqlName){
TAPTable copy = new TAPTable((adqlName == null) ? this.adqlName : adqlName);
- copy.setDBName((dbName == null) ? this.dbName : dbName);
+ copy.setDBName((dbName == null) ? this.getDBName() : dbName);
copy.setSchema(schema);
Collection<TAPColumn> collColumns = columns.values();
for(TAPColumn col : collColumns)
--
GitLab