From: Tomas Cohen Arazi <tomascohen@gmail.com>
Date: Tue, 13 Jan 2015 16:13:02 +0000 (-0300)
Subject: Bug 11944: DBRev 3.19.00.006
X-Git-Tag: v3.20.00-beta~781
X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=commitdiff_plain;h=43d59de56d2955766d2abf46c710edba9ae1ff52;p=srvgit

Bug 11944: DBRev 3.19.00.006

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
---

diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index a778ddd8c6..4653c02e80 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -9579,19 +9579,6 @@ if ( CheckVersion($DBversion) ) {
     SetVersion($DBversion);
 }
 
-$DBversion = "3.19.00.XXX";
-if ( CheckVersion($DBversion) ) {
-    $dbh->do(q|SET foreign_key_checks = 0|);;
-    my @tables = $dbh->tables();
-    for my $table ( @tables ) {
-        $dbh->do(qq|ALTER TABLE $table CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci|);
-    }
-    $dbh->do(q|SET foreign_key_checks = 1|);;
-
-    print "Upgrade to $DBversion done (Bug 11944 - Convert DB tables to utf8_unicode_ci)\n";
-    SetVersion ($DBversion);
-}
-
 $DBversion = "3.19.00.000";
 if ( CheckVersion($DBversion) ) {
     print "Upgrade to $DBversion done (there's life after 3.18)\n";
@@ -9669,6 +9656,19 @@ if(CheckVersion($DBversion)) {
     SetVersion($DBversion);
 }
 
+$DBversion = "3.19.00.006";
+if ( CheckVersion($DBversion) ) {
+    $dbh->do(q|SET foreign_key_checks = 0|);;
+    my @tables = $dbh->tables();
+    for my $table ( @tables ) {
+        $dbh->do(qq|ALTER TABLE $table CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci|);
+    }
+    $dbh->do(q|SET foreign_key_checks = 1|);;
+
+    print "Upgrade to $DBversion done (Bug 11944 - Convert DB tables to utf8_unicode_ci)\n";
+    SetVersion ($DBversion);
+}
+
 =head1 FUNCTIONS
 
 =head2 TableExists($table)
diff --git a/kohaversion.pl b/kohaversion.pl
index 52acd3d485..bee3709f64 100644
--- a/kohaversion.pl
+++ b/kohaversion.pl
@@ -17,7 +17,7 @@ the kohaversion is divided in 4 parts :
 use strict;
 
 sub kohaversion {
-    our $VERSION = '3.19.00.005';
+    our $VERSION = '3.19.00.006';
     # version needs to be set this way
     # so that it can be picked up by Makefile.PL
     # during install