fixes #15

Author: jph00

fastlite/__init__.py

@@ -1,4 +1,3 @@
 __version__ = "0.0.8"
 from .core import *
 from .kw import *
-

fastlite/core.py

@@ -104,17 +104,23 @@ def create_mod(db, mod_fn, with_views=False, store=True, suf=''):
 # %% ../nbs/00_core.ipynb 34
 @patch
 def __call__(
-    self:(Table|View), where:str|None=None,
-    where_args: Iterable|dict|NoneType=None, with_pk:bool=False, order_by: str|None=None,
-    limit:int|None=None, offset:int|None=None, as_cls:bool=True, **kwargs)->list:
+    self:(Table|View),
+    where:str|None=None,  # SQL where fragment to use, for example `id > ?`
+    where_args: Iterable|dict|NoneType=None, # Parameters to use with `where`; iterable for `id>?`, or dict for `id>:id`
+    order_by: str|None=None, # Column or fragment of SQL to order by
+    limit:int|None=None, # Number of rows to limit to
+    offset:int|None=None, # SQL offset
+    select:str = "*", # Comma-separated list of columns to select
+    with_pk:bool=False, # Return tuple of (pk,row)?
+    as_cls:bool=True, # Convert returned dict to stored dataclass?
+    **kwargs)->list:
     "Shortcut for `rows_where` or `pks_and_rows_where`, depending on `with_pk`"
-
     f = getattr(self, 'pks_and_rows_where' if with_pk else 'rows_where')
     xtra = getattr(self, 'xtra_id', {})
     if xtra:
         xw = ' and '.join(f"[{k}] = {v!r}" for k,v in xtra.items())
         where = f'{xw} and {where}' if where else xw
-    res = f(where=where, where_args=where_args, order_by=order_by, limit=limit, offset=offset, **kwargs)
+    res = f(where=where, where_args=where_args, order_by=order_by, limit=limit, offset=offset, select=select, **kwargs)
     if as_cls and hasattr(self,'cls'):
         if with_pk: res = ((k,self.cls(**v)) for k,v in res)
         else: res = (self.cls(**o) for o in res)

fastlite/kw.py

@@ -5,7 +5,7 @@
 
 opt_bool = Union[bool, Default, None]
 
-def database(path, wal=True):
+def database(path, wal=True)->Any:
     path = Path(path)
     path.parent.mkdir(exist_ok=True)
     db = Database(path)
@@ -35,6 +35,7 @@ def ids_and_rows_where(
     order_by: Optional[str] = None,
     limit: Optional[int] = None,
     offset: Optional[int] = None,
+    select: str = '*',
 ) -> Generator[Tuple[Any, Dict], None, None]:
     """
     Like ``.rows_where()`` but returns ``(rowid, row)`` pairs.
@@ -47,8 +48,8 @@ def ids_and_rows_where(
     :param limit: Integer number of rows to limit to
     :param offset: Integer for SQL offset
     """
-    cs = [c.name for c in self.columns]
-    select = ",".join("[{}]".format(c) for c in cs)
+    #cs = [c.name for c in self.columns]
+    #select = ",".join("[{}]".format(c) for c in cs)
     select = "_rowid_ as __rid, " + select
     for row in self.rows_where(select=select, where=where, where_args=where_args, order_by=order_by, limit=limit, offset=offset):
         yield row.pop('__rid'), row

nbs/00_core.ipynb

@@ -505,17 +505,23 @@
     "#| exports\n",
     "@patch\n",
     "def __call__(\n",
-    "    self:(Table|View), where:str|None=None,\n",
-    "    where_args: Iterable|dict|NoneType=None, with_pk:bool=False, order_by: str|None=None,\n",
-    "    limit:int|None=None, offset:int|None=None, as_cls:bool=True, **kwargs)->list:\n",
+    "    self:(Table|View),\n",
+    "    where:str|None=None,  # SQL where fragment to use, for example `id > ?`\n",
+    "    where_args: Iterable|dict|NoneType=None, # Parameters to use with `where`; iterable for `id>?`, or dict for `id>:id`\n",
+    "    order_by: str|None=None, # Column or fragment of SQL to order by\n",
+    "    limit:int|None=None, # Number of rows to limit to\n",
+    "    offset:int|None=None, # SQL offset\n",
+    "    select:str = \"*\", # Comma-separated list of columns to select\n",
+    "    with_pk:bool=False, # Return tuple of (pk,row)?\n",
+    "    as_cls:bool=True, # Convert returned dict to stored dataclass?\n",
+    "    **kwargs)->list:\n",
     "    \"Shortcut for `rows_where` or `pks_and_rows_where`, depending on `with_pk`\"\n",
-    "\n",
     "    f = getattr(self, 'pks_and_rows_where' if with_pk else 'rows_where')\n",
     "    xtra = getattr(self, 'xtra_id', {})\n",
     "    if xtra:\n",
     "        xw = ' and '.join(f\"[{k}] = {v!r}\" for k,v in xtra.items())\n",
     "        where = f'{xw} and {where}' if where else xw\n",
-    "    res = f(where=where, where_args=where_args, order_by=order_by, limit=limit, offset=offset, **kwargs)\n",
+    "    res = f(where=where, where_args=where_args, order_by=order_by, limit=limit, offset=offset, select=select, **kwargs)\n",
     "    if as_cls and hasattr(self,'cls'):\n",
     "        if with_pk: res = ((k,self.cls(**v)) for k,v in res)\n",
     "        else: res = (self.cls(**o) for o in res)\n",