From patchwork Tue Oct 29 07:34:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ali Alnubani X-Patchwork-Id: 1185906 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 472Ndx6Cy0z9sPT for ; Tue, 29 Oct 2019 18:35:01 +1100 (AEDT) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=mellanox.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.b="EKKBezQd"; dkim-atps=neutral Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 472Ndx58bFzF1SW for ; Tue, 29 Oct 2019 18:35:01 +1100 (AEDT) X-Original-To: patchwork@lists.ozlabs.org Delivered-To: patchwork@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=mellanox.com (client-ip=40.107.8.41; helo=eur04-vi1-obe.outbound.protection.outlook.com; envelope-from=alialnu@mellanox.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=mellanox.com Authentication-Results: lists.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.b="EKKBezQd"; dkim-atps=neutral Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80041.outbound.protection.outlook.com [40.107.8.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 472Ndp13VVzF0Vt for ; Tue, 29 Oct 2019 18:34:53 +1100 (AEDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VYRo3UFK3GtIMu2giFUfWfA5u546Tkl+rfjXbjP4vkEomCGk0k5bVNtSrC/Ez2GD2TXPwc/ECiZchQHQuK8b3rSnRq/dMdPd2xx/H0QcWNCt70IabxMByzeM7Tc3CGw41aLEWcmH1BUP7U2Tnd6PV+c9u61x6EsbkfahjDIQ2l/P164KxOs5uBJjW2RGO6JTeT6AMlp7Kp1g3NRYGyx6bkqnlK52LVgrOSOLno5GI64CW/4e4SkWpL6qZonQ7XUbiyoFBBplWqluaeoXyrUIIK9sPHul/EvtZNRKaRd7uTg7gMDStle3Y2QuBu5yzRIRWRDQV2S0nmEQtSstHED4Ww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=5bj8trWBYJqMUly5Z2IgC4Vdj9rg6ATloJZIJxdvzE8=; b=Pzdp7a7gNeNg48kLi2IXEAvi4xPpLzt52A9Mki6AvsTuW1nBFvkA99+EAH5XviegHqeOiQlcFdG6o9pqqGkVE4XmO8ClNJHZSzhHH++BWzHcaXsVGkwGYg09I/zGD8CBpBlaKIb3qPVTdKv81+mXjIu1q3N6Mk1j5adu7oMmBTQ35IdG8Ut8CsBfQ9NCa/Eeay9cMh3v1m5xpf9c72H7lbfjt40eoqQaNAiqgR/oKO4dwz2j8sndYzWdGN3iezpAJ+Gv/Ai3bmnRBf2rqirNe3VrgyVohYQaK+Yd/Y9yfkO3B5ugCX/Q1ZgEec21ePneAiEqfKFEVZHoAoa7IqdWng== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=mellanox.com; dmarc=pass action=none header.from=mellanox.com; dkim=pass header.d=mellanox.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=5bj8trWBYJqMUly5Z2IgC4Vdj9rg6ATloJZIJxdvzE8=; b=EKKBezQdfRT7ZAh1rVj9iyOL0Bs6/c7y/bz00daD664iGMOVcOXg6ukz+CoTlhAJ55H08GNkvZlySmkRIuzi4SsEWWVnyDnHgf/FIXVvYanOoCng8n7mxa0NmBQmOY44ik3WXJrHlSdEBpl5uR3pXZke9B9wEMLzWp6mcenHVXQ= Received: from AM0PR05MB4401.eurprd05.prod.outlook.com (52.134.124.20) by AM0PR05MB5203.eurprd05.prod.outlook.com (20.178.16.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2387.24; Tue, 29 Oct 2019 07:34:47 +0000 Received: from AM0PR05MB4401.eurprd05.prod.outlook.com ([fe80::91f1:9c5c:5b38:284e]) by AM0PR05MB4401.eurprd05.prod.outlook.com ([fe80::91f1:9c5c:5b38:284e%7]) with mapi id 15.20.2387.027; Tue, 29 Oct 2019 07:34:47 +0000 From: Ali Alnubani To: "patchwork@lists.ozlabs.org" Subject: [PATCH] [stable/2.1] sql: Fix table lists Thread-Topic: [PATCH] [stable/2.1] sql: Fix table lists Thread-Index: AQHVjitWbzuyXvHjcE6Mv57I9+Hpuw== Date: Tue, 29 Oct 2019 07:34:46 +0000 Message-ID: <20191029073432.26359-1-alialnu@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.11.0 x-clientproxiedby: PR0P264CA0186.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1c::30) To AM0PR05MB4401.eurprd05.prod.outlook.com (2603:10a6:208:62::20) authentication-results: spf=none (sender IP is ) smtp.mailfrom=alialnu@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [95.142.172.178] x-ms-publictraffictype: Email x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: a7f1873b-b53f-47ed-134f-08d75c42793c x-ms-traffictypediagnostic: AM0PR05MB5203: x-ld-processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:2582; x-forefront-prvs: 0205EDCD76 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(4636009)(346002)(136003)(376002)(396003)(366004)(39860400002)(189003)(199004)(66476007)(6916009)(66446008)(66556008)(6506007)(64756008)(99286004)(50226002)(52116002)(6436002)(386003)(316002)(66946007)(6486002)(486006)(186003)(66066001)(26005)(54906003)(102836004)(2616005)(476003)(81156014)(14444005)(2351001)(81166006)(3846002)(6116002)(86362001)(1730700003)(2906002)(2501003)(1076003)(25786009)(478600001)(14454004)(71200400001)(4326008)(71190400001)(8936002)(5640700003)(36756003)(5660300002)(305945005)(7736002)(6512007)(256004)(8676002); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR05MB5203; H:AM0PR05MB4401.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: GI4SDpcE/+Bw9YWOwW1TwLt0/YdJFI+n8wDZmsOvZI8KS2QTne7Up+mdhWgeP5gx8MZmzWCreAScu56jcuDF1z8qKTpzxHea7NY1PH3qoUep5j54tstitokHRtyIE5WnoPE8PvpDDINIYiLzRK6AMPklE7C6R6nOI3Hpeg3jNUciS7qhndl0l0iOna+nJce+jB0vyULJZGF6eMuM1Lt4n2uU7xdxqzlau2XXBp1ShDfVFwN+un07+1TcrvPRbexZYN66NCjTl3/pWIQYIBNcoXIk0NdfsboTQY/l++cqKfYHC9jCg1NJvbCmn6ESMuP4ZVqY/tHmh3zX8kiM52bgMoT5OR5L0mGhloVn9z5UGHWJxu9I3031XRWjMDwGimfiiRTGCNGMdvvlCFnV2bEDyKCokVvcRW/eg3s8Ti2dqu/lPfxMWsaPmv+UT3IedB6c x-ms-exchange-transport-forked: True MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: a7f1873b-b53f-47ed-134f-08d75c42793c X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Oct 2019 07:34:47.0230 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: vkdDcykNbD/QqrOuuNKKVeEyl8x1GTmz0fStqRZY8iqqyW2ryjJIkKDcvd1kT44D0HRseyP2MuMlGCbEMSryrQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR05MB5203 X-BeenThere: patchwork@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Patchwork development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Monjalon Errors-To: patchwork-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Patchwork" [ backported from master commit 1a36ed51a8e1 ] The patch adds missing commas in the table lists where missing, and removes where unnecessary. This fixes errors such as the following when feeding the script to psql: psql:lib/sql/grant-all.postgres.sql:37: ERROR: syntax error at or near "patchwork_emailconfirmation" LINE 19: patchwork_emailconfirmation, ... Signed-off-by: Ali Alnubani Reviewed-by: Stephen Finucane Fixes: ca0e79d4db34 ("sql: Sort 'grant-all' scripts alphabetically") --- lib/sql/grant-all.postgres.sql | 24 +++++++++++----------- .../sql-fix-table-lists-77667621052b2f72.yaml | 4 ++++ 2 files changed, 16 insertions(+), 12 deletions(-) create mode 100644 releasenotes/notes/sql-fix-table-lists-77667621052b2f72.yaml diff --git a/lib/sql/grant-all.postgres.sql b/lib/sql/grant-all.postgres.sql index 27f55c9..7fb3ac8 100644 --- a/lib/sql/grant-all.postgres.sql +++ b/lib/sql/grant-all.postgres.sql @@ -18,7 +18,7 @@ GRANT SELECT, UPDATE, INSERT, DELETE ON patchwork_check, patchwork_comment, patchwork_coverletter, - patchwork_delegationrule + patchwork_delegationrule, patchwork_emailconfirmation, patchwork_emailoptout, patchwork_patch, @@ -33,7 +33,7 @@ GRANT SELECT, UPDATE, INSERT, DELETE ON patchwork_submission, patchwork_tag, patchwork_userprofile, - patchwork_userprofile_maintainer_projects, + patchwork_userprofile_maintainer_projects TO "www-data"; GRANT SELECT, UPDATE ON auth_group_id_seq, @@ -49,7 +49,7 @@ GRANT SELECT, UPDATE ON patchwork_bundlepatch_id_seq, patchwork_check_id_seq, patchwork_comment_id_seq, - patchwork_delegationrule_id_seq + patchwork_delegationrule_id_seq, patchwork_emailconfirmation_id_seq, patchwork_patch_id_seq, patchwork_patchtag_id_seq, @@ -61,7 +61,7 @@ GRANT SELECT, UPDATE ON patchwork_state_id_seq, patchwork_tag_id_seq, patchwork_userprofile_id_seq, - patchwork_userprofile_maintainer_projects_id_seq, + patchwork_userprofile_maintainer_projects_id_seq TO "www-data"; -- allow the mail user (in this case, 'nobody') to add submissions (patches, @@ -69,32 +69,32 @@ TO "www-data"; GRANT INSERT, SELECT ON patchwork_comment, patchwork_coverletter, - patchwork_event + patchwork_event, patchwork_seriespatch, patchwork_seriesreference, - patchwork_submission, + patchwork_submission TO "nobody"; GRANT INSERT, SELECT, UPDATE, DELETE ON patchwork_patch, patchwork_patchtag, - patchwork_person - patchwork_series, + patchwork_person, + patchwork_series TO "nobody"; GRANT SELECT ON - patchwork_delegationrule + patchwork_delegationrule, patchwork_project, patchwork_state, - patchwork_tag, + patchwork_tag TO "nobody"; GRANT UPDATE, SELECT ON patchwork_comment_id_seq, - patchwork_event_id_seq + patchwork_event_id_seq, patchwork_patch_id_seq, patchwork_patchtag_id_seq, patchwork_person_id_seq, patchwork_series_id_seq, patchwork_seriespatch_id_seq, - patchwork_seriesreference_id_seq, + patchwork_seriesreference_id_seq TO "nobody"; COMMIT; diff --git a/releasenotes/notes/sql-fix-table-lists-77667621052b2f72.yaml b/releasenotes/notes/sql-fix-table-lists-77667621052b2f72.yaml new file mode 100644 index 0000000..8eaa9f4 --- /dev/null +++ b/releasenotes/notes/sql-fix-table-lists-77667621052b2f72.yaml @@ -0,0 +1,4 @@ +--- +fixes: + - | + An sql error was fixed in `lib/sql/grant-all.postgres.sql`.