From: Greg Sabino Mullane <greg@users.mediawiki.org>
Date: Thu, 29 Jun 2006 01:44:12 +0000 (+0000)
Subject: Add searchindex table back in, lots of reformatting.
X-Git-Tag: 1.31.0-rc.0~56534
X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=acb0fb5b7dcdd31c19e686769cb5e951639437cf;p=lhc%2Fweb%2Fwiklou.git

Add searchindex table back in, lots of reformatting.
---

diff --git a/maintenance/postgres/tables.sql b/maintenance/postgres/tables.sql
index edd3754ead..bea7334db2 100644
--- a/maintenance/postgres/tables.sql
+++ b/maintenance/postgres/tables.sql
@@ -2,7 +2,7 @@
 -- This is read and executed by the install script; you should
 -- not have to run it by itself unless doing a manual install.
 -- This is the PostgreSQL version.
--- For information about each table, please see the notes in ../tables.sql
+-- For information about each table, please see the notes in maintenance/tables.sql
 -- Please make sure all dollar-quoting uses $mw$ at the start of the line
 -- We can't use SERIAL everywhere: the sequence names are hard-coded into the PHP
 -- TODO: Change CHAR to BOOL, TEXT to CIDR, allow custom schema
@@ -11,8 +11,8 @@ SET client_min_messages = 'ERROR';
 
 CREATE SEQUENCE user_user_id_seq MINVALUE 0 START WITH 0;
 CREATE TABLE "user" (
-  user_id                   INTEGER NOT NULL PRIMARY KEY DEFAULT nextval('user_user_id_seq'),
-  user_name                 TEXT NOT NULL UNIQUE,
+  user_id                   INTEGER  NOT NULL  PRIMARY KEY DEFAULT nextval('user_user_id_seq'),
+  user_name                 TEXT     NOT NULL  UNIQUE,
   user_real_name            TEXT,
   user_password             TEXT,
   user_newpassword          TEXT,
@@ -25,38 +25,43 @@ CREATE TABLE "user" (
   user_touched              TIMESTAMPTZ,
   user_registration         TIMESTAMPTZ
 );
-CREATE INDEX user_email_token_idx ON "user"(user_email_token);
+CREATE INDEX user_email_token_idx ON "user" (user_email_token);
+
+-- Create a dummy user to satisfy fk contraints especially with revisions
+INSERT INTO "user" VALUES
+  (DEFAULT,'Anonymous','',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,now(),now());
 
 CREATE TABLE user_groups (
-  ug_user   INTEGER NULL REFERENCES "user"(user_id) ON DELETE CASCADE,
-  ug_group  TEXT NOT NULL
+  ug_user   INTEGER      NULL  REFERENCES "user"(user_id) ON DELETE CASCADE,
+  ug_group  TEXT     NOT NULL
 );
-CREATE UNIQUE INDEX user_groups_unique ON user_groups(ug_group, ug_user);
+CREATE UNIQUE INDEX user_groups_unique ON user_groups (ug_group, ug_user);
 
 CREATE TABLE user_newtalk (
-  user_id  INTEGER NOT NULL REFERENCES "user"(user_id) ON DELETE CASCADE,
-  user_ip  TEXT NULL -- change to CIDR later
+  user_id  INTEGER NOT NULL  REFERENCES "user"(user_id) ON DELETE CASCADE,
+  user_ip  TEXT        NULL
 );
-CREATE INDEX user_newtalk_id_idx ON user_newtalk(user_id);
-CREATE INDEX user_newtalk_ip_idx ON user_newtalk(user_ip);
+CREATE INDEX user_newtalk_id_idx ON user_newtalk (user_id);
+CREATE INDEX user_newtalk_ip_idx ON user_newtalk (user_ip);
+
 
 CREATE SEQUENCE page_page_id_seq;
 CREATE TABLE page (
-  page_id            INTEGER NOT NULL PRIMARY KEY DEFAULT nextval('page_page_id_seq'),
-  page_namespace     SMALLINT NOT NULL,
-  page_title         TEXT NOT NULL,
+  page_id            INTEGER        NOT NULL  PRIMARY KEY DEFAULT nextval('page_page_id_seq'),
+  page_namespace     SMALLINT       NOT NULL,
+  page_title         TEXT           NOT NULL,
   page_restrictions  TEXT,
-  page_counter       BIGINT NOT NULL DEFAULT 0,
-  page_is_redirect   CHAR NOT NULL DEFAULT 0,
-  page_is_new        CHAR NOT NULL DEFAULT 0,
+  page_counter       BIGINT         NOT NULL  DEFAULT 0,
+  page_is_redirect   CHAR           NOT NULL  DEFAULT 0,
+  page_is_new        CHAR           NOT NULL  DEFAULT 0,
   page_random        NUMERIC(15,14) NOT NULL,
   page_touched       TIMESTAMPTZ,
-  page_latest        INTEGER NOT NULL, -- FK?
-  page_len           INTEGER NOT NULL
+  page_latest        INTEGER        NOT NULL, -- FK?
+  page_len           INTEGER        NOT NULL
 );
-CREATE UNIQUE INDEX page_unique_name ON page(page_namespace, page_title);
-CREATE INDEX page_random_idx ON page(page_random);
-CREATE INDEX page_len_idx ON page(page_len);
+CREATE UNIQUE INDEX page_unique_name ON page (page_namespace, page_title);
+CREATE INDEX page_random_idx         ON page (page_random);
+CREATE INDEX page_len_idx            ON page (page_len);
 
 -- Create a dummy page to satisfy fk contraints where a page_id of "0" is added
 INSERT INTO page (page_id,page_namespace,page_title,page_random,page_latest,page_len)
@@ -65,310 +70,314 @@ VALUES (0,0,'',0.0,0,0);
 
 CREATE SEQUENCE rev_rev_id_val;
 CREATE TABLE revision (
-  rev_id          INTEGER NOT NULL UNIQUE DEFAULT nextval('rev_rev_id_val'),
-  rev_page        INTEGER NULL REFERENCES page (page_id) ON DELETE SET NULL,
-  rev_text_id     INTEGER NULL, -- FK
+  rev_id          INTEGER      NOT NULL  UNIQUE DEFAULT nextval('rev_rev_id_val'),
+  rev_page        INTEGER          NULL  REFERENCES page (page_id) ON DELETE SET NULL,
+  rev_text_id     INTEGER          NULL, -- FK
   rev_comment     TEXT,
-  rev_user        INTEGER NOT NULL REFERENCES "user"(user_id),
-  rev_user_text   TEXT NOT NULL,
-  rev_timestamp   TIMESTAMPTZ NOT NULL,
-  rev_minor_edit  CHAR NOT NULL DEFAULT '0',
-  rev_deleted     CHAR NOT NULL DEFAULT '0'
+  rev_user        INTEGER      NOT NULL  REFERENCES "user"(user_id),
+  rev_user_text   TEXT         NOT NULL,
+  rev_timestamp   TIMESTAMPTZ  NOT NULL,
+  rev_minor_edit  CHAR         NOT NULL  DEFAULT '0',
+  rev_deleted     CHAR         NOT NULL  DEFAULT '0'
 );
-CREATE UNIQUE INDEX revision_unique ON revision(rev_page, rev_id);
-CREATE INDEX rev_timestamp_idx ON revision(rev_timestamp);
-CREATE INDEX rev_user_idx ON revision(rev_user);
-CREATE INDEX rev_user_text_idx ON revision(rev_user_text);
+CREATE UNIQUE INDEX revision_unique ON revision (rev_page, rev_id);
+CREATE INDEX rev_timestamp_idx      ON revision (rev_timestamp);
+CREATE INDEX rev_user_idx           ON revision (rev_user);
+CREATE INDEX rev_user_text_idx      ON revision (rev_user_text);
 
 
 CREATE SEQUENCE text_old_id_val;
 CREATE TABLE "text" (
-  old_id     INTEGER NOT NULL PRIMARY KEY DEFAULT nextval('text_old_id_val'),
+  old_id     INTEGER  NOT NULL  PRIMARY KEY DEFAULT nextval('text_old_id_val'),
   old_text   TEXT,
   old_flags  TEXT
 );
 
 
 CREATE TABLE archive (
-  ar_namespace   SMALLINT NOT NULL,
-  ar_title       TEXT NOT NULL,
+  ar_namespace   SMALLINT     NOT NULL,
+  ar_title       TEXT         NOT NULL,
   ar_text        TEXT,
   ar_comment     TEXT,
-  ar_user        INTEGER REFERENCES "user"(user_id) ON DELETE SET NULL,
-  ar_user_text   TEXT NOT NULL,
-  ar_timestamp   TIMESTAMPTZ NOT NULL,
-  ar_minor_edit  CHAR NOT NULL DEFAULT '0',
+  ar_user        INTEGER          NULL  REFERENCES "user"(user_id) ON DELETE SET NULL,
+  ar_user_text   TEXT         NOT NULL,
+  ar_timestamp   TIMESTAMPTZ  NOT NULL,
+  ar_minor_edit  CHAR         NOT NULL  DEFAULT '0',
   ar_flags       TEXT,
   ar_rev_id      INTEGER,
   ar_text_id     INTEGER
 );
-CREATE INDEX archive_name_title_timestamp ON archive(ar_namespace,ar_title,ar_timestamp);
+CREATE INDEX archive_name_title_timestamp ON archive (ar_namespace,ar_title,ar_timestamp);
 
 
 CREATE TABLE pagelinks (
-  pl_from       INTEGER NOT NULL REFERENCES page(page_id) ON DELETE CASCADE,
-  pl_namespace  SMALLINT NOT NULL,
-  pl_title      TEXT NOT NULL
+  pl_from       INTEGER   NOT NULL  REFERENCES page(page_id) ON DELETE CASCADE,
+  pl_namespace  SMALLINT  NOT NULL,
+  pl_title      TEXT      NOT NULL
 );
-CREATE UNIQUE INDEX pagelink_unique ON pagelinks(pl_namespace,pl_title,pl_from);
-
+CREATE UNIQUE INDEX pagelink_unique ON pagelinks (pl_namespace,pl_title,pl_from);
 
 CREATE TABLE templatelinks (
-  tl_from       INTEGER NOT NULL REFERENCES page(page_id) ON DELETE CASCADE,
-  tl_namespace  TEXT NOT NULL,
-  tl_title      TEXT NOT NULL
+  tl_from       INTEGER  NOT NULL  REFERENCES page(page_id) ON DELETE CASCADE,
+  tl_namespace  TEXT     NOT NULL,
+  tl_title      TEXT     NOT NULL
 );
-CREATE UNIQUE INDEX templatelinks_unique ON templatelinks(tl_namespace,tl_title,tl_from);
-
+CREATE UNIQUE INDEX templatelinks_unique ON templatelinks (tl_namespace,tl_title,tl_from);
 
 CREATE TABLE imagelinks (
-  il_from  INTEGER NOT NULL REFERENCES page(page_id) ON DELETE CASCADE,
-  il_to    TEXT NOT NULL
+  il_from  INTEGER  NOT NULL  REFERENCES page(page_id) ON DELETE CASCADE,
+  il_to    TEXT     NOT NULL
 );
-CREATE UNIQUE INDEX il_from ON imagelinks(il_to,il_from);
-
+CREATE UNIQUE INDEX il_from ON imagelinks (il_to,il_from);
 
 CREATE TABLE categorylinks (
-  cl_from       INTEGER NOT NULL REFERENCES page(page_id) ON DELETE CASCADE,
-  cl_to         TEXT NOT NULL,
+  cl_from       INTEGER      NOT NULL  REFERENCES page(page_id) ON DELETE CASCADE,
+  cl_to         TEXT         NOT NULL,
   cl_sortkey    TEXT,
-  cl_timestamp  TIMESTAMPTZ NOT NULL
+  cl_timestamp  TIMESTAMPTZ  NOT NULL
 );
-CREATE UNIQUE INDEX cl_from ON categorylinks(cl_from, cl_to);
-CREATE INDEX cl_sortkey ON categorylinks(cl_to, cl_sortkey);
-
+CREATE UNIQUE INDEX cl_from ON categorylinks (cl_from, cl_to);
+CREATE INDEX cl_sortkey     ON categorylinks (cl_to, cl_sortkey);
 
 CREATE TABLE externallinks (
-  el_from   INTEGER NOT NULL REFERENCES page(page_id) ON DELETE CASCADE,
-  el_to     TEXT NOT NULL,
-  el_index  TEXT NOT NULL
+  el_from   INTEGER  NOT NULL  REFERENCES page(page_id) ON DELETE CASCADE,
+  el_to     TEXT     NOT NULL,
+  el_index  TEXT     NOT NULL
 );
-CREATE INDEX externallinks_from_to ON externallinks(el_from,el_to);
-CREATE INDEX externallinks_index ON externallinks(el_index);
-
+CREATE INDEX externallinks_from_to ON externallinks (el_from,el_to);
+CREATE INDEX externallinks_index   ON externallinks (el_index);
 
 CREATE TABLE langlinks (
-  ll_from    INTEGER NOT NULL REFERENCES page (page_id) ON DELETE CASCADE,
+  ll_from    INTEGER  NOT NULL  REFERENCES page (page_id) ON DELETE CASCADE,
   ll_lang    TEXT,
   ll_title   TEXT
 );
 CREATE UNIQUE INDEX langlinks_unique ON langlinks (ll_from,ll_lang);
-CREATE INDEX langlinks_lang_title ON langlinks(ll_lang,ll_title);
+CREATE INDEX langlinks_lang_title    ON langlinks (ll_lang,ll_title);
 
 
 CREATE TABLE site_stats (
-  ss_row_id         INTEGER NOT NULL UNIQUE,
-  ss_total_views    INTEGER DEFAULT 0,
-  ss_total_edits    INTEGER DEFAULT 0,
-  ss_good_articles  INTEGER DEFAULT 0,
-  ss_total_pages    INTEGER DEFAULT -1,
-  ss_users          INTEGER DEFAULT -1,
-  ss_admins         INTEGER DEFAULT -1,
-  ss_images         INTEGER DEFAULT 0
+  ss_row_id         INTEGER  NOT NULL  UNIQUE,
+  ss_total_views    INTEGER            DEFAULT 0,
+  ss_total_edits    INTEGER            DEFAULT 0,
+  ss_good_articles  INTEGER            DEFAULT 0,
+  ss_total_pages    INTEGER            DEFAULT -1,
+  ss_users          INTEGER            DEFAULT -1,
+  ss_admins         INTEGER            DEFAULT -1,
+  ss_images         INTEGER            DEFAULT 0
 );
 
-
 CREATE TABLE hitcounter (
-  hc_id  BIGINT NOT NULL
+  hc_id  BIGINT  NOT NULL
 );
 
+
 CREATE SEQUENCE ipblocks_ipb_id_val;
 CREATE TABLE ipblocks (
-  ipb_id           INTEGER NOT NULL PRIMARY KEY DEFAULT nextval('ipblocks_ipb_id_val'),
-  ipb_address      TEXT NULL, -- change to CIDR later
-  ipb_user         INTEGER NULL REFERENCES "user"(user_id) ON DELETE SET NULL,
-  ipb_by           INTEGER NOT NULL REFERENCES "user"(user_id) ON DELETE CASCADE,
-  ipb_reason       TEXT NOT NULL,
-  ipb_timestamp    TIMESTAMPTZ NOT NULL,
-  ipb_auto         CHAR NOT NULL DEFAULT '0',
-  ipb_expiry       TIMESTAMPTZ NOT NULL,
-  ipb_range_start  TEXT, -- change to CIDR later
-  ipb_range_end    TEXT  -- change to CIDR later
+  ipb_id           INTEGER      NOT NULL  PRIMARY KEY DEFAULT nextval('ipblocks_ipb_id_val'),
+  ipb_address      TEXT             NULL,
+  ipb_user         INTEGER          NULL  REFERENCES "user"(user_id) ON DELETE SET NULL,
+  ipb_by           INTEGER      NOT NULL  REFERENCES "user"(user_id) ON DELETE CASCADE,
+  ipb_reason       TEXT         NOT NULL,
+  ipb_timestamp    TIMESTAMPTZ  NOT NULL,
+  ipb_auto         CHAR         NOT NULL  DEFAULT '0',
+  ipb_expiry       TIMESTAMPTZ  NOT NULL,
+  ipb_range_start  TEXT,
+  ipb_range_end    TEXT
 );
-CREATE INDEX ipb_address ON ipblocks(ipb_address);
-CREATE INDEX ipb_user ON ipblocks(ipb_user);
-CREATE INDEX ipb_range ON ipblocks(ipb_range_start,ipb_range_end);
+CREATE INDEX ipb_address ON ipblocks (ipb_address);
+CREATE INDEX ipb_user    ON ipblocks (ipb_user);
+CREATE INDEX ipb_range   ON ipblocks (ipb_range_start,ipb_range_end);
 
 
 CREATE TABLE image (
-  img_name         TEXT NOT NULL PRIMARY KEY,
-  img_size         SMALLINT NOT NULL,
-  img_width        SMALLINT NOT NULL,
-  img_height       SMALLINT NOT NULL,
+  img_name         TEXT      NOT NULL  PRIMARY KEY,
+  img_size         SMALLINT  NOT NULL,
+  img_width        SMALLINT  NOT NULL,
+  img_height       SMALLINT  NOT NULL,
   img_metadata     TEXT,
   img_bits         SMALLINT,
   img_media_type   TEXT,
-  img_major_mime   TEXT DEFAULT 'unknown',
-  img_minor_mime   TEXT DEFAULT 'unknown',
-  img_description  TEXT NOT NULL,
-  img_user         INTEGER NULL REFERENCES "user"(user_id) ON DELETE SET NULL,
-  img_user_text    TEXT NOT NULL,
+  img_major_mime   TEXT                DEFAULT 'unknown',
+  img_minor_mime   TEXT                DEFAULT 'unknown',
+  img_description  TEXT      NOT NULL,
+  img_user         INTEGER       NULL  REFERENCES "user"(user_id) ON DELETE SET NULL,
+  img_user_text    TEXT      NOT NULL,
   img_timestamp    TIMESTAMPTZ
 );
-CREATE INDEX img_size_idx ON image(img_size);
-CREATE INDEX img_timestamp_idx ON image(img_timestamp);
-
+CREATE INDEX img_size_idx      ON image (img_size);
+CREATE INDEX img_timestamp_idx ON image (img_timestamp);
 
 CREATE TABLE oldimage (
-  oi_name          TEXT NOT NULL REFERENCES image(img_name),
-  oi_archive_name  TEXT NOT NULL,
-  oi_size          SMALLINT NOT NULL,
-  oi_width         SMALLINT NOT NULL,
-  oi_height        SMALLINT NOT NULL,
-  oi_bits          SMALLINT NOT NULL,
+  oi_name          TEXT         NOT NULL  REFERENCES image(img_name),
+  oi_archive_name  TEXT         NOT NULL,
+  oi_size          SMALLINT     NOT NULL,
+  oi_width         SMALLINT     NOT NULL,
+  oi_height        SMALLINT     NOT NULL,
+  oi_bits          SMALLINT     NOT NULL,
   oi_description   TEXT,
-  oi_user          INTEGER NULL REFERENCES "user"(user_id) ON DELETE SET NULL,
-  oi_user_text     TEXT NOT NULL,
-  oi_timestamp     TIMESTAMPTZ NOT NULL
+  oi_user          INTEGER          NULL  REFERENCES "user"(user_id) ON DELETE SET NULL,
+  oi_user_text     TEXT         NOT NULL,
+  oi_timestamp     TIMESTAMPTZ  NOT NULL
 );
 CREATE INDEX oi_name ON oldimage (oi_name);
 
 
 CREATE TABLE filearchive (
-  fa_id                 SERIAL      NOT NULL PRIMARY KEY,
-  fa_name               TEXT        NOT NULL,
-  fa_archive_name       TEXT,  
+  fa_id                 SERIAL       NOT NULL  PRIMARY KEY,
+  fa_name               TEXT         NOT NULL,
+  fa_archive_name       TEXT,
   fa_storage_group      VARCHAR(16),
   fa_storage_key        CHAR(64),
-  fa_deleted_user       INTEGER         NULL REFERENCES "user"(user_id) ON DELETE SET NULL,
-  fa_deleted_timestamp  TIMESTAMPTZ NOT NULL,
+  fa_deleted_user       INTEGER          NULL  REFERENCES "user"(user_id) ON DELETE SET NULL,
+  fa_deleted_timestamp  TIMESTAMPTZ  NOT NULL,
   fa_deleted_reason     TEXT,
-  fa_size               SMALLINT    NOT NULL,
-  fa_width              SMALLINT    NOT NULL,
-  fa_height             SMALLINT    NOT NULL,
+  fa_size               SMALLINT     NOT NULL,
+  fa_width              SMALLINT     NOT NULL,
+  fa_height             SMALLINT     NOT NULL,
   fa_metadata           TEXT,
   fa_bits               SMALLINT,
   fa_media_type         TEXT,
   fa_major_mime         TEXT                   DEFAULT 'unknown',
   fa_minor_mime         TEXT                   DEFAULT 'unknown',
-  fa_description        TEXT        NOT NULL,
-  fa_user               INTEGER         NULL REFERENCES "user"(user_id) ON DELETE SET NULL,
-  fa_user_text          TEXT        NOT NULL,
+  fa_description        TEXT         NOT NULL,
+  fa_user               INTEGER          NULL  REFERENCES "user"(user_id) ON DELETE SET NULL,
+  fa_user_text          TEXT         NOT NULL,
   fa_timestamp          TIMESTAMPTZ
 );
-CREATE INDEX fa_name_time ON filearchive(fa_name, fa_timestamp);
-CREATE INDEX fa_dupe ON filearchive(fa_storage_group, fa_storage_key);
-CREATE INDEX fa_notime ON filearchive(fa_deleted_timestamp);
-CREATE INDEX fa_nouser ON filearchive(fa_deleted_user);
+CREATE INDEX fa_name_time ON filearchive (fa_name, fa_timestamp);
+CREATE INDEX fa_dupe      ON filearchive (fa_storage_group, fa_storage_key);
+CREATE INDEX fa_notime    ON filearchive (fa_deleted_timestamp);
+CREATE INDEX fa_nouser    ON filearchive (fa_deleted_user);
 
 
 CREATE SEQUENCE rc_rc_id_seq;
 CREATE TABLE recentchanges (
-  rc_id              INTEGER NOT NULL PRIMARY KEY DEFAULT nextval('rc_rc_id_seq'),
-  rc_timestamp       TIMESTAMPTZ NOT NULL,
-  rc_cur_time        TIMESTAMPTZ NOT NULL,
-  rc_user            INTEGER NULL REFERENCES "user"(user_id) ON DELETE SET NULL,
-  rc_user_text       TEXT NOT NULL,
-  rc_namespace       SMALLINT NOT NULL,
-  rc_title           TEXT NOT NULL,
+  rc_id              INTEGER      NOT NULL  PRIMARY KEY DEFAULT nextval('rc_rc_id_seq'),
+  rc_timestamp       TIMESTAMPTZ  NOT NULL,
+  rc_cur_time        TIMESTAMPTZ  NOT NULL,
+  rc_user            INTEGER          NULL  REFERENCES "user"(user_id) ON DELETE SET NULL,
+  rc_user_text       TEXT         NOT NULL,
+  rc_namespace       SMALLINT     NOT NULL,
+  rc_title           TEXT         NOT NULL,
   rc_comment         TEXT,
-  rc_minor           CHAR NOT NULL DEFAULT '0',
-  rc_bot             CHAR NOT NULL DEFAULT '0',
-  rc_new             CHAR NOT NULL DEFAULT '0',
-  rc_cur_id          INTEGER NOT NULL REFERENCES page(page_id),
-  rc_this_oldid      INTEGER NOT NULL,
-  rc_last_oldid      INTEGER NOT NULL,
-  rc_type            CHAR NOT NULL DEFAULT '0',
+  rc_minor           CHAR         NOT NULL  DEFAULT '0',
+  rc_bot             CHAR         NOT NULL  DEFAULT '0',
+  rc_new             CHAR         NOT NULL  DEFAULT '0',
+  rc_cur_id          INTEGER      NOT NULL  REFERENCES page(page_id),
+  rc_this_oldid      INTEGER      NOT NULL,
+  rc_last_oldid      INTEGER      NOT NULL,
+  rc_type            CHAR         NOT NULL  DEFAULT '0',
   rc_moved_to_ns     SMALLINT,
   rc_moved_to_title  TEXT,
-  rc_patrolled       CHAR NOT NULL DEFAULT '0',
-  rc_ip              TEXT -- change to CIDR later
+  rc_patrolled       CHAR         NOT NULL  DEFAULT '0',
+  rc_ip              TEXT
 );
-CREATE INDEX rc_timestamp ON recentchanges (rc_timestamp);
-CREATE INDEX rc_namespace_title ON recentchanges(rc_namespace, rc_title);
-CREATE INDEX rc_cur_id ON recentchanges(rc_cur_id);
-CREATE INDEX new_name_timestamp ON recentchanges(rc_new, rc_namespace, rc_timestamp);
-CREATE INDEX rc_ip ON recentchanges(rc_ip);
+CREATE INDEX rc_timestamp       ON recentchanges (rc_timestamp);
+CREATE INDEX rc_namespace_title ON recentchanges (rc_namespace, rc_title);
+CREATE INDEX rc_cur_id          ON recentchanges (rc_cur_id);
+CREATE INDEX new_name_timestamp ON recentchanges (rc_new, rc_namespace, rc_timestamp);
+CREATE INDEX rc_ip              ON recentchanges (rc_ip);
 
 
 CREATE TABLE watchlist (
-  wl_user                   INTEGER NOT NULL REFERENCES "user"(user_id) ON DELETE CASCADE,
-  wl_namespace              SMALLINT NOT NULL DEFAULT 0,
-  wl_title                  TEXT NOT NULL,
-  wl_notificationtimestamp  TIMESTAMPTZ DEFAULT NULL
+  wl_user                   INTEGER     NOT NULL  REFERENCES "user"(user_id) ON DELETE CASCADE,
+  wl_namespace              SMALLINT    NOT NULL  DEFAULT 0,
+  wl_title                  TEXT        NOT NULL,
+  wl_notificationtimestamp  TIMESTAMPTZ
 );
 CREATE UNIQUE INDEX wl_user_namespace_title ON watchlist (wl_namespace, wl_title, wl_user);
 
 
 CREATE TABLE math (
-  math_inputhash              TEXT NOT NULL UNIQUE,
-  math_outputhash             TEXT NOT NULL,
-  math_html_conservativeness  SMALLINT NOT NULL,
+  math_inputhash              TEXT      NOT NULL  UNIQUE,
+  math_outputhash             TEXT      NOT NULL,
+  math_html_conservativeness  SMALLINT  NOT NULL,
   math_html                   TEXT,
   math_mathml                 TEXT
 );
 
 
 CREATE TABLE interwiki (
-  iw_prefix  TEXT NOT NULL UNIQUE,
-  iw_url     TEXT NOT NULL,
-  iw_local   CHAR NOT NULL,
-  iw_trans   CHAR NOT NULL DEFAULT '0'
+  iw_prefix  TEXT  NOT NULL  UNIQUE,
+  iw_url     TEXT  NOT NULL,
+  iw_local   CHAR  NOT NULL,
+  iw_trans   CHAR  NOT NULL  DEFAULT '0'
 );
 
 
 CREATE TABLE querycache (
-  qc_type       TEXT NOT NULL,
-  qc_value      SMALLINT NOT NULL,
-  qc_namespace  SMALLINT NOT NULL,
-  qc_title      TEXT NOT NULL
+  qc_type       TEXT      NOT NULL,
+  qc_value      SMALLINT  NOT NULL,
+  qc_namespace  SMALLINT  NOT NULL,
+  qc_title      TEXT      NOT NULL
 );
-CREATE INDEX querycache_type_value ON querycache(qc_type, qc_value);
+CREATE INDEX querycache_type_value ON querycache (qc_type, qc_value);
 
+CREATE TABLE querycache_info (
+  qci_type       TEXT              UNIQUE,
+  qci_timestamp  TIMESTAMPTZ NULL
+);
 
 CREATE TABLE objectcache (
-  keyname  CHAR(255) UNIQUE,
-  value    TEXT NOT NULL DEFAULT '',
-  exptime  TIMESTAMPTZ NOT NULL
+  keyname  CHAR(255)              UNIQUE,
+  value    TEXT         NOT NULL  DEFAULT '',
+  exptime  TIMESTAMPTZ  NOT NULL
 );
-CREATE INDEX objectcacache_exptime ON objectcache(exptime);
+CREATE INDEX objectcacache_exptime ON objectcache (exptime);
 
 CREATE TABLE transcache (
-  tc_url       TEXT NOT NULL UNIQUE,
-  tc_contents  TEXT NOT NULL,
-  tc_time      TIMESTAMPTZ NOT NULL
+  tc_url       TEXT         NOT NULL  UNIQUE,
+  tc_contents  TEXT         NOT NULL,
+  tc_time      TIMESTAMPTZ  NOT NULL
 );
 
+
 CREATE TABLE logging (
-  log_type        TEXT NOT NULL,
-  log_action      TEXT NOT NULL,
-  log_timestamp   TIMESTAMPTZ NOT NULL,
-  log_user        INTEGER REFERENCES "user"(user_id) ON DELETE SET NULL,
-  log_namespace   SMALLINT NOT NULL,
-  log_title       TEXT NOT NULL,
+  log_type        TEXT         NOT NULL,
+  log_action      TEXT         NOT NULL,
+  log_timestamp   TIMESTAMPTZ  NOT NULL,
+  log_user        INTEGER                REFERENCES "user"(user_id) ON DELETE SET NULL,
+  log_namespace   SMALLINT     NOT NULL,
+  log_title       TEXT         NOT NULL,
   log_comment     TEXT,
   log_params      TEXT
 );
-CREATE INDEX logging_type_name ON logging(log_type, log_timestamp);
-CREATE INDEX logging_user_time ON logging(log_timestamp, log_user);
-CREATE INDEX logging_page_time ON logging(log_namespace, log_title, log_timestamp);
+CREATE INDEX logging_type_name ON logging (log_type, log_timestamp);
+CREATE INDEX logging_user_time ON logging (log_timestamp, log_user);
+CREATE INDEX logging_page_time ON logging (log_namespace, log_title, log_timestamp);
+
 
 CREATE TABLE trackbacks (
-  tb_id     SERIAL NOT NULL PRIMARY KEY,
-  tb_page   INTEGER REFERENCES page(page_id) ON DELETE CASCADE,
-  tb_title  TEXT NOT NULL,
-  tb_url    TEXT NOT NULL,
+  tb_id     SERIAL   NOT NULL  PRIMARY KEY,
+  tb_page   INTEGER            REFERENCES page(page_id) ON DELETE CASCADE,
+  tb_title  TEXT     NOT NULL,
+  tb_url    TEXT     NOT NULL,
   tb_ex     TEXT,
   tb_name   TEXT
 );
-CREATE INDEX trackback_page ON trackbacks(tb_page);
+CREATE INDEX trackback_page ON trackbacks (tb_page);
+
 
 CREATE SEQUENCE job_job_id_seq;
 CREATE TABLE job (
-  job_id         INTEGER NOT NULL PRIMARY KEY DEFAULT nextval('job_job_id_seq'),
-  job_cmd        TEXT NOT NULL,
-  job_namespace  SMALLINT NOT NULL,
-  job_title      TEXT NOT NULL,
-  job_params     TEXT NOT NULL
+  job_id         INTEGER   NOT NULL  PRIMARY KEY DEFAULT nextval('job_job_id_seq'),
+  job_cmd        TEXT      NOT NULL,
+  job_namespace  SMALLINT  NOT NULL,
+  job_title      TEXT      NOT NULL,
+  job_params     TEXT      NOT NULL
 );
-CREATE INDEX job_cmd_namespace_title ON job(job_cmd, job_namespace, job_title);
+CREATE INDEX job_cmd_namespace_title ON job (job_cmd, job_namespace, job_title);
 
-CREATE TABLE querycache_info (
-  qci_type       TEXT UNIQUE,
-  qci_timestamp  TIMESTAMPTZ NULL
+
+CREATE TABLE searchindex (
+  si_page     INTEGER           NULL  REFERENCES page (page_id) ON DELETE CASCADE,
+  si_title    VARCHAR(255)  NOT NULL  DEFAULT '',
+  si_text     TEXT          NOT NULL  DEFAULT ''
 );
 
 
+
 CREATE OR REPLACE FUNCTION add_interwiki (TEXT,INT,CHAR) RETURNS INT LANGUAGE SQL AS
 $mw$
   INSERT INTO interwiki (iw_prefix, iw_url, iw_local) VALUES ($1,$2,$3);