Renamed database table 'groups' to 'permission_groups' (keyword in My…

…SQL >= 8).
znuny · Jul 16, 2021 · fafd56a · fafd56a
1 parent 27108a2
commit fafd56a
Show file tree

Hide file tree

Showing 44 changed files with 173 additions and 136 deletions.
diff --git a/Kernel/System/CustomerGroup.pm b/Kernel/System/CustomerGroup.pm
@@ -271,13 +271,12 @@ sub GroupMemberList {
         %Data = $Kernel::OM->Get('Kernel::System::Group')->GroupList( Valid => 1 );
     }
     else {
-        # get database object
         my $DBObject = $Kernel::OM->Get('Kernel::System::DB');
 
         # if it's active, return just the permitted groups
         my $SQL =
             'SELECT g.id, g.name, gu.permission_key, gu.permission_value, gu.user_id'
-            . ' FROM groups g, group_customer_user gu'
+            . ' FROM permission_groups g, group_customer_user gu'
             . ' WHERE g.valid_id IN ( ' . join ', ', $Kernel::OM->Get('Kernel::System::Valid')->ValidIDsGet() . ')'
             . ' AND g.id = gu.group_id AND gu.permission_value = 1'
             . " AND gu.permission_key IN (?, 'rw')";
@@ -639,13 +638,12 @@ sub GroupCustomerList {
         %Data = $Kernel::OM->Get('Kernel::System::Group')->GroupList( Valid => 1 );
     }
     else {
-        # get database object
         my $DBObject = $Kernel::OM->Get('Kernel::System::DB');
 
         # if it's active, return just the permitted groups
         my $SQL =
             'SELECT g.id, g.name, gc.permission_key, gc.permission_value, gc.customer_id'
-            . ' FROM groups g, group_customer gc'
+            . ' FROM permission_groups g, group_customer gc'
             . ' WHERE g.valid_id IN ( ' . join ', ', $Kernel::OM->Get('Kernel::System::Valid')->ValidIDsGet() . ')'
             . ' AND g.id = gc.group_id AND gc.permission_value = 1'
             . " AND gc.permission_key IN (?, 'rw')"
@@ -904,7 +902,6 @@ sub GroupLookup {
     );
     return ${$Cache} if ( ref $Cache eq 'SCALAR' );
 
-    # get database object
     my $DBObject = $Kernel::OM->Get('Kernel::System::DB');
 
     # get data
@@ -914,13 +911,13 @@ sub GroupLookup {
     if ( $Param{Group} ) {
         $Param{What} = $Param{Group};
         $Suffix      = 'GroupID';
-        $SQL         = 'SELECT id FROM groups WHERE name = ?';
+        $SQL         = 'SELECT id FROM permission_groups WHERE name = ?';
         push @Bind, \$Param{Group};
     }
     else {
         $Param{What} = $Param{GroupID};
         $Suffix      = 'Group';
-        $SQL         = 'SELECT name FROM groups WHERE id = ?';
+        $SQL         = 'SELECT name FROM permission_groups WHERE id = ?';
         push @Bind, \$Param{GroupID};
     }
     return if !$DBObject->Prepare(

diff --git a/Kernel/System/Group.pm b/Kernel/System/Group.pm
@@ -124,22 +124,25 @@ sub GroupAdd {
         return;
     }
 
-    # get database object
     my $DBObject = $Kernel::OM->Get('Kernel::System::DB');
 
     # insert new group
     return if !$DBObject->Do(
-        SQL => 'INSERT INTO groups (name, comments, valid_id, '
+        SQL => 'INSERT INTO permission_groups (name, comments, valid_id, '
             . ' create_time, create_by, change_time, change_by)'
             . ' VALUES (?, ?, ?, current_timestamp, ?, current_timestamp, ?)',
         Bind => [
-            \$Param{Name}, \$Param{Comment}, \$Param{ValidID}, \$Param{UserID}, \$Param{UserID},
+            \$Param{Name},
+            \$Param{Comment},
+            \$Param{ValidID},
+            \$Param{UserID},
+            \$Param{UserID},
         ],
     );
 
     # get new group id
     return if !$DBObject->Prepare(
-        SQL  => 'SELECT id FROM groups WHERE name = ?',
+        SQL  => 'SELECT id FROM permission_groups WHERE name = ?',
         Bind => [ \$Param{Name} ],
     );
 
@@ -277,12 +280,11 @@ sub GroupUpdate {
 
     return 1 if !$ChangeRequired;
 
-    # get database object
     my $DBObject = $Kernel::OM->Get('Kernel::System::DB');
 
     # update group in database
     return if !$DBObject->Do(
-        SQL => 'UPDATE groups SET name = ?, comments = ?, valid_id = ?, '
+        SQL => 'UPDATE permission_groups SET name = ?, comments = ?, valid_id = ?, '
             . 'change_time = current_timestamp, change_by = ? WHERE id = ?',
         Bind => [
             \$Param{Name}, \$Param{Comment}, \$Param{ValidID}, \$Param{UserID}, \$Param{ID},
@@ -456,12 +458,12 @@ sub GroupDataList {
     );
     return %{$Cache} if $Cache;
 
-    # get database object
     my $DBObject = $Kernel::OM->Get('Kernel::System::DB');
 
     # get all group data from database
     return if !$DBObject->Prepare(
-        SQL => 'SELECT id, name, comments, valid_id, create_time, create_by, change_time, change_by FROM groups',
+        SQL =>
+            'SELECT id, name, comments, valid_id, create_time, create_by, change_time, change_by FROM permission_groups',
     );
 
     # fetch the result

diff --git a/Kernel/System/SupportDataCollector/Plugin/OTRS/DatabaseRecords.pm b/Kernel/System/SupportDataCollector/Plugin/OTRS/DatabaseRecords.pm
@@ -77,7 +77,7 @@ sub Run {
             Label      => Translatable("Roles"),
         },
         {
-            SQL        => "SELECT count(*) FROM groups",
+            SQL        => "SELECT count(*) FROM permission_groups",
             Identifier => 'GroupCount',
             Label      => Translatable("Groups"),
         },
@@ -128,7 +128,6 @@ sub Run {
         },
     );
 
-    # get database object
     my $DBObject = $Kernel::OM->Get('Kernel::System::DB');
 
     my %Counts;

diff --git a/scripts/MigrateToZnuny6_1/MigrateGroups.pm b/scripts/MigrateToZnuny6_1/MigrateGroups.pm
@@ -72,7 +72,7 @@ sub _MigrateGroupNames {
         # Rename group.
         my $RenamingOK = $DBObject->Do(
             SQL => '
-                UPDATE groups SET name = ?
+                UPDATE permission_groups SET name = ?
                 WHERE id = ?
             ',
             Bind => [

diff --git a/scripts/MigrateToZnuny6_1/UpgradeDatabaseStructure.pm b/scripts/MigrateToZnuny6_1/UpgradeDatabaseStructure.pm
@@ -38,12 +38,10 @@ sub Run {
     my $Verbose = $Param{CommandlineOptions}->{Verbose} || 0;
 
     my @Tasks = (
-
-#         {
-#             Message =>
-#                 'Add table for dynamic field object names and add an index to speed up searching dynamic field text values',
-#             Module => 'DynamicFieldChanges',
-#         },
+        {
+            Message => 'Renaming database tables',
+            Module  => 'RenameTables',
+        },
     );
 
     print "\n" if $Verbose;

diff --git a/scripts/MigrateToZnuny6_1/UpgradeDatabaseStructure/RenameTables.pm b/scripts/MigrateToZnuny6_1/UpgradeDatabaseStructure/RenameTables.pm
@@ -0,0 +1,41 @@
+# --
+# Copyright (C) 2021 Znuny GmbH, https://znuny.org/
+# --
+# This software comes with ABSOLUTELY NO WARRANTY. For details, see
+# the enclosed file COPYING for license information (AGPL). If you
+# did not receive this file, see http://www.gnu.org/licenses/agpl.txt.
+# --
+## nofilter(TidyAll::Plugin::OTRS::Perl::Pod::NamePod)
+
+package scripts::MigrateToZnuny6_1::UpgradeDatabaseStructure::RenameTables;    ## no critic
+
+use strict;
+use warnings;
+
+use parent qw(scripts::MigrateToZnuny6_1::Base);
+
+use Kernel::System::VariableCheck qw(:all);
+
+our @ObjectDependencies;
+
+=head1 NAME
+
+Rename database tables.
+
+=cut
+
+sub Run {
+    my ( $Self, %Param ) = @_;
+
+    my @XML = (
+        '<TableAlter NameOld="groups" NameNew="permission_groups"/>',
+    );
+
+    return if !$Self->ExecuteXMLDBArray(
+        XMLArray => \@XML,
+    );
+
+    return 1;
+}
+
+1;
diff --git a/scripts/database/otrs-initial_insert.mysql.sql b/scripts/database/otrs-initial_insert.mysql.sql
@@ -26,21 +26,21 @@ INSERT INTO users (id, first_name, last_name, login, pw, valid_id, create_by, cr
     VALUES
     (1, 'Admin', 'OTRS', 'root@localhost', 'roK20XGbWEsSM', 1, 1, current_timestamp, 1, current_timestamp);
 # ----------------------------------------------------------
-#  insert into table groups
+#  insert into table permission_groups
 # ----------------------------------------------------------
-INSERT INTO groups (id, name, comments, valid_id, create_by, create_time, change_by, change_time)
+INSERT INTO permission_groups (id, name, comments, valid_id, create_by, create_time, change_by, change_time)
     VALUES
     (1, 'users', 'Group for default access.', 1, 1, current_timestamp, 1, current_timestamp);
 # ----------------------------------------------------------
-#  insert into table groups
+#  insert into table permission_groups
 # ----------------------------------------------------------
-INSERT INTO groups (id, name, comments, valid_id, create_by, create_time, change_by, change_time)
+INSERT INTO permission_groups (id, name, comments, valid_id, create_by, create_time, change_by, change_time)
     VALUES
     (2, 'admin', 'Group of all administrators.', 1, 1, current_timestamp, 1, current_timestamp);
 # ----------------------------------------------------------
-#  insert into table groups
+#  insert into table permission_groups
 # ----------------------------------------------------------
-INSERT INTO groups (id, name, comments, valid_id, create_by, create_time, change_by, change_time)
+INSERT INTO permission_groups (id, name, comments, valid_id, create_by, create_time, change_by, change_time)
     VALUES
     (3, 'stats', 'Group for statistics access.', 1, 1, current_timestamp, 1, current_timestamp);
 # ----------------------------------------------------------
@@ -854,7 +854,7 @@ INSERT INTO article_data_mime_plain (id, article_id, body, create_by, create_tim
     (1, 1, 'From: Znuny <hello@znuny.org>
 To: Your Znuny service desk <znuny@localhost>
 Subject: Znuny says hi!
-Content-Type: text/plain; charset=utf-8
+Content-Type: text/plain\; charset=utf-8
 Content-Transfer-Encoding: 8bit
 
 We welcome you to Znuny, our ticketing solution based on the well-known OTRS ((Community Edition)) which we forked to make things different.

diff --git a/scripts/database/otrs-initial_insert.oracle.sql b/scripts/database/otrs-initial_insert.oracle.sql
@@ -28,21 +28,21 @@ INSERT INTO users (first_name, last_name, login, pw, valid_id, create_by, create
     VALUES
     ('Admin', 'OTRS', 'root@localhost', 'roK20XGbWEsSM', 1, 1, current_timestamp, 1, current_timestamp);
 -- ----------------------------------------------------------
---  insert into table groups
+--  insert into table permission_groups
 -- ----------------------------------------------------------
-INSERT INTO groups (name, comments, valid_id, create_by, create_time, change_by, change_time)
+INSERT INTO permission_groups (name, comments, valid_id, create_by, create_time, change_by, change_time)
     VALUES
     ('users', 'Group for default access.', 1, 1, current_timestamp, 1, current_timestamp);
 -- ----------------------------------------------------------
---  insert into table groups
+--  insert into table permission_groups
 -- ----------------------------------------------------------
-INSERT INTO groups (name, comments, valid_id, create_by, create_time, change_by, change_time)
+INSERT INTO permission_groups (name, comments, valid_id, create_by, create_time, change_by, change_time)
     VALUES
     ('admin', 'Group of all administrators.', 1, 1, current_timestamp, 1, current_timestamp);
 -- ----------------------------------------------------------
---  insert into table groups
+--  insert into table permission_groups
 -- ----------------------------------------------------------
-INSERT INTO groups (name, comments, valid_id, create_by, create_time, change_by, change_time)
+INSERT INTO permission_groups (name, comments, valid_id, create_by, create_time, change_by, change_time)
     VALUES
     ('stats', 'Group for statistics access.', 1, 1, current_timestamp, 1, current_timestamp);
 -- ----------------------------------------------------------

diff --git a/scripts/database/otrs-initial_insert.postgresql.sql b/scripts/database/otrs-initial_insert.postgresql.sql
@@ -27,21 +27,21 @@ INSERT INTO users (first_name, last_name, login, pw, valid_id, create_by, create
     VALUES
     ('Admin', 'OTRS', 'root@localhost', 'roK20XGbWEsSM', 1, 1, current_timestamp, 1, current_timestamp);
 -- ----------------------------------------------------------
---  insert into table groups
+--  insert into table permission_groups
 -- ----------------------------------------------------------
-INSERT INTO groups (name, comments, valid_id, create_by, create_time, change_by, change_time)
+INSERT INTO permission_groups (name, comments, valid_id, create_by, create_time, change_by, change_time)
     VALUES
     ('users', 'Group for default access.', 1, 1, current_timestamp, 1, current_timestamp);
 -- ----------------------------------------------------------
---  insert into table groups
+--  insert into table permission_groups
 -- ----------------------------------------------------------
-INSERT INTO groups (name, comments, valid_id, create_by, create_time, change_by, change_time)
+INSERT INTO permission_groups (name, comments, valid_id, create_by, create_time, change_by, change_time)
     VALUES
     ('admin', 'Group of all administrators.', 1, 1, current_timestamp, 1, current_timestamp);
 -- ----------------------------------------------------------
---  insert into table groups
+--  insert into table permission_groups
 -- ----------------------------------------------------------
-INSERT INTO groups (name, comments, valid_id, create_by, create_time, change_by, change_time)
+INSERT INTO permission_groups (name, comments, valid_id, create_by, create_time, change_by, change_time)
     VALUES
     ('stats', 'Group for statistics access.', 1, 1, current_timestamp, 1, current_timestamp);
 -- ----------------------------------------------------------

diff --git a/scripts/database/otrs-initial_insert.xml b/scripts/database/otrs-initial_insert.xml
@@ -40,7 +40,7 @@
         <Data Key="change_time">current_timestamp</Data>
     </Insert>
 
-    <Insert Table="groups">
+    <Insert Table="permission_groups">
         <Data Key="id" Type="AutoIncrement">1</Data>
         <Data Key="name" Type="Quote">users</Data>
         <Data Key="comments" Type="Quote" Translatable="1">Group for default access.</Data>
@@ -50,7 +50,7 @@
         <Data Key="change_by">1</Data>
         <Data Key="change_time">current_timestamp</Data>
     </Insert>
-    <Insert Table="groups">
+    <Insert Table="permission_groups">
         <Data Key="id" Type="AutoIncrement">2</Data>
         <Data Key="name" Type="Quote">admin</Data>
         <Data Key="comments" Type="Quote" Translatable="1">Group of all administrators.</Data>
@@ -60,7 +60,7 @@
         <Data Key="change_by">1</Data>
         <Data Key="change_time">current_timestamp</Data>
     </Insert>
-    <Insert Table="groups">
+    <Insert Table="permission_groups">
         <Data Key="id" Type="AutoIncrement">3</Data>
         <Data Key="name" Type="Quote">stats</Data>
         <Data Key="comments" Type="Quote" Translatable="1">Group for statistics access.</Data>