Changeset 431 for wiki-toolkit/trunk/lib/Wiki/Toolkit/Setup/Pg.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/Pg.pm (modified) (9 diffs)

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

@@ -14 +14 @@
 
 my %create_sql = (
-        schema_info => [ qq|
+    schema_info => [ qq|
 CREATE TABLE schema_info (
   version   integer      NOT NULL default 0
@@ -75 +75 @@
 
 my %upgrades = (
-        old_to_8 => [ qq|
+    old_to_8 => [ qq|
 CREATE SEQUENCE node_seq;
 ALTER TABLE node ADD COLUMN id INTEGER;
@@ -91 +91 @@
 ALTER TABLE content ADD COLUMN node_id INTEGER;
 UPDATE content SET node_id = 
-        (SELECT id FROM node where node.name = content.name)
+    (SELECT id FROM node where node.name = content.name)
 |, qq|
 DELETE FROM content WHERE node_id IS NULL;
@@ -103 +103 @@
 ALTER TABLE metadata ADD COLUMN node_id INTEGER;
 UPDATE metadata SET node_id = 
-        (SELECT id FROM node where node.name = metadata.node)
+    (SELECT id FROM node where node.name = metadata.node)
 |, qq|
 DELETE FROM metadata WHERE node_id IS NULL;
@@ -192 +192 @@
     }
 
-        # Do we need to upgrade the schema of existing tables?
-        # (Don't check if no tables currently exist)
-        my $upgrade_schema;
-        if(scalar keys %tables > 0) {
-                $upgrade_schema = Wiki::Toolkit::Setup::Database::get_database_upgrade_required($dbh,$VERSION);
-        } else {
-                print "Skipping schema upgrade check - no tables found\n";
-        }
-
-        # Set up tables if not found
+    # Do we need to upgrade the schema of existing tables?
+    # (Don't check if no tables currently exist)
+    my $upgrade_schema;
+    if(scalar keys %tables > 0) {
+        $upgrade_schema = Wiki::Toolkit::Setup::Database::get_database_upgrade_required($dbh,$VERSION);
+    } else {
+        print "Skipping schema upgrade check - no tables found\n";
+    }
+
+    # Set up tables if not found
     foreach my $required ( reverse sort keys %create_sql ) {
         if ( $tables{$required} ) {
@@ -213 +213 @@
     }
 
-        # Do the upgrade if required
-        if($upgrade_schema) {
-                print "Upgrading schema: $upgrade_schema\n";
-                my @updates = @{$upgrades{$upgrade_schema}};
-                foreach my $update (@updates) {
-                        if(ref($update) eq "CODE") {
-                                &$update($dbh);
-                        } elsif(ref($update) eq "ARRAY") {
-                                foreach my $nupdate (@$update) {
-                                        $dbh->do($nupdate);
-                                }
-                        } else {
-                                $dbh->do($update);
-                        }
-                }
-        }
+    # Do the upgrade if required
+    if($upgrade_schema) {
+        print "Upgrading schema: $upgrade_schema\n";
+        my @updates = @{$upgrades{$upgrade_schema}};
+        foreach my $update (@updates) {
+            if(ref($update) eq "CODE") {
+                &$update($dbh);
+            } elsif(ref($update) eq "ARRAY") {
+                foreach my $nupdate (@$update) {
+                    $dbh->do($nupdate);
+                }
+            } else {
+                $dbh->do($update);
+            }
+        }
+    }
 
     # Clean up if we made our own dbh.
@@ -300 +300 @@
         if ( $args{dbh} ) {
             return $args{dbh};
-        } else {
+    } else {
             return _make_dbh( %args );
         }
@@ -325 +325 @@
         if ( $args{dbh} ) {
             return 0;
-        } else {
+    } else {
             return 1;
         }
@@ -339 +339 @@
     $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;
 }