Clean up whitespace, add log_search to Postgres schema.

diff --git a/maintenance/postgres/tables.sql b/maintenance/postgres/tables.sql
index 9c55e0e..fe0c26d 100644 (file)
--- a/maintenance/postgres/tables.sql
+++ b/maintenance/postgres/tables.sql
@@ -443,6 +443,13 @@ 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 log_search (
+  ls_field   TEXT     NOT NULL,
+  ls_value   TEXT     NOT NULL,
+  ls_log_id  INTEGER  NOT NULL DEFAULT 0,
+  PRIMARY KEY (ls_field,ls_value,ls_log_id)
+);
+CREATE INDEX ls_log_id ON log_search (ls_log_id);
 
 CREATE SEQUENCE trackbacks_tb_id_seq;
 CREATE TABLE trackbacks (
@@ -580,13 +587,13 @@ CREATE TABLE valid_tag (
   vt_tag TEXT NOT NULL PRIMARY KEY
 );
 
-CREATE TABLE user_properties(
-  up_user   INTEGER      NULL  REFERENCES mwuser(user_id) ON DELETE CASCADE,
-  up_property TEXT NOT NULL,
-  up_value TEXT
+CREATE TABLE user_properties (
+  up_user     INTEGER      NULL  REFERENCES mwuser(user_id) ON DELETE CASCADE,
+  up_property TEXT     NOT NULL,
+  up_value    TEXT
 );
-CREATE UNIQUE INDEX user_properties_user_property on user_properties (up_user,up_property);
-CREATE INDEX user_properties_property on user_properties (up_property);
+CREATE UNIQUE INDEX user_properties_user_property ON user_properties (up_user,up_property);
+CREATE INDEX user_properties_property ON user_properties (up_property);
 
 CREATE TABLE mediawiki_version (
   type         TEXT         NOT NULL,

diff --git a/maintenance/tables.sql b/maintenance/tables.sql
index 9ce2380..73dbe8d 100644 (file)
--- a/maintenance/tables.sql
+++ b/maintenance/tables.sql
@@ -191,19 +191,19 @@ CREATE INDEX /*i*/un_user_ip ON /*_*/user_newtalk (user_ip);
 -- 2) We can more easily do bulk lookups, statistics, or modifications of
 --    saved options since it's a sane table structure.
 --
-CREATE TABLE /*_*/user_properties(
+CREATE TABLE /*_*/user_properties (
   -- Foreign key to user.user_id
-  up_user int not null,
+  up_user int NOT NULL,
   
   -- Name of the option being saved. This is indexed for bulk lookup.
-  up_property varbinary(32) not null,
+  up_property varbinary(32) NOT NULL,
   
   -- Property value as a string.
   up_value blob
 ) /*$wgDBTableOptions*/;
 
-CREATE UNIQUE INDEX /*i*/user_properties_user_property on /*_*/user_properties (up_user,up_property);
-CREATE INDEX /*i*/user_properties_property on /*_*/user_properties (up_property);
+CREATE UNIQUE INDEX /*i*/user_properties_user_property ON /*_*/user_properties (up_user,up_property);
+CREATE INDEX /*i*/user_properties_property ON /*_*/user_properties (up_property);
 
 --
 -- Core of the wiki: each page has an entry here which identifies