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

Timestamp:

05/26/08 19:44:26 (4 years ago)

Author:

dom

Message:

Move to new schema version 10, including some missing indexes
and support for deletion flags and verified flags. Note that
the code using these columns has not yet been written (closes #25, #34).

Files:

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

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

@@ -8 +8 @@
 
 @ISA = qw( Wiki::Toolkit::Setup::Database );
-$VERSION = '0.09';
+$VERSION = '0.10';
 
 use DBI;
@@ -105 +105 @@
 | ]
     },
+    10 => {
+        schema_info => [ qq|
+CREATE TABLE schema_info (
+  version   integer      NOT NULL default 0
+); 
+|, qq|
+INSERT INTO schema_info VALUES (10)
+| ],
+
+        node => [ qq|
+CREATE TABLE node (
+  id        integer      NOT NULL PRIMARY KEY AUTOINCREMENT,
+  name      varchar(200) NOT NULL DEFAULT '',
+  version   integer      NOT NULL default 0,
+  text      mediumtext   NOT NULL default '',
+  modified  datetime     default NULL,
+  moderate  boolean      NOT NULL default '0',
+  deleted   boolean      NOT NULL default '0'
+) 
+|, qq|
+CREATE UNIQUE INDEX node_name ON node (name)
+|, qq|
+CREATE INDEX node_deleted_index ON node (deleted)
+| ],
+        content => [ qq|
+CREATE TABLE content (
+  node_id   integer      NOT NULL,
+  version   integer      NOT NULL default 0,
+  text      mediumtext   NOT NULL default '',
+  modified  datetime     default NULL,
+  comment   mediumtext   NOT NULL default '',
+  moderated boolean      NOT NULL default '1',
+  deleted   boolean      NOT NULL default '0',
+  verified  datetime     default NULL,
+  PRIMARY KEY (node_id, version)
+) 
+|, qq|
+CREATE INDEX content_deleted_index ON content (deleted)
+| ],
+        internal_links => [ qq|
+CREATE TABLE internal_links (
+  link_from varchar(200) NOT NULL default '',
+  link_to   varchar(200) NOT NULL default '',
+  deleted   boolean      NOT NULL default '0',
+  PRIMARY KEY (link_from, link_to)
+) 
+|, qq|
+CREATE INDEX internal_links_deleted_index ON internal_links (deleted)
+| ],
+        metadata => [ qq|
+CREATE TABLE metadata (
+  node_id        integer      NOT NULL,
+  version        integer      NOT NULL default 0,
+  metadata_type  varchar(200) NOT NULL DEFAULT '',
+  metadata_value mediumtext   NOT NULL DEFAULT '',
+  deleted        boolean      NOT NULL DEFAULT '0'
+) 
+|, qq|
+CREATE INDEX metadata_deleted_index ON metadata (deleted)
+| ] 
+    },
 };
+
+my %fetch_upgrades = (
+    old_to_8  => 1,
+    old_to_9  => 1,
+    old_to_10 => 1,
+    '8_to_9'  => 1,
+    '8_to_10' => 1,
+    '9_to_10' => 1,
+);
+
+my %upgrades = ();
 
 =head1 NAME
@@ -169 +241 @@
     }
     if($upgrade_schema) {
-        # Grab current data
-        print "Upgrading: $upgrade_schema\n";
-        @cur_data = eval("&Wiki::Toolkit::Setup::Database::fetch_upgrade_".$upgrade_schema."(\$dbh)");
-
-        # Drop the current tables
-        cleardb($dbh);
-
-        # Grab new list of tables
-        %tables = fetch_tables_listing($dbh, $wanted_schema);
+        if ($fetch_upgrades{$upgrade_schema}) {
+            # Grab current data
+            print "Upgrading: $upgrade_schema\n";
+            @cur_data = eval("&Wiki::Toolkit::Setup::Database::fetch_upgrade_".$upgrade_schema."(\$dbh)");
+
+            # Drop the current tables
+            cleardb($dbh);
+
+            # Grab new list of tables
+            %tables = fetch_tables_listing($dbh, $wanted_schema);
+        }
     }
 
@@ -194 +268 @@
     # If upgrading, load in the new data
     if($upgrade_schema) {
-        Wiki::Toolkit::Setup::Database::bulk_data_insert($dbh,@cur_data);
+        if ($fetch_upgrades{$upgrade_schema}) {
+            Wiki::Toolkit::Setup::Database::bulk_data_insert($dbh,@cur_data);
+        } else {
+            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);
+                }
+            } 
+        }
     }