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

Timestamp:

05/11/08 17:04:41 (4 years ago)

Author:

dom

Message:

fix much tab/whitespace damage; no functional changes.

Files:

• wiki-toolkit/trunk/lib/Wiki/Toolkit/Setup/MySQL.pm (modified) (9 diffs)

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

@@ -14 +14 @@
 
 my %create_sql = (
-        schema_info => [ qq|
+    schema_info => [ qq|
 CREATE TABLE schema_info (
   version   int(10)      NOT NULL default 0
@@ -117 +117 @@
     my %tables = fetch_tables_listing($dbh);
 
-        # Do we need to upgrade the schema of existing tables?
-        # (Don't check if no tables currently exist)
-        my $upgrade_schema;
-        my @cur_data;
-        if(scalar keys %tables > 0) {
-                $upgrade_schema = Wiki::Toolkit::Setup::Database::get_database_upgrade_required($dbh,$VERSION);
-        }
-        if($upgrade_schema) {
-                # Grab current data
-                print "Upgrading: $upgrade_schema\n";
-                @cur_data = eval("&Wiki::Toolkit::Setup::Database::fetch_upgrade_".$upgrade_schema."(\$dbh)");
-                if($@) { warn $@; }
+    # Do we need to upgrade the schema of existing tables?
+    # (Don't check if no tables currently exist)
+    my $upgrade_schema;
+    my @cur_data;
+    if(scalar keys %tables > 0) {
+        $upgrade_schema = Wiki::Toolkit::Setup::Database::get_database_upgrade_required($dbh,$VERSION);
+    }
+    if($upgrade_schema) {
+        # Grab current data
+        print "Upgrading: $upgrade_schema\n";
+        @cur_data = eval("&Wiki::Toolkit::Setup::Database::fetch_upgrade_".$upgrade_schema."(\$dbh)");
+        if($@) { warn $@; }
 
         # Check to make sure we can create, index and drop tables
@@ -137 +137 @@
         }
         
-                # Drop the current tables
-                cleardb($dbh);
-
-                # Grab new list of tables
-                %tables = fetch_tables_listing($dbh);
-        }
-
-        # Set up tables if not found
+        # Drop the current tables
+        cleardb($dbh);
+
+        # Grab new list of tables
+        %tables = fetch_tables_listing($dbh);
+    }
+
+    # Set up tables if not found
     foreach my $required ( keys %create_sql ) {
         if ( $tables{$required} ) {
@@ -156 +156 @@
     }
 
-        # If upgrading, load in the new data
-        if($upgrade_schema) {
-                Wiki::Toolkit::Setup::Database::bulk_data_insert($dbh,@cur_data);
-        }
+    # If upgrading, load in the new data
+    if($upgrade_schema) {
+        Wiki::Toolkit::Setup::Database::bulk_data_insert($dbh,@cur_data);
+    }
 
     # Clean up if we made our own dbh.
@@ -167 +167 @@
 # Internal method - what Wiki::Toolkit tables are defined?
 sub fetch_tables_listing {
-        my $dbh = shift;
+    my $dbh = shift;
 
     # Check what tables exist
@@ -176 +176 @@
         exists $create_sql{$table} and $tables{$table} = 1;
     }
-        return %tables;
+    return %tables;
 }
 
@@ -234 +234 @@
         if ( $args{dbh} ) {
             return $args{dbh};
-        } else {
+    } else {
             return _make_dbh( %args );
         }
@@ -259 +259 @@
         if ( $args{dbh} ) {
             return 0;
-        } else {
+    } else {
             return 1;
         }
@@ -273 +273 @@
     $dsn .= ";host=$args{dbhost}" if $args{dbhost};
     my $dbh = DBI->connect($dsn, $args{dbuser}, $args{dbpass},
-                           { PrintError => 1, RaiseError => 1,
-                             AutoCommit => 1 } )
-      or croak DBI::errstr;
+               { PrintError => 1, RaiseError => 1,
+                 AutoCommit => 1 } )
+        or croak DBI::errstr;
     return $dbh;
 }