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

Timestamp:

05/11/08 20:24:34 (4 years ago)

Author:

dom

Message:

Refactor database setup code to support setting up old schema versions and
add wiki_info method to TestLib?, both to facilitiate automated schema upgrade
testing.

Files:

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

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

@@ -13 +13 @@
 use Carp;
 
-my %create_sql = (
-    schema_info => [ qq|
+my $SCHEMA_VERSION = $VERSION*100;
+
+my $create_sql = {
+    9 => {
+        schema_info => [ qq|
 CREATE TABLE schema_info (
   version   integer      NOT NULL default 0
 )
 |, qq|
-INSERT INTO schema_info VALUES (|.($VERSION*100).qq|)
+INSERT INTO schema_info VALUES (9)
 | ],
 
-    node => [ qq|
+        node => [ qq|
 CREATE SEQUENCE node_seq
 |, qq|
@@ -38 +41 @@
 | ],
 
-    content => [ qq|
+        content => [ qq|
 CREATE TABLE content (
   node_id   integer      NOT NULL,
@@ -51 +54 @@
 | ],
 
-    internal_links => [ qq|
+        internal_links => [ qq|
 CREATE TABLE internal_links (
   link_from varchar(200) NOT NULL default '',
@@ -60 +63 @@
 | ],
 
-    metadata => [ qq|
+        metadata => [ qq|
 CREATE TABLE metadata (
   node_id        integer      NOT NULL,
@@ -71 +74 @@
 CREATE INDEX metadata_index ON metadata (node_id, version, metadata_type, metadata_value)
 | ]
-
-);
+    },
+};
 
 my %upgrades = (
@@ -180 +183 @@
     my $dbh = _get_dbh( @args );
     my $disconnect_required = _disconnect_required( @args );
+    my $wanted_schema = _get_wanted_schema( @args ) || $SCHEMA_VERSION;
 
     # Check whether tables exist
     my $sql = "SELECT tablename FROM pg_tables
                WHERE tablename in ("
-            . join( ",", map { $dbh->quote($_) } keys %create_sql ) . ")";
+            . join( ",", map { $dbh->quote($_) } keys %{$create_sql->{$SCHEMA_VERSION}} ) . ")";
     my $sth = $dbh->prepare($sql) or croak $dbh->errstr;
     $sth->execute;
     my %tables;
     while ( my $table = $sth->fetchrow_array ) {
-        exists $create_sql{$table} and $tables{$table} = 1;
+        exists $create_sql->{$SCHEMA_VERSION}->{$table} and $tables{$table} = 1;
     }
 
@@ -196 +200 @@
     my $upgrade_schema;
     if(scalar keys %tables > 0) {
-        $upgrade_schema = Wiki::Toolkit::Setup::Database::get_database_upgrade_required($dbh,$VERSION);
+        $upgrade_schema = Wiki::Toolkit::Setup::Database::get_database_upgrade_required($dbh,$wanted_schema);
     } else {
         print "Skipping schema upgrade check - no tables found\n";
@@ -202 +206 @@
 
     # Set up tables if not found
-    foreach my $required ( reverse sort keys %create_sql ) {
+    foreach my $required ( reverse sort keys %{$create_sql->{$SCHEMA_VERSION}} ) {
         if ( $tables{$required} ) {
             print "Table $required already exists... skipping...\n";
         } else {
             print "Creating table $required... done\n";
-            foreach my $sql ( @{ $create_sql{$required} } ) {
+            foreach my $sql ( @{ $create_sql->{$SCHEMA_VERSION}->{$required} } ) {
                 $dbh->do($sql) or croak $dbh->errstr;
             }
@@ -272 +276 @@
     my $sql = "SELECT tablename FROM pg_tables
                WHERE tablename in ("
-            . join( ",", map { $dbh->quote($_) } keys %create_sql ) . ")";
+            . join( ",", map { $dbh->quote($_) } keys %{$create_sql->{$SCHEMA_VERSION}} ) . ")";
     foreach my $tableref (@{$dbh->selectall_arrayref($sql)}) {
         $dbh->do("DROP TABLE $tableref->[0] CASCADE") or croak $dbh->errstr;
@@ -312 +316 @@
                       dbhost => $_[3],
                     );
+}
+
+sub _get_wanted_schema {
+    # Database handle passed in.
+    if ( ref $_[0] and ref $_[0] eq 'DBI::db' ) {
+        return undef;
+    }
+
+    # Args passed as hashref.
+    if ( ref $_[0] and ref $_[0] eq 'HASH' ) {
+        my %args = %{$_[0]};
+        return $args{wanted_schema};
+    }
+
+    # Args passed as list of connection details.
+    return $_[1];
 }