Bug 21073: DBRev 19.06.00.006

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

diff --git a/Koha.pm b/Koha.pm
index 1553fbd..bcea79a 100644 (file)
--- a/Koha.pm
+++ b/Koha.pm
@@ -29,7 +29,7 @@ use vars qw{ $VERSION };
 # - #4 : the developer version. The 4th number is the database subversion.
 #        used by developers when the database changes. updatedatabase take care of the changes itself
 #        and is automatically called by Auth.pm when needed.
-$VERSION = "19.06.00.005";
+$VERSION = "19.06.00.006";
 
 sub version {
     return $VERSION;

diff --git a/installer/data/mysql/atomicupdate/plugin_methods.perl b/installer/data/mysql/atomicupdate/plugin_methods.perl
deleted file mode 100644 (file)
index 6d10bf2..0000000
--- a/installer/data/mysql/atomicupdate/plugin_methods.perl
+++ /dev/null
@@ -1,19 +0,0 @@
-$DBversion = 'XXX';
-if( CheckVersion( $DBversion ) ) {
-
-    unless ( TableExists('plugin_methods') ) {
-        $dbh->do(q{
-            CREATE TABLE plugin_methods (
-              plugin_class varchar(255) NOT NULL,
-              plugin_method varchar(255) NOT NULL,
-              PRIMARY KEY ( `plugin_class` (191), `plugin_method` (191) )
-            ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
-        });
-    }
-
-    require Koha::Plugins;
-    Koha::Plugins->new({ enable_plugins => 1 })->InstallPlugins;
-
-    SetVersion( $DBversion );
-    print "Upgrade to $DBversion done (Bug 21073 - Improve plugin performance)\n";
-}

diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index 912ba23..79a03c6 100644 (file)
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -3536,7 +3536,7 @@ CREATE TABLE patron_consent (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 
 --
--- Table structure for table 'plugin_data'
+-- Table structure for table 'plugin_methods'
 --
 
 DROP TABLE IF EXISTS plugin_methods;

diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index e22b1a3..d4aaa16 100755 (executable)
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -18741,6 +18741,26 @@ if( CheckVersion( $DBversion ) ) {
     print "Upgrade to $DBversion done (Bug 9834 - Add the reserves.item_level_hold column)\n";
 }
 
+$DBversion = '19.06.00.006';
+if( CheckVersion( $DBversion ) ) {
+
+    unless ( TableExists('plugin_methods') ) {
+        $dbh->do(q{
+            CREATE TABLE plugin_methods (
+              plugin_class varchar(255) NOT NULL,
+              plugin_method varchar(255) NOT NULL,
+              PRIMARY KEY ( `plugin_class` (191), `plugin_method` (191) )
+            ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+        });
+    }
+
+    require Koha::Plugins;
+    Koha::Plugins->new({ enable_plugins => 1 })->InstallPlugins;
+
+    SetVersion( $DBversion );
+    print "Upgrade to $DBversion done (Bug 21073 - Improve plugin performance)\n";
+}
+
 # SEE bug 13068
 # if there is anything in the atomicupdate, read and execute it.
 my $update_dir = C4::Context->config('intranetdir') . '/installer/data/mysql/atomicupdate/';