From patchwork Tue Apr 27 18:00:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 12227103 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 51B69C433B4 for ; Tue, 27 Apr 2021 18:00:58 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1394561006 for ; Tue, 27 Apr 2021 18:00:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1394561006 Authentication-Results: mail.kernel.org; dmarc=pass (p=none dis=none) header.from=xenproject.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org 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 X-Outflank-Mailman: Message body and most headers restored to incoming version 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-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 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 $progress "Populating database..." -$(get_psql_cmd) $quietopt -f schema/initial.sql +$(get_psql_cmd) $quietopt -1 -f schema/initial.sql 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 () { } psql_do_cmd () { - echo "$(get_psql_cmd) ${OSSTEST_DEBUG:+-e -a}" + echo "$(get_psql_cmd) ${OSSTEST_DEBUG:+-e -a}" -1 } psql_do () { @@ -411,7 +411,9 @@ END #---------- create test db ---------- psql_do <>$t.import <