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

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

@@ -13 +13 @@
 use Carp;
 
-my %create_sql = (
-    schema_info => "
+my $SCHEMA_VERSION = $VERSION*100;
+
+my $create_sql = {
+    9 => {
+        schema_info => [ qq|
 CREATE TABLE schema_info (
   version   integer      NOT NULL default 0
 );
-",
-
-    node => "
+|, qq|
+INSERT INTO schema_info VALUES (9)
+| ],
+
+        node => [ qq|
 CREATE TABLE node (
   id        integer      NOT NULL PRIMARY KEY AUTOINCREMENT,
@@ -29 +34 @@
   moderate  boolean      NOT NULL default '0'
 )
-",
-    content => "
+| ],
+        content => [ qq|
 CREATE TABLE content (
   node_id   integer      NOT NULL,
@@ -40 +45 @@
   PRIMARY KEY (node_id, version)
 )
-",
-    internal_links => "
+| ],
+        internal_links => [ qq|
 CREATE TABLE internal_links (
   link_from varchar(200) NOT NULL default '',
@@ -47 +52 @@
   PRIMARY KEY (link_from, link_to)
 )
-",
-    metadata => "
+| ],
+        metadata => [ qq|
 CREATE TABLE metadata (
   node_id        integer      NOT NULL,
@@ -55 +60 @@
   metadata_value mediumtext   NOT NULL DEFAULT ''
 )
-"
-);
+| ]
+    },
+};
 
 =head1 NAME
@@ -94 +100 @@
 again with a fresh database, run C<cleardb> first.
 
+An optional second argument may be passed specifying the schema version
+to use; this is B<ONLY> intended to be used during unit testing and should
+not normally be specified.
+
 =cut
 
@@ -100 +110 @@
     my $dbh = _get_dbh( @args );
     my $disconnect_required = _disconnect_required( @args );
+    my $wanted_schema = _get_wanted_schema( @args ) || $SCHEMA_VERSION;
 
     # Check whether tables exist, set them up if not.
@@ -109 +120 @@
     my @cur_data; 
     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);
     }
     if($upgrade_schema) {
@@ -124 +135 @@
 
     # Set up tables if not found
-    foreach my $required ( keys %create_sql ) {
+    foreach my $required ( keys %{$create_sql->{$SCHEMA_VERSION}} ) {
         if ( $tables{$required} ) {
             print "Table $required already exists... skipping...\n";
         } else {
             print "Creating table $required... done\n";
-            $dbh->do($create_sql{$required}) or croak $dbh->errstr;
+            foreach my $sql (@{$create_sql->{$SCHEMA_VERSION}->{$required}} ) {
+                $dbh->do($sql) or croak $dbh->errstr;
+            }
         }
     }
-
-    # Schema version
-    $dbh->do("DELETE FROM schema_info");
-    $dbh->do("INSERT INTO schema_info VALUES (". ($VERSION*100) .")");
 
     # If upgrading, load in the new data
@@ -153 +162 @@
     my $sql = "SELECT name FROM sqlite_master
                WHERE type='table' AND name 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;
@@ -195 +204 @@
     my $sql = "SELECT name FROM sqlite_master
                WHERE type='table' AND name 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]") or croak $dbh->errstr;
@@ -216 +225 @@
         if ( $args{dbh} ) {
             return $args{dbh};
-    } else {
+        } else {
             return _make_dbh( %args );
         }
@@ -223 +232 @@
     # Args passed as list of connection details.
     return _make_dbh( dbname => $_[0] );
+}
+
+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];
 }
 
@@ -236 +261 @@
         if ( $args{dbh} ) {
             return 0;
-    } else {
+        } else {
             return 1;
         }