From nobody Tue Feb 10 10:54:50 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1619546471; cv=none; d=zohomail.com; s=zohoarc; b=RXZNE4yT7MoAHp5jUujD80nWKwj4jCTHbp9c0wL6x4bCaC1TGLl7ZNH9AVxlmiqNJ+vmvkozLP2wBo9ipltvhj5q2sEgNsiigwDxKU9t7XFZMSRtP4rW7sufE3Yvs1Se+bk/LBFUQhtKBZ1rTEinhK4Ndj/eLsGI8v/hcd8Lk0c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619546471; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=RKj3y4pvDAFofYle6tGS37iZPPboeDEgBiU4eIgQ5Oo=; b=GMscFOcNhDLlpHiybiAre9REazwkTw27b/H274/Zbzx1T85Zc6gzhTEawrgOHrvl56tnvrInAtfi2olr3u5lNxsEcHTu7QoTgtsTkbqmbNhFTYLT4DW2U8QLy2akGgxDx2SYLZcPB6CDh63L5cElVREDEIhR4osDrnb/3KvnGkc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1619546471580982.0239898075765; Tue, 27 Apr 2021 11:01:11 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.118789.225043 (Exim 4.92) (envelope-from ) id 1lbS0q-000288-VA; Tue, 27 Apr 2021 18:00:44 +0000 Received: by outflank-mailman (output) from mailman id 118789.225043; Tue, 27 Apr 2021 18:00:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lbS0q-00027s-OW; Tue, 27 Apr 2021 18:00:44 +0000 Received: by outflank-mailman (input) for mailman id 118789; Tue, 27 Apr 2021 18:00:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lbS0p-00027E-QX for xen-devel@lists.xenproject.org; Tue, 27 Apr 2021 18:00:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lbS0p-0004pf-NX for xen-devel@lists.xenproject.org; Tue, 27 Apr 2021 18:00:43 +0000 Received: from iwj (helo=mariner.uk.xensource.com) by xenbits.xenproject.org with local-bsmtp (Exim 4.92) (envelope-from ) id 1lbS0p-0001lX-MX for xen-devel@lists.xenproject.org; Tue, 27 Apr 2021 18:00:43 +0000 Received: from [172.18.45.5] (helo=zealot.relativity.greenend.org.uk) by mariner.uk.xensource.com with esmtp (Exim 4.89) (envelope-from ) id 1lbS0n-0003ln-MJ; Tue, 27 Apr 2021 19:00:42 +0100 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=RKj3y4pvDAFofYle6tGS37iZPPboeDEgBiU4eIgQ5Oo=; b=Iv9qXyWlqrkF1561qEKKRTlVgV Qe0/MVYjEZkbbkYSRd4Bfo7qQg9vFhScsvBHH7Qojk9sV4pB8/tHk7Y014UxWvKs3Rm8fmKwnnoC/ UCJU4XIRjALRaumWidOn1G2w0Vc4Ks6/Dh5Q+55EoGSxVNOQwI4/Kp8deBNs6VZ7bQN4=; From: Ian Jackson To: xen-devel@lists.xenproject.org Cc: Ian Jackson Subject: [OSSTEST PATCH 1/7] mg-schema-test-database: posgtres compat: psql transactions Date: Tue, 27 Apr 2021 19:00:27 +0100 Message-Id: <20210427180033.9439-2-iwj@xenproject.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210427180033.9439-1-iwj@xenproject.org> References: <20210427180033.9439-1-iwj@xenproject.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @xenproject.org) Content-Type: text/plain; charset="utf-8" Now (postgresql 11): * psql transaction behaviour has changed so that now we want to use the -1 option. This obviates a few BEGIN and COMMITs. * SET implicitly starts a transaction and DROP and CREATE DATABASE aren't transactional and now complain if they are run in a transaction. So we must add COMMIT after SET. Signed-off-by: Ian Jackson --- mg-schema-create | 2 +- mg-schema-test-database | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/mg-schema-create b/mg-schema-create index 9bb3040a..3a344db4 100755 --- a/mg-schema-create +++ b/mg-schema-create @@ -89,7 +89,7 @@ fi =20 $progress "Populating database..." =20 -$(get_psql_cmd) $quietopt -f schema/initial.sql +$(get_psql_cmd) $quietopt -1 -f schema/initial.sql =20 if $do_updates; then ./mg-schema-update $quietopt apply-all "${updates[@]}" diff --git a/mg-schema-test-database b/mg-schema-test-database index dab536c5..e69b9881 100755 --- a/mg-schema-test-database +++ b/mg-schema-test-database @@ -132,7 +132,7 @@ psql_query () { } =20 psql_do_cmd () { - echo "$(get_psql_cmd) ${OSSTEST_DEBUG:+-e -a}"=20 + echo "$(get_psql_cmd) ${OSSTEST_DEBUG:+-e -a}" -1 } =20 psql_do () { @@ -411,7 +411,9 @@ END #---------- create test db ---------- =20 psql_do <>$t.import <