From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 2E499936F1 for ; Fri, 7 Apr 2023 15:43:08 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 087A31A726 for ; Fri, 7 Apr 2023 15:43:08 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Fri, 7 Apr 2023 15:43:07 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id ACF2B46463 for ; Fri, 7 Apr 2023 15:43:06 +0200 (CEST) From: Leo Nunner To: pmg-devel@lists.proxmox.com Date: Fri, 7 Apr 2023 15:42:51 +0200 Message-Id: <20230407134258.199691-6-l.nunner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230407134258.199691-1-l.nunner@proxmox.com> References: <20230407134258.199691-1-l.nunner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.130 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pmg-devel] [PATCH pmg-api 5/8] feature: match groups: add field to database X-BeenThere: pmg-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Mail Gateway development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Apr 2023 13:43:08 -0000 Adds a 'MatchGroup' field to the 'RuleGroup' table. Signed-off-by: Leo Nunner --- src/PMG/DBTools.pm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/PMG/DBTools.pm b/src/PMG/DBTools.pm index 07d39b1..e038365 100644 --- a/src/PMG/DBTools.pm +++ b/src/PMG/DBTools.pm @@ -408,6 +408,7 @@ sub create_ruledb { Rule_ID INTEGER NOT NULL, Grouptype INTEGER NOT NULL, Negate INTEGER NOT NULL DEFAULT 0, + MatchGroup INTEGER NOT NULL DEFAULT 0, PRIMARY KEY (Objectgroup_ID, Rule_ID, Grouptype) ); @@ -583,6 +584,19 @@ sub upgradedb { } } + # Allow logical AND for rule objects + if (!database_column_exists($dbh, 'RuleGroup', 'MatchGroup')) { + eval { + $dbh->begin_work; + $dbh->do("ALTER TABLE RuleGroup ADD COLUMN MatchGroup INTEGER NOT NULL DEFAULT 0"); + $dbh->commit; + }; + if (my $err = $@) { + $dbh->rollback; + die $err; + } + } + foreach my $table (keys %$tables) { eval { $dbh->do("ANALYZE $table"); }; warn $@ if $@; -- 2.30.2