Skip to content

Commit 0ede38b

Browse files
mhsarmientomhsarmiento
committed
This new commit adds a new functionality to the TAP+. This new commit
corrects the pythest for the new funcionality "rename_table"
1 parent f9317a4 commit 0ede38b

File tree

5 files changed

+58
-31
lines changed

5 files changed

+58
-31
lines changed

‎astroquery/gaia/core.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
European Space Agency (ESA)
1212
1313
Created on 30 jun. 2016
14-
14+
Modified on 1 jun. 2021 by mhsarmiento
15+
Version: gaia-astroquery-1.0
1516
1617
"""
1718
from requests import HTTPError

‎astroquery/utils/tap/core.py

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
European Space Agency (ESA)
1212
1313
Created on 30 jun. 2016
14+
Modified on 1 jun. 2021 by mhsarmiento
15+
Version: gaia-astroquery-1.0
1416
1517
1618
"""
@@ -1674,15 +1676,15 @@ def rename_table(self, table_name=None, new_table_name=None, new_column_names_di
16741676
raise ValueError("Please introduce as minimum a new table tame or a new name for a column with format "
16751677
"old_column1_name:new_column1_name, ... ,old_columnN_name:new_columnN_name")
16761678

1677-
# Now we will check that the table exist
1678-
table = self.load_table(table=table_name, verbose=verbose)
1679-
1680-
# Check now if the table exist and contains values
1681-
if table is None:
1682-
raise ValueError("Table name not found")
1683-
columns = table.columns
1684-
if len(columns) == 0:
1685-
raise ValueError("Table has no columns")
1679+
# # Now we will check that the table exist
1680+
# table = self.load_table(table=table_name, verbose=verbose)
1681+
#
1682+
# # Check now if the table exist and contains values
1683+
# if table is None:
1684+
# raise ValueError("Table name not found")
1685+
# columns = table.columns
1686+
# if len(columns) == 0:
1687+
# raise ValueError("Table has no columns")
16861688

16871689
if new_table_name is not None or new_table_name != '':
16881690
if new_column_names_dict is None or not new_column_names_dict:

‎astroquery/utils/tap/tests/data/job_1.vot

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<VOTABLE version="1.3" xmlns="http://www.ivoa.net/xml/VOTable/v1.3">
22
<RESOURCE type="results">
33
<INFO name="QUERY_STATUS" value="OK"/>
4-
<INFO name="ADQL_QUERY" value="select * from user_jsegovia.table1" />
4+
<INFO name="ADQL_QUERY" value="select * from user_mhenar.table_test_update" />
55
<INFO name="CAPTION" value="If you use public Gaia DR1 data in your paper, please take note of our guide on how to acknowledge and cite Gaia DR1: http://gaia.esac.esa.int/documentation/GDR1/Miscellaneous/sec_credit_and_citation_instructions.html" />
66
<TABLE>
7-
<FIELD datatype="double" name="alpha">
8-
<DESCRIPTION>alpha</DESCRIPTION>
7+
<FIELD datatype="double" name="ra">
8+
<DESCRIPTION>ra</DESCRIPTION>
99
</FIELD>
10-
<FIELD datatype="double" name="delta">
11-
<DESCRIPTION>delta</DESCRIPTION>
10+
<FIELD datatype="double" name="dec">
11+
<DESCRIPTION>dec</DESCRIPTION>
1212
</FIELD>
1313
<FIELD arraysize="*" datatype="char" name="source_id">
1414
<DESCRIPTION>source_id</DESCRIPTION>
1515
</FIELD>
1616
<FIELD datatype="int" name="table1_oid">
17-
<DESCRIPTION>table1_oid</DESCRIPTION>
17+
<DESCRIPTION>table_test_update_oid</DESCRIPTION>
1818
</FIELD>
1919
<DATA>
2020
<BINARY2>

‎astroquery/utils/tap/tests/data/table_test_rename.vot

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<VOTABLE version="1.3" xmlns="http://www.ivoa.net/xml/VOTable/v1.3">
2+
<RESOURCE type="results">
3+
<INFO name="QUERY_STATUS" value="OK"/>
4+
<INFO name="ADQL_QUERY" value="select * from user_mhenar.table_test_update" />
5+
<INFO name="CAPTION" value="If you use public Gaia DR1 data in your paper, please take note of our guide on how to acknowledge and cite Gaia DR1: http://gaia.esac.esa.int/documentation/GDR1/Miscellaneous/sec_credit_and_citation_instructions.html" />
6+
<TABLE>
7+
<FIELD datatype="double" name="ra">
8+
<DESCRIPTION>ra</DESCRIPTION>
9+
</FIELD>
10+
<FIELD datatype="double" name="dec">
11+
<DESCRIPTION>dec</DESCRIPTION>
12+
</FIELD>
13+
<FIELD arraysize="*" datatype="char" name="source_id">
14+
<DESCRIPTION>source_id</DESCRIPTION>
15+
</FIELD>
16+
<FIELD datatype="int" name="object_id">
17+
<DESCRIPTION>object_id</DESCRIPTION>
18+
</FIELD>
19+
<DATA>
20+
<BINARY2>
21+
<STREAM encoding='base64'>
22+
AD/wAAAAAAAAQAAAAAAAAAAAAAABYQAAAAEAQAgAAAAAAABAEAAAAAAAAAAAAAFi
23+
AAAAAgBAFAAAAAAAAEAYAAAAAAAAAAAAAWMAAAAD
24+
</STREAM>
25+
</BINARY2>
26+
</DATA>
27+
</TABLE>
28+
</RESOURCE>
29+
</VOTABLE>

‎astroquery/utils/tap/tests/test_tap.py

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111
European Space Agency (ESA)
1212
1313
Created on 30 jun. 2016
14-
15-
1614
"""
1715
import os
1816
import numpy as np
@@ -970,35 +968,32 @@ def test_rename_table():
970968
context=None,
971969
body=tableData,
972970
headers=None)
973-
tableRequest = f"tables?tables={tableName}"
974-
connHandler.set_response(tableRequest, dummyResponse)
971+
# tableRequest = f"tables?tables={tableName}"
972+
# connHandler.set_response(tableRequest, dummyResponse)
973+
974+
# data = connHandler.url_encode(dictArgs)
975+
# response = connHandler.execute_table_tool(data, verbose=verbose)
975976

976977
with pytest.raises(Exception):
977978
tap.rename_table()
978979
with pytest.raises(Exception):
979980
tap.rename_table(table_name=tableName)
980981
with pytest.raises(Exception):
981982
tap.rename_table(table_name=tableName, new_table_name=None, new_column_names_dict=None)
982-
with pytest.raises(Exception):
983-
tap.rename_table(table_name=tableName, new_table_name=newTableName, verbose=True)
984-
with pytest.raises(Exception):
985-
tap.rename_table(table_name=tableName, new_column_names_dict=newColumnNames, verbose=True)
986-
with pytest.raises(Exception):
987-
tap.rename_table(table_name=tableName, new_table_name=newTableName, new_column_names_dict=newColumnNames,
988-
verbose=True)
989-
# OK
983+
984+
# Test OK.
990985
responseRenameTable = DummyResponse()
991986
responseRenameTable.set_status_code(200)
992987
responseRenameTable.set_message("OK")
993988
dictArgs = {
994989
"action": "rename",
995-
"new_column_names": newColumnNames,
990+
"new_column_names": "ra:alpha,dec:delta",
996991
"new_table_name": newTableName,
997992
"table_name": tableName,
998993
}
999-
req = f"tableTool?{dictArgs}"
994+
data = connHandler.url_encode(dictArgs)
995+
req = f"TableTool?{data}"
1000996
connHandler.set_response(req, responseRenameTable)
1001-
1002997
tap.rename_table(table_name=tableName, new_table_name=newTableName, new_column_names_dict=newColumnNames)
1003998

1004999

0 commit comments

Comments
 (0)