Skip to content

erp5
erp5
Commit 7ae6330b authored by Jérome Perrin's avatar Jérome Perrin
Browse files
Options

Merge remote-tracking branch 'upstream/master' into zope4py2

parents b629de8a 89aa2a6b
Pipeline #23516 failed with stage
    in 0 seconds
    Hide whitespace changes
    Inline Side-by-side
    Showing with 1 addition and 3 deletions
    product/CMFActivity/Activity/SQLBase.py
    View file @ 7ae6330b
    ...@@ -775,8 +775,7 @@ CREATE TABLE %s ( ...@@ -775,8 +775,7 @@ CREATE TABLE %s (
    b" processing_node=0 AND" b" processing_node=0 AND"
    b" %s%s" b" %s%s"
    b" ORDER BY priority, date" b" ORDER BY priority, date"
    b" LIMIT %i" b" LIMIT %i" % args,
    b" FOR UPDATE" % args,
    0, 0,
    )) ))
    else: else:
    ...@@ -789,7 +788,6 @@ CREATE TABLE %s ( ...@@ -789,7 +788,6 @@ CREATE TABLE %s (
    b" %s%s" b" %s%s"
    b" ORDER BY priority, date" b" ORDER BY priority, date"
    b" LIMIT %i" b" LIMIT %i"
    b" FOR UPDATE"
    b")" % args).format b")" % args).format
    result = Results(query( result = Results(query(
    b"SELECT *" b"SELECT *"
    ......
    Markdown is supported
    0% or
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment
    GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7