diff --git a/gourmet/backends/db.py b/gourmet/backends/db.py index faa6a57a..7e6d2bc6 100644 --- a/gourmet/backends/db.py +++ b/gourmet/backends/db.py @@ -773,9 +773,11 @@ class RecData (Pluggable): """Return the number of rows in table that match criteria """ if criteria: - return table.count(*make_simple_select_arg(criteria,table)).execute().fetchone()[0] + return sqlalchemy.select( + sqlalchemy.func.count(criteria)).select_from(table).scalar() else: - return table.count().execute().fetchone()[0] + return sqlalchemy.select( + sqlalchemy.func.count()).select_from(table).scalar() def fetch_join (self, table1, table2, col1, col2, column_names=None, sort_by=[], **criteria): ripts Wojtek's customized Guix
aboutsummaryrefslogtreecommitdiff
path: root/build-aux/test-env.in
AgeCommit message (Expand)Author
2021-12-22tests: Move keys into ./tests/keys/ and add a third ed25519 key....The third key will be used in an upcoming commit. Rename public keys to .pub. * guix/tests/gnupg.scm (%ed25519-3-public-key-file): New variable. (%ed25519-3-secret-key-file): New variable. (%ed25519-2-public-key-file): Renamed from %ed25519bis-public-key-file. (%ed25519-2-secret-key-file): Renamed from %ed25519bis-secret-key-file. * tests/keys/ed25519-3.key: New file. * tests/keys/ed25519-3.sec: New file. Signed-off-by: Mathieu Othacehe <othacehe@gnu.org> Attila Lendvai
2021-04-20import: Remove Nix importer....This importer has suffered from bitrot and no longer works with current Nix and Nixpkgs. See <https://bugs.gnu.org/32339> and <https://bugs.gnu.org/36255>. * guix/import/snix.scm, guix/scripts/import/nix.scm, tests/snix.scm: Remove. * Makefile.am (MODULES, SCM_TESTS): Remove them. * guix/scripts/import.scm (importers): Remove "nix". * build-aux/test-env.in: Remove NIXPKGS variable. * configure.ac: Remove '--with-nixpkgs' option. * doc/guix.texi (Invoking guix import): Remove bit about "guix import nix". * etc/completion/fish/guix.fish: Likewise. Ludovic Courtès