Merge pull request #3439 from esdc-esac-esa-int/ESA_euclid_EUCLIDSWRQ-258_GAIASWRQ-125_include_schema_in_delete_user_table_method

Author: bsipocz

CHANGES.rst

@@ -24,6 +24,11 @@ esa.hubble
 Infrastructure, Utility and Other Changes and Additions
 -------------------------------------------------------
 
+utils.tap
+^^^^^^^^^
+
+- ``TapPlus.delete_user_table`` includes the schema name to be compatible with TAP+ version >= 10.x. [#3439]
+
 
 
 0.4.11 (2025-09-19)

astroquery/gaia/core.py

@@ -13,6 +13,8 @@
 import os
 import shutil
 import zipfile
+from collections.abc import Iterable
+
 from astropy import units
 from astropy import units as u
 from astropy.coordinates import Angle
@@ -21,7 +23,6 @@
 from astropy.table import Table
 from astropy.units import Quantity
 from astropy.utils.decorators import deprecated_renamed_argument
-from collections.abc import Iterable
 from requests import HTTPError
 
 from astroquery import log
@@ -869,13 +870,13 @@ def cross_match_basic(self, *, table_a_full_qualified_name, table_a_column_ra, t
         Parameters
         ----------
         table_a_full_qualified_name : str, mandatory
-            a full qualified table name (i.e. schema name and table name)
+            a full qualified table name (i.e. schema name and table name, "user_<user_name>.<table_name>" )
         table_a_column_ra : str, mandatory
             the ‘ra’ column in the table table_a_full_qualified_name
         table_a_column_dec :  str, mandatory
             the ‘dec’ column in the table table_a_full_qualified_name
         table_b_full_qualified_name : str, optional, default MAIN_GAIA_TABLE
-            a full qualified table name (i.e. schema name and table name)
+            a full qualified table name (i.e. schema name and table name, "user_<user_name>.<table_name>" )
         table_b_column_ra : str, optional, default MAIN_GAIA_TABLE_RA
             the ‘ra’ column in the table table_b_full_qualified_name
         table_b_column_dec :  str, default MAIN_GAIA_TABLE_DEC

astroquery/utils/tap/conn/tests/DummyConnHandler.py

@@ -23,6 +23,7 @@
 class DummyConnHandler:
 
     def __init__(self):
+        self.cookie = None
         self.request = None
         self.data = None
         self.fileExt = ".ext"
@@ -168,3 +169,6 @@ def execute_upload(self, data,
                        content_type="application/x-www-form-urlencoded", *,
                        verbose=False):
         return self.defaultResponse
+
+    def set_cookie(self, cookie):
+        self.cookie = cookie

astroquery/utils/tap/core.py

@@ -1527,16 +1527,27 @@ def delete_user_table(self, *, table_name=None, force_removal=False, verbose=Fal
         verbose : bool, optional, default 'False'
             flag to display information about the process
         """
+
         if table_name is None:
             raise ValueError("Table name cannot be null")
+
+        if '.' not in table_name:
+            if self.__user is None:
+                raise ValueError("You must login to delete the table")
+            full_qualified_table = 'user_' + self.__user + '.' + table_name
+        else:
+            if not table_name.startswith("user_"):
+                raise ValueError(f"Invalid table name {table_name}: expected format user_<user_name>.<table_name>")
+            full_qualified_table = table_name
+
         if force_removal is True:
             args = {
-                "TABLE_NAME": str(table_name),
+                "TABLE_NAME": str(full_qualified_table),
                 "DELETE": "TRUE",
                 "FORCE_REMOVAL": "TRUE"}
         else:
             args = {
-                "TABLE_NAME": str(table_name),
+                "TABLE_NAME": str(full_qualified_table),
                 "DELETE": "TRUE",
                 "FORCE_REMOVAL": "FALSE"}
         connHandler = self.__getconnhandler()
@@ -1545,7 +1556,7 @@ def delete_user_table(self, *, table_name=None, force_removal=False, verbose=Fal
             print(response.status, response.reason)
             print(response.getheaders())
         connHandler.check_launch_response_status(response, verbose, 200)
-        msg = f"Table '{table_name}' deleted."
+        msg = f"Table '{full_qualified_table}' deleted."
         log.info(msg)
 
     def rename_table(self, *, table_name=None, new_table_name=None, new_column_names_dict=None, verbose=False):
@@ -1647,7 +1658,7 @@ def update_user_table(self, *, table_name=None, list_of_changes=(), verbose=Fals
             for value in change:
                 if value is None:
                     raise ValueError("None of the values for the changes can be null")
-                if (index == 1 and value != 'utype' and value != 'ucd' and value != 'flags' and value != 'indexed'):
+                if index == 1 and value != 'utype' and value != 'ucd' and value != 'flags' and value != 'indexed':
                     raise ValueError("Position 2 of all changes must be 'utype', 'ucd', 'flags' or 'indexed'")
                 index = index + 1
 

astroquery/utils/tap/tests/test_tap.py

@@ -882,6 +882,65 @@ def test_rename_table():
     tap.rename_table(table_name=tableName, new_table_name=newTableName, new_column_names_dict=newColumnNames)
 
 
+def test_delete_user_table():
+    tableName = 'user_test.table_test_rename'
+    conn_handler = DummyConnHandler()
+    dummyResponse = DummyResponse(200)
+
+    url_encode = urlencode({'DELETE': 'TRUE', 'FORCE_REMOVAL': 'FALSE', 'TABLE_NAME': 'user_test.table_test_rename'})
+    conn_handler.set_default_response(dummyResponse)
+    conn_handler.execute_upload(data=url_encode)
+    tap = TapPlus(url="http://test:1111/tap", connhandler=conn_handler)
+    tap.delete_user_table(table_name=tableName, force_removal=False, verbose=False)
+
+
+def test_delete_user_table_2():
+    conn_handler = DummyConnHandler()
+    dummyResponse = DummyResponse(200)
+
+    headers = [('Date', 'Sat, 12 Apr 2025 05:10:47 GMT'),
+               ('Server', 'Apache/2.4.6 (Red Hat Enterprise Linux) OpenSSL/1.0.2k-fips mod_jk/1.2.43'),
+               ('Set-Cookie', 'JSESSIONID=E677B51BA5C4837347D1E17D4E36647E; Path=/data-server; Secure; HttpOnly'),
+               ('X-Content-Type-Options', 'nosniff'), ('X-XSS-Protection', '0'),
+               ('Cache-Control', 'no-cache, no-store, max-age=0, must-revalidate'), ('Pragma', 'no-cache'),
+               ('Expires', '0'), ('X-Frame-Options', 'SAMEORIGIN'),
+               ('Set-Cookie', 'SESSION=ZjQ3MjIzMDAtNjNiYy00Mj; Path=/data-server; Secure; HttpOnly; SameSite=Lax'),
+               ('Transfer-Encoding', 'chunked'), ('Content-Type', 'text/plain; charset=UTF-8')]
+
+    dummyResponse.set_data(method='POST', headers=headers)
+
+    url_encode = urlencode({'DELETE': 'TRUE', 'FORCE_REMOVAL': 'FALSE', 'TABLE_NAME': 'user_test.table_test_rename'})
+    conn_handler.set_default_response(dummyResponse)
+    conn_handler.execute_upload(data=url_encode)
+    tap = TapPlus(url="http://test:1111/tap", connhandler=conn_handler)
+    tap.login(user="user", password="password")
+
+    tableName = 'table_test_rename'
+
+    tap.delete_user_table(table_name=tableName, force_removal=False, verbose=False)
+
+
+def test_delete_user_table_exception():
+    tableName = 'test.table_test_rename'
+    conn_handler = DummyConnHandler()
+    dummyResponse = DummyResponse(200)
+
+    url_encode = urlencode({'DELETE': 'TRUE', 'FORCE_REMOVAL': 'FALSE', 'TABLE_NAME': 'user_test.table_test_rename'})
+    conn_handler.set_default_response(dummyResponse)
+    conn_handler.execute_upload(data=url_encode)
+    tap = TapPlus(url="http://test:1111/tap", connhandler=conn_handler)
+
+    with pytest.raises(ValueError,
+                       match="Invalid table name test.table_test_rename: expected format user_<user_name>.<table_name"):
+        tap.delete_user_table(table_name=tableName, force_removal=False, verbose=False)
+
+    #
+
+    tableName = 'table_test_rename'
+    with pytest.raises(ValueError, match="You must login to delete the table"):
+        tap.delete_user_table(table_name=tableName, force_removal=False, verbose=False)
+
+
 def __find_table(schemaName, tableName, tables):
     qualified_name = f"{schemaName}.{tableName}"
     for table in tables: