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): tion> Wojtek's customized Guix
aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/patches/clucene-pkgconfig.patch
AgeCommit message (Expand)Author
2021-03-14gnu: unzip: Add patches from Fedora [security fixes]....Non-exhaustively fixes CVE-2016-9844, CVE-2018-1000035, CVE-2018-18384, and CVE-2019-13232. * gnu/packages/patches/unzip-COVSCAN-fix-unterminated-string.patch, gnu/packages/patches/unzip-CVE-2016-9844.patch, gnu/packages/patches/unzip-CVE-2018-1000035.patch, gnu/packages/patches/unzip-CVE-2018-18384.patch, gnu/packages/patches/unzip-case-insensitive.patch, gnu/packages/patches/unzip-alt-iconv-utf8-print.patch, gnu/packages/patches/unzip-alt-iconv-utf8.patch, gnu/packages/patches/unzip-close.patch, gnu/packages/patches/unzip-exec-shield.patch, gnu/packages/patches/unzip-fix-recmatch.patch, gnu/packages/patches/unzip-manpage-fix.patch, gnu/packages/patches/unzip-overflow.patch, gnu/packages/patches/unzip-symlink.patch, gnu/packages/patches/unzip-timestamp.patch, gnu/packages/patches/unzip-valgrind.patch, gnu/packages/patches/unzip-x-option.patch, gnu/packages/patches/unzip-zipbomb-manpage.patch, gnu/packages/patches/unzip-zipbomb-part1.patch, gnu/packages/patches/unzip-zipbomb-part2.patch, gnu/packages/patches/unzip-zipbomb-part3.patch: New patches. * gnu/local.mk (dist_patch_DATA): Register them. * gnu/packages/compression.scm (unzip/fixed): New variable. Apply patches. (unzip)[replacement]: Graft. Léo Le Bouter