aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBonfaceKilz2021-07-09 17:59:20 +0300
committerBonfaceKilz2021-07-10 09:09:00 +0300
commit0795a7b013dc1e274ffb0952d65351ebfe41c885 (patch)
treedfe6b3f97e25b41bc7449b38ed738916c66e97d8
parentd5c0cdec01ce1888946d09c0df72ea42ad2d2c17 (diff)
downloadgenenetwork3-0795a7b013dc1e274ffb0952d65351ebfe41c885.tar.gz
gn3: db: Add extra argument to specify column in fetch statements
-rw-r--r--gn3/db/__init__.py20
1 files changed, 15 insertions, 5 deletions
diff --git a/gn3/db/__init__.py b/gn3/db/__init__.py
index 9b1b36a..afc8897 100644
--- a/gn3/db/__init__.py
+++ b/gn3/db/__init__.py
@@ -1,7 +1,7 @@
# pylint: disable=[R0902, R0903]
"""Module that exposes common db operations"""
from dataclasses import asdict, astuple
-from typing import Any, Dict, Optional, Generator
+from typing import Any, Dict, List, Optional, Generator
from typing_extensions import Protocol
from gn3.db.metadata_audit import MetadataAudit
@@ -66,13 +66,18 @@ def update(conn: Any,
def fetchone(conn: Any,
table: str,
- where: Optional[Dataclass]) -> Optional[Dataclass]:
+ where: Optional[Dataclass],
+ columns: Optional[List[str]] = "*") -> Optional[Dataclass]:
"""Run a SELECT on a table. Returns only one result!"""
if not any(astuple(where)):
return None
where_ = {TABLEMAP[table].get(k): v for k, v in asdict(where).items()
if v is not None and k in TABLEMAP[table]}
- sql = f"SELECT * FROM {table} "
+ sql = ""
+ if columns != "*":
+ sql = f"SELECT {', '.join(columns)} FROM {table} "
+ else:
+ sql = f"SELECT * FROM {table} "
if where:
sql += "WHERE "
sql += " AND ".join(f"{k} = "
@@ -84,13 +89,18 @@ def fetchone(conn: Any,
def fetchall(conn: Any,
table: str,
- where: Optional[Dataclass]) -> Optional[Generator]:
+ where: Optional[Dataclass],
+ columns: Optional[List[str]] = "*") -> Optional[Generator]:
"""Run a SELECT on a table. Returns all the results as a tuple!"""
if not any(astuple(where)):
return None
where_ = {TABLEMAP[table].get(k): v for k, v in asdict(where).items()
if v is not None and k in TABLEMAP[table]}
- sql = f"SELECT * FROM {table} "
+ sql = ""
+ if columns != "*":
+ sql = f"SELECT {', '.join(columns)} FROM {table} "
+ else:
+ sql = f"SELECT * FROM {table} "
if where:
sql += "WHERE "
sql += " AND ".join(f"{k} = "