Changeset 450

Timestamp:

07/12/08 01:49:47 (4 years ago)

Author:

dom

Message:

Cater for the case where the index being added in MySQL schema 10 was manually created in the database beforehand

Location:

wiki-toolkit/trunk

Files:

• lib/Wiki/Toolkit/Setup/MySQL.pm (modified) (2 diffs)
• t/400_upgrade.t (modified) (3 diffs)

wiki-toolkit/trunk/lib/Wiki/Toolkit/Setup/MySQL.pm

@@ -179 +179 @@
 
 my %upgrades = (
-'9_to_10' => [ qq|
-CREATE UNIQUE INDEX node_name ON node (name)
-|, qq|
+    '9_to_10' => [ sub {
+        my $dbh = shift;
+        my $sth = $dbh->prepare('SHOW INDEX FROM node WHERE key_name="node_name"');
+        $sth->execute();
+        unless ( $sth->rows ) {
+            $dbh->do('CREATE UNIQUE INDEX node_name ON node (name)')
+                or croak $dbh->errstr;
+        }
+    },
+    qq|
 ALTER TABLE content ADD COLUMN verified datetime default NULL
 |, qq|
@@ -187 +194 @@
 |, qq|
 UPDATE schema_info SET version = 10
-|
-],
+| ]
+
 );
 

wiki-toolkit/trunk/t/400_upgrade.t

@@ -31 +31 @@
 use Wiki::Toolkit::Setup::SQLite;
 
+my $num_mysql_only_tests = 0;
+my @mysql_databases;
+
 foreach my $db (@configured_databases) {
     my $setup_class = $db->{setup_class};
@@ -42 +45 @@
         push @schemas_to_test, $schema if $schema < $current_schema;
     }
+    if ( $db->{dsn} =~ /mysql/i ) {
+        $num_mysql_only_tests = 2;
+        push @mysql_databases, $db;
+    }
 }
 
-plan tests => scalar @schemas_to_test * scalar @configured_databases * 2;
+my $num_tests = (scalar @schemas_to_test * scalar @configured_databases * 2) + $num_mysql_only_tests;
+plan tests => $num_tests;
 
 foreach my $database (@configured_databases) {
@@ -92 +100 @@
     }
 }
+
+if ( $num_mysql_only_tests ) {
+    foreach my $database ( @mysql_databases ) {
+        my $setup_class = $database->{setup_class};
+        my $current_schema;
+        {
+            no strict 'refs';
+            $current_schema = eval ${$setup_class . '::SCHEMA_VERSION'};
+        }
+        # Set up database with old schema
+        my $params = $database->{params};
+        $params->{wanted_schema} = 9;
+
+        {
+            no strict 'refs';
+            eval &{$setup_class . '::cleardb'} ( $params );
+            eval &{$setup_class . '::setup'} ( $params );
+        }
+
+        my $class = $database->{class};
+        eval "require $class";
+
+        my $dsn = $database->{dsn};
+
+        my $dbh = DBI->connect($dsn, $params->{dbuser}, $params->{dbpass});
+        
+        # Manually create index that the upgrade also wants to create
+        eval { $dbh->do('CREATE UNIQUE INDEX node_name ON node (name);') };
+        is( $@, '', "Manually creating confusing index didn't die" );
+
+        # Now upgrade
+        delete $params->{wanted_schema};
+        {
+            no strict 'refs';
+            eval &{$setup_class . '::setup'} ( $params );
+            is( $@, '', "Upgrade didn't die even though node_name index had been created manually" );
+        }
+    }
+}
+