Changeset 263

Timestamp:

11/01/03 21:38:33 (5 years ago)

Author:

kake

Message:

Allow SQLite databases, fixed navbar prompt bug, bumped version number

Location:

trunk

Files:

• Build.PL (modified) (4 diffs)
• Changes (modified) (1 diff)
• lib/OpenGuides.pm (modified) (1 diff)
• lib/OpenGuides/Utils.pm (modified) (1 diff)
• wiki.cgi (modified) (1 diff)

trunk/Build.PL

@@ -97 +97 @@
 my @answers;
 
-# Database type is speshull - can be one of two.
+# Database type is speshull - can be one of three.
 my $dbtype;
-my $dbtype_qu = "what type of database do you want the site to run on?  postgres/mysql";
+my $dbtype_qu = "what type of database do you want the site to run on?  postgres/mysql/sqlite";
 if ( $skip_config ) {
     $dbtype = $existing_config{dbtype} || "postgres";
@@ -109 +109 @@
         $dbtype =~ s/^\s*//;
         $dbtype =~ s/\s*$//;
-        unless ( $dbtype eq "postgres" or $dbtype eq "mysql" ) {
+        unless ( $dbtype eq "postgres" or $dbtype eq "mysql"
+                 or $dbtype eq "sqlite" ) {
             undef $dbtype;
         }
@@ -117 +118 @@
 # Check they have the relevant DBD driver installed.
 my %drivers = ( postgres => "DBD::Pg",
-                mysql    => "DBD::mysql" );
+                mysql    => "DBD::mysql",
+                sqlite   => "DBD::SQLite",
+              );
 eval "require $drivers{$dbtype}";
 die "$drivers{$dbtype} is needed to run a $dbtype database" if $@;
@@ -131 +134 @@
     my $def = $existing_config{$var} || $qset->{default};
     my $val = $def;
+
+    if ( $dbtype eq "sqlite" and $var eq "dbname" ) {
+        $qu = "what's the full filename of the SQLite database this site runs on?";
+    }
+
+    if ( $dbtype eq "sqlite" and
+         ( $var eq "dbuser" or $var eq "dbpass" or $var eq "dbhost" )
+       ) {
+        print "$var not relevant for SQLite... skipping...\n";
+        push @answers, { question => $qu,
+                         variable => $var,
+                         value    => "not-used" };
+        next;
+    }
+
     unless ( $skip_config ) {
         if ( $type eq "y_n" ) {
+            $def = $def ? "y" : "n";
             $val = Module::Build->y_n("\n$qu ", $def);
         } else {

trunk/Changes

@@ +1 @@
+0.28    
+        Allow running sites on SQLite databases.
+        Fixed bug with navbar prompt in Build.PL (CPAN RT #3894).
+
 0.27    1 November 2003
         Fixed bug with category/locale indexing - no longer case-sensitive.

trunk/lib/OpenGuides.pm

@@ -4 +4 @@
 use vars qw( $VERSION );
 
-$VERSION = '0.27';
+$VERSION = '0.28';
 
 =head1 NAME

trunk/lib/OpenGuides/Utils.pm

@@ -59 +59 @@
                           postgres => "Pg",
                           mysql    => "MySQL",
-                          sqlite   => "SQLite", # used for testing
+                          sqlite   => "SQLite",
                         );
 

trunk/wiki.cgi

@@ -5 +5 @@
 
 use vars qw( $VERSION );
-$VERSION = '0.27';
+$VERSION = '0.28';
 
 use CGI qw/:standard/;