fixes #9

Author: jph00

fastlite/core.py

@@ -104,8 +104,12 @@ def __call__(
     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:
     "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)
     if as_cls and hasattr(self,'cls'):
         if with_pk: res = ((k,self.cls(**v)) for k,v in res)

nbs/00_core.ipynb

@@ -505,8 +505,12 @@
     "    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",
     "    \"Shortcut for `rows_where` or `pks_and_rows_where`, depending on `with_pk`\"\n",
-    "    \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",
     "    if as_cls and hasattr(self,'cls'):\n",
     "        if with_pk: res = ((k,self.cls(**v)) for k,v in res)\n",
@@ -576,7 +580,7 @@
     {
      "data": {
       "text/plain": [
-       "{'ArtistId': 1, 'Name': 'AC/DC'}"
+       "Artist(ArtistId=1, Name='AC/DC')"
       ]
      },
      "execution_count": null,

nbs/index.ipynb

@@ -491,7 +491,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "Pass a truthy value as the first param and you'll get tuples of primary keys and records:"
+    "Pass a truthy value as `with_pk` and you'll get tuples of primary keys and records:"
    ]
   },
   {
@@ -513,7 +513,7 @@
     }
    ],
    "source": [
-    "album(1, limit=2)"
+    "album(with_pk=1, limit=2)"
    ]
   },
   {
@@ -570,6 +570,34 @@
     "except NotFoundError: print(\"Not found\")"
    ]
   },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "The same filtering is done when using the table as a callable:"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [
+    {
+     "data": {
+      "text/plain": [
+       "[Album(AlbumId=1, Title='For Those About To Rock We Salute You', ArtistId=1),\n",
+       " Album(AlbumId=4, Title='Let There Be Rock', ArtistId=1)]"
+      ]
+     },
+     "execution_count": null,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "album()"
+   ]
+  },
   {
    "cell_type": "markdown",
    "metadata": {},