Merge pull request #63 from Synicix/master

Change list table to use virutal module instaed of schema

Author: guzman-raphael

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 Observes [Semantic Versioning](https://semver.org/spec/v2.0.0.html) standard and [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) convention.
 
+## [Unreleased]
+
+### Fixed
+- Fixed behavior where using list_table with a nonexistent schema_name creates it instead of returning an error message (#65) PR #63
+
 ## [0.1.0b0] - 2021-02-26
 
 ### Security
@@ -36,5 +41,6 @@ Observes [Semantic Versioning](https://semver.org/spec/v2.0.0.html) standard and
 - Support for DataJoint attribute types: `varchar`, `int`, `float`, `datetime`, `date`, `time`, `decimal`, `uuid`.
 - Check dependency utility to determine child table references.
 
+[Unreleased]: https://github.com/datajoint/pharus/compare/0.1.0b0...HEAD
 [0.1.0b0]: https://github.com/datajoint/pharus/compare/0.1.0a5...0.1.0b0
 [0.1.0a5]: https://github.com/datajoint/pharus/releases/tag/0.1.0a5

pharus/interface.py

@@ -69,8 +69,8 @@ def list_tables(jwt_payload: dict, schema_name: str):
         """
         DJConnector.set_datajoint_config(jwt_payload)
 
-        # Get list of tables names\
-        tables_name = dj.schema(schema_name).list_tables()
+        # Get list of tables names
+        tables_name = dj.Schema(schema_name, create_schema=False).list_tables()
 
         # Dict to store list of table name for each type
         tables_dict_list = dict(manual_tables=[], lookup_tables=[], computed_tables=[],
@@ -112,7 +112,7 @@ def fetch_tuples(jwt_payload: dict, schema_name: str, table_name: str,
         :type schema_name: str
         :param table_name: Table name under the given schema; must be in camel case
         :type table_name: str
-        :param restriction: Sequence of filter cards with attribute_name, operation, value
+        :param restriction: Sequence of filter cards with attributeName, operation, value
             defined, defaults to []
         :type restriction: list, optional
         :param limit: Max number of records to return, defaults to 1000

requirements.txt

@@ -1,5 +1,5 @@
 flask
 gunicorn
 pyjwt[crypto]
-datajoint==0.13.dev4
+datajoint==0.13.dev5
 datajoint_connection_hub

tests/test_list_tables.py

@@ -0,0 +1,25 @@
+from . import client, connection, token, schema_main, ParentPart
+from flask.wrappers import Response
+import datajoint as dj
+
+def test_list_tables(token, client, ParentPart):
+    ScanData, ProcessScanData = ParentPart
+    REST_tables = client.post(
+        '/list_tables',
+        headers=dict(Authorization=f'Bearer {token}'),
+        json=dict(schemaName=ScanData.database)).json['tableTypeAndNames']
+    assert ScanData.__name__ == REST_tables['manual_tables'][0]
+    assert ProcessScanData.__name__ == REST_tables['computed_tables'][0]
+    assert f"""{ProcessScanData.__name__}.{
+        ProcessScanData.ProcessScanDataPart.__name__}""" == REST_tables['part_tables'][0]
+
+def test_invalid_schema_list_table(token, client, schema_main):
+    # Test invalid schema
+    response: Response = client.post(
+        '/list_tables', 
+        headers=dict(Authorization=f'Bearer {token}'),
+        json=dict(schemaName='invalid_schema')
+        )
+
+    assert(response.status_code != 200)
+    assert('invalid_schema' not in dj.list_schemas())

tests/test_schemas.py

@@ -10,15 +10,3 @@ def test_schemas(token, client, connection, schemas_simple):
     assert set(REST_schemas) == set(
         [s for s in dj.list_schemas(connection=connection)
          if s not in ('mysql', 'performance_schema', 'sys')])
-
-
-def test_tables(token, client, ParentPart):
-    ScanData, ProcessScanData = ParentPart
-    REST_tables = client.post(
-        '/list_tables',
-        headers=dict(Authorization=f'Bearer {token}'),
-        json=dict(schemaName=ScanData.database)).json['tableTypeAndNames']
-    assert ScanData.__name__ == REST_tables['manual_tables'][0]
-    assert ProcessScanData.__name__ == REST_tables['computed_tables'][0]
-    assert f"""{ProcessScanData.__name__}.{
-        ProcessScanData.ProcessScanDataPart.__name__}""" == REST_tables['part_tables'][0]