diff --git a/transfer_service/db_connector.py b/transfer_service/db_connector.py index 353a612143681ee1f22e177af1bafcf03390693a..9f8b1e4580cacd4ecf3b9d16fd35be0a3f0fea26 100644 --- a/transfer_service/db_connector.py +++ b/transfer_service/db_connector.py @@ -80,7 +80,7 @@ class DbConnector(object): try: conn = self.getConnection() cursor = conn.cursor(cursor_factory = RealDictCursor) - cursor.execute("SELECT * FROM node_vos_path WHERE vos_path = %s;", (vospacePath,)) + cursor.execute("SELECT id_from_vos_path(%s);", (vospacePath,)) result = cursor.fetchall() cursor.close() except Exception: @@ -102,9 +102,8 @@ class DbConnector(object): cursor = conn.cursor(cursor_factory = RealDictCursor) cursor.execute(""" SELECT creator_id - FROM node_vos_path nvp - JOIN node n ON nvp.node_id = n.node_id - WHERE vos_path = %s; + FROM node + WHERE node_id = id_from_vos_path(%s); """, (vospacePath,)) result = cursor.fetchall() @@ -125,9 +124,8 @@ class DbConnector(object): cursor = conn.cursor(cursor_factory = RealDictCursor) cursor.execute(""" SELECT unnest(group_read) as group_read - FROM node_vos_path nvp - JOIN node n ON nvp.node_id = n.node_id - WHERE vos_path = %s; + FROM node + WHERE node_id = id_from_vos_path(%s); """, (vospacePath,)) result = cursor.fetchall() @@ -150,9 +148,8 @@ class DbConnector(object): cursor = conn.cursor(cursor_factory = RealDictCursor) cursor.execute(""" SELECT unnest(group_write) as group_write - FROM node_vos_path nvp - JOIN node n ON nvp.node_id = n.node_id - WHERE vos_path = %s; + FROM node + WHERE node_id = id_from_vos_path(%s); """, (vospacePath,)) result = cursor.fetchall()