From 33b3363ee9e1a9e47cae73642cea337a844cdc62 Mon Sep 17 00:00:00 2001
From: dairiki <dairiki@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Date: Sat, 18 Aug 2001 03:57:27 +0000
Subject: [PATCH] Fixed SF Bug #233898.  (MySQL backend insensitive to case in
 page names.)

Note that this involves a change to the MySQL schema.  A convenient
mysql script, schemas/update.mysql.1.2.0-1.2.1, is provided which can
be used to update your schema in-place.


git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/branches/release-1_2-branch@541 96ab9672-09ca-45d6-a79d-3d69d39ca109
---
 UPGRADING.readme                 | 16 ++++++++++++++++
 lib/mysql.php                    | 10 +++++-----
 schemas/schema.mysql             | 16 ++++++++--------
 schemas/update.mysql.1.2.0-1.2.1 | 26 ++++++++++++++++++++++++++
 4 files changed, 55 insertions(+), 13 deletions(-)
 create mode 100644 UPGRADING.readme
 create mode 100644 schemas/update.mysql.1.2.0-1.2.1

diff --git a/UPGRADING.readme b/UPGRADING.readme
new file mode 100644
index 000000000..fff4cd366
--- /dev/null
+++ b/UPGRADING.readme
@@ -0,0 +1,16 @@
+MySQL
+
+  The MySQL schema has changed since PhpWiki 1.2.0.
+
+  If you're upgrading from PhpWiki 1.2.0 and you use the MySQL back end,
+  you need to update the schema.
+
+  As long as you use the stock table names you can just do something like:
+
+    mysql -u <username> -p wiki < schemas/update.mysql.1.2.0-1.2.1
+
+  If you don't use the stock table names, look at the script in
+  schemas/update.mysql.1.2.0-1.2.1 and use it as a guide.
+
+ 
+
diff --git a/lib/mysql.php b/lib/mysql.php
index a008067d6..9d07f8ae0 100644
--- a/lib/mysql.php
+++ b/lib/mysql.php
@@ -1,4 +1,4 @@
-<?php rcs_id('$Id: mysql.php,v 1.10.2.1 2001-08-18 00:35:10 dairiki Exp $');
+<?php rcs_id('$Id: mysql.php,v 1.10.2.2 2001-08-18 03:57:27 dairiki Exp $');
 
    /*
       Database functions:
@@ -213,15 +213,15 @@
       $term = strtok($search, ' ');
       $clause = '';
       while($term) {
-         $word = "$term";
+         $word = strtolower("$term");
 	 if ($word[0] == '-') {
 	    $word = substr($word, 1);
-	    $clause .= "not ($column like '%$word%') ";
+	    $clause .= "not (LCASE($column) like '%$word%') ";
 	 } else {
-	    $clause .= "($column like '%$word%') ";
+	    $clause .= "(LCASE($column) like '%$word%') ";
 	 }
 	 if ($term = strtok(' '))
-	    $clause .= 'and ';
+	    $clause .= 'AND ';
       }
       return $clause;
    }
diff --git a/schemas/schema.mysql b/schemas/schema.mysql
index 7baef7b71..f9a9e78b8 100644
--- a/schemas/schema.mysql
+++ b/schemas/schema.mysql
@@ -1,4 +1,4 @@
--- $Id: schema.mysql,v 1.3 2000-09-23 14:31:38 ahollosi Exp $
+-- $Id: schema.mysql,v 1.3.2.1 2001-08-18 03:57:27 dairiki Exp $
 
 drop table if exists wiki;
 drop table if exists archive;
@@ -9,7 +9,7 @@ drop table if exists hottopics;
 
 
 CREATE TABLE wiki (
-        pagename VARCHAR(100) NOT NULL,
+        pagename VARCHAR(100) BINARY NOT NULL,
         version INT NOT NULL DEFAULT 1,
         flags INT NOT NULL DEFAULT 0,
         author VARCHAR(100),
@@ -21,7 +21,7 @@ CREATE TABLE wiki (
         );
 
 CREATE TABLE archive (
-        pagename VARCHAR(100) NOT NULL,
+        pagename VARCHAR(100) BINARY NOT NULL,
         version INT NOT NULL DEFAULT 1,
         flags INT NOT NULL DEFAULT 0,
         author VARCHAR(100),
@@ -33,19 +33,19 @@ CREATE TABLE archive (
         );
 
 CREATE TABLE wikilinks (
-        frompage VARCHAR(100) NOT NULL,
-        topage VARCHAR(100) NOT NULL,
+        frompage VARCHAR(100) BINARY NOT NULL,
+        topage VARCHAR(100) BINARY NOT NULL,
         PRIMARY KEY (frompage, topage)
         );
 
 CREATE TABLE hitcount (
-        pagename VARCHAR(100) NOT NULL,
+        pagename VARCHAR(100) BINARY NOT NULL,
         hits INT NOT NULL DEFAULT 0,
         PRIMARY KEY (pagename)
         );
 
 CREATE TABLE wikiscore (
-        pagename VARCHAR(100) NOT NULL,
+        pagename VARCHAR(100) BINARY NOT NULL,
         score INT NOT NULL DEFAULT 0,
         PRIMARY KEY (pagename)
         );
@@ -54,7 +54,7 @@ CREATE TABLE wikiscore (
 -- tables below are not yet used
 
 CREATE TABLE hottopics (                
-        pagename VARCHAR(100) NOT NULL,
+        pagename VARCHAR(100) BINARY NOT NULL,
         lastmodified INT NOT NULL,
         PRIMARY KEY (pagename, lastmodified)
         );
diff --git a/schemas/update.mysql.1.2.0-1.2.1 b/schemas/update.mysql.1.2.0-1.2.1
new file mode 100644
index 000000000..5df8542c8
--- /dev/null
+++ b/schemas/update.mysql.1.2.0-1.2.1
@@ -0,0 +1,26 @@
+-- $Id: update.mysql.1.2.0-1.2.1,v 1.1.2.1 2001-08-18 03:57:27 dairiki Exp $
+--
+-- This MySQL script should be used to update an existing MySQL PhpWiki database
+-- from the schema used in PhpWiki 1.2.0 to the schema used by PhpWiki 1.2.1.
+--
+ALTER TABLE wiki
+	CHANGE COLUMN pagename pagename VARCHAR(100) BINARY NOT NULL;
+
+ALTER TABLE archive
+	CHANGE COLUMN pagename pagename VARCHAR(100) BINARY NOT NULL;
+
+ALTER TABLE wikilinks
+	CHANGE COLUMN frompage frompage VARCHAR(100) BINARY NOT NULL,
+	CHANGE COLUMN topage topage VARCHAR(100) BINARY NOT NULL;
+
+ALTER TABLE hitcount
+	CHANGE COLUMN pagename pagename VARCHAR(100) BINARY NOT NULL;
+
+ALTER TABLE wikiscore
+	CHANGE COLUMN pagename pagename VARCHAR(100) BINARY NOT NULL;
+
+ALTER TABLE hottopics
+	CHANGE COLUMN pagename pagename VARCHAR(100) BINARY NOT NULL;
+
+
+
-- 
2.45.0