Changeset 319

Timestamp:

06/02/06 19:40:31 (6 years ago)

Author:

dom

Message:

Check that we can do all we need to when upgrading MySQL database (closes #8)

Location:

wiki-toolkit/trunk

Files:

• Changes (modified) (1 diff)
• lib/Wiki/Toolkit/Setup/Database.pm (modified) (1 diff)
• lib/Wiki/Toolkit/Setup/MySQL.pm (modified) (1 diff)

wiki-toolkit/trunk/Changes

@@ -1 +1 @@
 0.69_04
-        Feed code being refactored.
+        Feed code has been refactored.
         Check that the database schema is up-to-date when initializing the
-        store and abort otherwise.
+          store and abort otherwise.
         In PostgresSQL setup code, delete orphaned content/metadata rows.
+        When we bulk delete and insert data for an upgrade, check to make
+          sure we can create the tables and indexes before dropping the old
+          tables.
 
 0.69_03 13 May 2006
         Add Wiki::Toolkit::Feed::RSS (formerly CGI::Wiki::Plugin::RSS::Modwiki)
-        and Wiki::Toolkit::Feed::Atom (formerly CGI::Wiki::Plugin::Atom)
+          and Wiki::Toolkit::Feed::Atom (formerly CGI::Wiki::Plugin::Atom)
 
 0.69_02 27 April 2006
         Add missing new file lib/Wiki/Toolkit/Setup/Database.pm to
-        distribution.
+          distribution.
 
 0.69_01 23 April 2006

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

@@ -254 +254 @@
     print "done\n";
 }
+
+sub perm_check {
+    my $dbh = shift;
+    # If we can do all this, we'll be able to do a bulk upgrade too
+    eval {
+        my $sth = $dbh->prepare("CREATE TABLE dbtest (test int)");
+        $sth->execute;
+
+        $sth = $dbh->prepare("CREATE INDEX dbtest_index ON dbtest (test)");
+        $sth->execute;
+
+        $sth = $dbh->prepare("DROP TABLE dbtest");
+        $sth->execute;
+    };
+    return $@;
+}

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

@@ -130 +130 @@
                 if($@) { warn $@; }
 
+        # Check to make sure we can create, index and drop tables
+        # before doing any more
+        my $perm_check = Wiki::Toolkit::Setup::Database::perm_check($dbh);
+        if ($perm_check) {
+            die $perm_check;
+        }
+        
                 # Drop the current tables
                 cleardb($dbh);