Skip to content

Support renaming tables #269

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 11, 2025
Merged

Support renaming tables #269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5013a34
implement renaming tables via POST
leondutoit Feb 11, 2025
6d8f1cb
test renaming tables via POST
leondutoit Feb 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 16 additions & 6 deletions tsdfileapi/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2507,14 +2507,24 @@ def patch(self, tenant: str, table_name: str) -> None:
def post(self, tenant: str, table_name: str) -> None:
try:
table_name = self.create_table_name(table_name)
if not table_name.endswith("/audit"):
raise ClientMethodNotAllowed
query = self.get_uri_query(self.request.uri)
self.restored = self.db.table_restore(
table_name.replace("/audit", ""), query
)
if query.startswith("restore"):
if not table_name.endswith("/audit"):
raise ClientMethodNotAllowed(
"Restore is only supported on audit tables"
)
self.restored = self.db.table_restore(
table_name.replace("/audit", ""), query
)
out = self.restored
elif query.startswith("alter"):
if table_name.endswith("/audit"):
raise ClientMethodNotAllowed(
"Renaming audit tables is not supported"
)
out = self.db.table_alter(table_name, query)
self.set_status(HTTPStatus.OK.value)
self.write(self.restored)
self.write(out)
except Exception as e:
error = error_for_exception(e, details=self.additional_log_details())
logger.error(error.message)
Expand Down
86 changes: 48 additions & 38 deletions tsdfileapi/test_file_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,26 +354,6 @@ def test_K_put_stream_file_chunked_transfer_encoding(self) -> None:
# Informational
# --------------

def test_W_create_and_insert_into_generic_table(self) -> None:
# TODO: harden these tests - check return values
data = [
{"key1": 7, "key2": "bla", "id": random.randint(0, 1000000)},
{"key1": 99, "key3": False, "id": random.randint(0, 1000000)},
]
headers = {"Authorization": "Bearer " + TEST_TOKENS["VALID"]}
resp = requests.put(
self.base_url + "/tables/generic/mytest1",
data=json.dumps(data),
headers=headers,
)
self.assertEqual(resp.status_code, 201)
headers = {
"Authorization": "Bearer " + TEST_TOKENS["EXPORT"],
"Accept": "text/csv",
}
resp = requests.get(self.base_url + "/tables/generic/mytest1", headers=headers)
self.assertTrue(resp.status_code in [200, 201])

def use_generic_table(self, app_route: str, url_tokens_method: str) -> None:
methods = {"GET": requests.get, "PUT": requests.put, "DELETE": requests.delete}
for url, token, method in url_tokens_method:
Expand All @@ -382,26 +362,50 @@ def use_generic_table(self, app_route: str, url_tokens_method: str) -> None:
resp = methods[method](full_url, headers=headers)
self.assertTrue(resp.status_code in [200, 201])

def test_X_use_generic_table(self) -> None:
# TODO: harden these tests - check return values
generic_url_tokens_method = [
("", "VALID", "GET"),
("/mytest1", "EXPORT", "GET"),
("/mytest1?select=key1&where=key2=eq.bla&order=key1.desc", "EXPORT", "GET"),
("/mytest1", "EXPORT", "GET"),
("/mytest1?where=key1=eq.99", "ADMIN", "DELETE"),
("/mytest1", "EXPORT", "GET"),
("/mytest1?where=key1=not.is.null", "ADMIN", "DELETE"),
]
for app, acl in [("/tables/generic", generic_url_tokens_method)]:
self.use_generic_table(app, acl)
headers = {"Authorization": "Bearer " + TEST_TOKENS["VALID"]}
resp = requests.patch(
self.base_url + "/tables/generic/mytest1?set=key1&where=key2=eq.bla",
data=json.dumps({"key1": 1000}),
def test_tables(self) -> None:
headers = {"Authorization": f'Bearer {TEST_TOKENS["EXPORT"]}'}

# if it exists
resp = requests.delete(
f"{self.base_url}/apps/generic/tables/table1",
headers=headers,
)
self.assertEqual(resp.status_code, 201)
resp = requests.delete(
f"{self.base_url}/apps/generic/tables/table2",
headers=headers,
)

# create a table
data = {"x": 10, "y": 11}
resp = requests.put(
f"{self.base_url}/apps/generic/tables/table1",
data=json.dumps(data),
headers=headers,
)
resp = requests.get(
f"{self.base_url}/apps/generic/tables/table1",
headers=headers,
)
self.assertEqual(json.loads(resp.text), [data])

# rename the table
resp = requests.post(
f"{self.base_url}/apps/generic/tables/table1?alter=name=eq.table2",
headers=headers,
)
self.assertEqual(json.loads(resp.text), {"tables": ["table1"]})

resp = requests.get(
f"{self.base_url}/apps/generic/tables/table2",
headers=headers,
)
self.assertEqual(json.loads(resp.text), [data])

resp = requests.get(
f"{self.base_url}/apps/generic/tables/table1",
headers=headers,
)
self.assertEqual(resp.status_code, 404)

def test_XXX_query_invalid(self) -> None:
headers = {"Authorization": "Bearer " + TEST_TOKENS["VALID"]}
Expand Down Expand Up @@ -2806,6 +2810,9 @@ def main() -> None:
"test_XXX_nettskjema_backend",
"test_survey_api_queries",
]
tables = [
"test_tables",
]
load = ["test_XXX_load"]
apps = [
"test_app_backend",
Expand Down Expand Up @@ -2869,6 +2876,8 @@ def main() -> None:
tests.extend(logs)
if "storage" in sys.argv:
tests.extend(storage)
if "tables" in sys.argv:
tests.extend(tables)
if "all" in sys.argv:
tests.extend(base)
tests.extend(sns)
Expand All @@ -2885,6 +2894,7 @@ def main() -> None:
tests.extend(crypt)
tests.extend(mtime)
tests.extend(logs)
tests.extend(tables)
tests.sort()
suite = unittest.TestSuite()
for test in tests:
Expand Down
Loading