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): oszko-scripts Wojtek's customized Guix
aboutsummaryrefslogtreecommitdiff
path: root/gnu/tests/singularity.scm
AgeCommit message (Expand)Author
2019-11-09tests: Update references to the now-deprecated 'guile-json' variable....* gnu/tests/docker.scm (build-tarball&run-docker-test): Refer to 'guile-json-3' instead of 'guile-json'. * gnu/tests/singularity.scm (build-tarball&run-singularity-test): Likewise. Ludovic Courtès
2019-07-04pack: 'squashfs' backend records the profile's search paths....* guix/scripts/pack.scm (singularity-environment-file): New procedure. (squashfs-image): Use it, and create /.singularity/env/90-environment.sh. * gnu/tests/singularity.scm (run-singularity-test)["singularity run, with environment"]: New test, currently skipped. * gnu/tests/singularity.scm (build-tarball&run-singularity-test): Add GUILE-JSON to the profile. Ludovic Courtès
2019-06-07pack: Add '--entry-point'....* guix/scripts/pack.scm (self-contained-tarball): Add #:entry-point and warn when it's true. (squashfs-image): Add #:entry-point and honor it. (docker-image): Add #:entry-point and honor it. (%options, show-help): Add '--entry-point'. (guix-pack): Honor '--entry-point' and pass #:entry-point to BUILD-IMAGE. * gnu/tests/docker.scm (run-docker-test): Test 'docker run' with the default entry point. (build-tarball&run-docker-test): Pass #:entry-point to 'docker-image'. * doc/guix.texi (Invoking guix pack): Document it. * gnu/tests/singularity.scm (run-singularity-test)["singularity run"]: New test. (build-tarball&run-singularity-test): Pass #:entry-point to 'squashfs-image'. Ludovic Courtès
2019-06-07services: Add Singularity....* gnu/packages/linux.scm (singularity)[source](snippet): Change file name of setuid helpers in libexec/cli/*.exec. [arguments]: Remove "--disable-suid". * gnu/services/docker.scm (%singularity-activation): New variable. (singularity-setuid-programs): New procedure. (singularity-service-type): New variable. * gnu/tests/singularity.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. * doc/guix.texi (Miscellaneous Services): Document it. Ludovic Courtès