[pmg-devel] [PATCH WIP api 05/11] match groups: update database schema

[Leo Nunner <l.nunner@proxmox.com>]

Adds a 'MatchGroup' table which contains all the data relevant for a
match group:
    - ID: numerical ID of the group
    - Rule ID: of the rule it belongs to
    - Class: which object type it belongs to

The 'RuleGroup' table - which maps objects to a specific rule - now also
has a 'MatchGroup' field to store the ID of the corresponding match
group, should it be part of one.

Signed-off-by: Leo Nunner <l.nunner@proxmox.com>
---
 src/PMG/DBTools.pm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/src/PMG/DBTools.pm b/src/PMG/DBTools.pm
index 81d7fb3..1461dae 100644
--- a/src/PMG/DBTools.pm
+++ b/src/PMG/DBTools.pm
@@ -295,6 +295,15 @@ my $userprefs_ctablecmd =  <<__EOD;
 
 __EOD
 
+my $matchgroup_ctablecmd =  <<__EOD;
+    CREATE TABLE MatchGroup
+    (ID SERIAL UNIQUE,
+     RID INTEGER NOT NULL,
+     Name VARCHAR(255),
+     Class VARCHAR(10) NOT NULL,
+     PRIMARY KEY (ID));
+__EOD
+
 sub cond_create_dbtable {
     my ($dbh, $name, $ctablecmd) = @_;
 
@@ -418,6 +427,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)
         );
 
@@ -440,6 +450,8 @@ sub create_ruledb {
         $userprefs_ctablecmd;
 
         $virusinfo_stat_ctablecmd;
+
+        $matchgroup_ctablecmd;
 EOD
     );
 
@@ -495,6 +507,7 @@ sub upgradedb {
 	'CStatistic', $cstatistic_ctablecmd,
 	'ClusterInfo', $clusterinfo_ctablecmd,
 	'VirusInfo', $virusinfo_stat_ctablecmd,
+	'MatchGroup', $matchgroup_ctablecmd,
     };
 
     foreach my $table (keys %$tables) {
@@ -593,6 +606,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.39.2