Changeset 443

Show
Ignore:
Timestamp:
06/22/08 13:24:31 (4 years ago)
Author:
dom
Message:

roll back deletion flag stuff for now; need to think more about best way
to do it

Location:
wiki-toolkit/trunk
Files:
4 modified

Legend:

Unmodified
Added
Removed

  • wiki-toolkit/trunk/Changes

    r441 r443  
    33        Add testing of database schema upgrades (#32) 
    44        Move to new schema version 10, including some missing indexes 
    5           and support for deletion flags and verified flags. Note that 
    6           the code using these columns has not yet been written (#25, #34). 
     5          and support for verified flags. Note that 
     6          the code using this column has not yet been written (#25, #34). 
    77 
    880.75    11 May 2008 

  • wiki-toolkit/trunk/lib/Wiki/Toolkit/Setup/MySQL.pm

    r441 r443  
    131131  modified  datetime     default NULL, 
    132132  moderate  bool         NOT NULL default '0', 
    133   deleted   bool         NOT NULL default '0', 
    134133  PRIMARY KEY (id) 
    135134) 
    136135|, qq| 
    137136CREATE UNIQUE INDEX node_name ON node (name) 
    138 |, qq| 
    139 CREATE INDEX node_deleted_index ON node (deleted) 
    140137| ], 
    141138 
    … …  
    148145  comment   mediumtext   NOT NULL default '', 
    149146  moderated bool         NOT NULL default '1', 
    150   deleted   bool         NOT NULL DEFAULT '0', 
    151147  verified  datetime     default NULL, 
    152148  PRIMARY KEY (node_id, version) 
    153149) 
    154 |, qq| 
    155 CREATE INDEX content_deleted_index ON content (deleted) 
    156150| ], 
    157151        internal_links => [ qq| 
    … …  
    159153  link_from varchar(200) NOT NULL default '', 
    160154  link_to   varchar(200) NOT NULL default '', 
    161   deleted   bool         NOT NULL default '0', 
    162155  PRIMARY KEY (link_from, link_to) 
    163156) 
    164 |, qq| 
    165 CREATE INDEX internal_links_deleted_index ON internal_links (deleted) 
    166157| ], 
    167158        metadata => [ qq| 
    … …  
    170161  version        int(10)      NOT NULL default 0, 
    171162  metadata_type  varchar(200) NOT NULL DEFAULT '', 
    172   metadata_value mediumtext   NOT NULL DEFAULT '', 
    173   deleted        bool         NOT NULL DEFAULT '0' 
     163  metadata_value mediumtext   NOT NULL DEFAULT '' 
    174164) 
    175165|, qq| 
    176166CREATE INDEX metadata_index ON metadata(node_id, version, metadata_type, metadata_value(10)) 
    177 |, qq| 
    178 CREATE INDEX metadata_deleted_index ON metadata (deleted) 
    179167| ] 
    180168    }, 
    … …  
    192180'9_to_10' => [ qq| 
    193181CREATE UNIQUE INDEX node_name ON node (name) 
    194 |, qq| 
    195 ALTER TABLE node ADD COLUMN deleted boolean 
    196 |, qq| 
    197 UPDATE node SET deleted = '0' 
    198 |, qq| 
    199 ALTER TABLE node MODIFY COLUMN deleted bool NOT NULL DEFAULT '0' 
    200 |, qq| 
    201 CREATE INDEX node_deleted_index ON node (deleted) 
    202 |, qq| 
    203 ALTER TABLE content ADD COLUMN deleted boolean 
    204 |, qq| 
    205 UPDATE content SET deleted = '0' 
    206 |, qq| 
    207 ALTER TABLE content MODIFY COLUMN deleted bool NOT NULL DEFAULT '0' 
    208 |, qq| 
    209 CREATE INDEX content_deleted_index ON content (deleted) 
    210 |, qq| 
    211 ALTER TABLE internal_links ADD COLUMN deleted boolean 
    212 |, qq| 
    213 UPDATE internal_links SET deleted = '0' 
    214 |, qq| 
    215 ALTER TABLE internal_links MODIFY COLUMN deleted bool NOT NULL DEFAULT '0' 
    216 |, qq| 
    217 CREATE INDEX internal_links_deleted_index ON internal_links (deleted) 
    218 |, qq| 
    219 ALTER TABLE metadata ADD COLUMN deleted boolean 
    220 |, qq| 
    221 UPDATE metadata SET deleted = '0' 
    222 |, qq| 
    223 ALTER TABLE metadata MODIFY COLUMN deleted bool NOT NULL DEFAULT '0' 
    224 |, qq| 
    225 CREATE INDEX metadata_deleted_index ON metadata (deleted) 
    226182|, qq| 
    227183ALTER TABLE content ADD COLUMN verified datetime default NULL 

  • wiki-toolkit/trunk/lib/Wiki/Toolkit/Setup/Pg.pm

    r441 r443  
    152152  modified  timestamp without time zone    default NULL, 
    153153  moderate  boolean      NOT NULL default '0', 
    154   deleted   boolean      NOT NULL default '0', 
    155154  CONSTRAINT pk_id PRIMARY KEY (id) 
    156155) 
    157156|, qq| 
    158157CREATE UNIQUE INDEX node_name ON node (name) 
    159 |, qq| 
    160 CREATE INDEX node_deleted_index ON node (deleted) 
    161158| ], 
    162159 
    … …  
    169166  comment   text         NOT NULL default '', 
    170167  moderated boolean      NOT NULL default '1', 
    171   deleted   boolean      NOT NULL default '0', 
    172168  verified  timestamp without time zone    default NULL, 
    173169  CONSTRAINT pk_node_id PRIMARY KEY (node_id,version), 
    174170  CONSTRAINT fk_node_id FOREIGN KEY (node_id) REFERENCES node (id) 
    175171) 
    176 |, qq| 
    177 CREATE INDEX content_deleted_index ON content (deleted) 
    178172| ], 
    179173 
    … …  
    260254 
    261255'9_to_10' => [ qq| 
    262 ALTER TABLE node ADD COLUMN deleted boolean; 
    263 UPDATE node SET deleted = '0'; 
    264 ALTER TABLE node ALTER COLUMN deleted SET DEFAULT '0'; 
    265 ALTER TABLE node ALTER COLUMN deleted SET NOT NULL; 
    266 CREATE INDEX node_deleted_index ON node (deleted); 
    267 |, qq| 
    268 ALTER TABLE content ADD COLUMN deleted boolean; 
    269 UPDATE content SET deleted = '0'; 
    270 ALTER TABLE content ALTER COLUMN deleted SET DEFAULT '0'; 
    271 ALTER TABLE content ALTER COLUMN deleted SET NOT NULL; 
    272 CREATE INDEX content_deleted_index ON content (deleted); 
    273 |, qq| 
    274 ALTER TABLE internal_links ADD COLUMN deleted boolean; 
    275 UPDATE internal_links SET deleted = '0'; 
    276 ALTER TABLE internal_links ALTER COLUMN deleted SET DEFAULT '0'; 
    277 ALTER TABLE internal_links ALTER COLUMN deleted SET NOT NULL; 
    278 CREATE INDEX internal_links_deleted_index ON internal_links (deleted); 
    279 |, qq| 
    280 ALTER TABLE metadata ADD COLUMN deleted boolean; 
    281 UPDATE metadata SET deleted = '0'; 
    282 ALTER TABLE metadata ALTER COLUMN deleted SET DEFAULT '0'; 
    283 ALTER TABLE metadata ALTER COLUMN deleted SET NOT NULL; 
    284 CREATE INDEX metadata_deleted_index ON metadata (deleted); 
    285 |, qq| 
    286256ALTER TABLE content ADD COLUMN verified timestamp without time zone default NULL; 
    287257|, qq| 

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

    r441 r443  
    121121  text      mediumtext   NOT NULL default '', 
    122122  modified  datetime     default NULL, 
    123   moderate  boolean      NOT NULL default '0', 
    124   deleted   boolean      NOT NULL default '0' 
     123  moderate  boolean      NOT NULL default '0' 
    125124)  
    126125|, qq| 
    127126CREATE UNIQUE INDEX node_name ON node (name) 
    128 |, qq| 
    129 CREATE INDEX node_deleted_index ON node (deleted) 
    130127| ], 
    131128        content => [ qq| 
    … …  
    137134  comment   mediumtext   NOT NULL default '', 
    138135  moderated boolean      NOT NULL default '1', 
    139   deleted   boolean      NOT NULL default '0', 
    140136  verified  datetime     default NULL, 
    141137  PRIMARY KEY (node_id, version) 
    142138)  
    143 |, qq| 
    144 CREATE INDEX content_deleted_index ON content (deleted) 
    145139| ], 
    146140        internal_links => [ qq| 
    … …  
    148142  link_from varchar(200) NOT NULL default '', 
    149143  link_to   varchar(200) NOT NULL default '', 
    150   deleted   boolean      NOT NULL default '0', 
    151144  PRIMARY KEY (link_from, link_to) 
    152145)  
    153 |, qq| 
    154 CREATE INDEX internal_links_deleted_index ON internal_links (deleted) 
    155146| ], 
    156147        metadata => [ qq| 
    … …  
    159150  version        integer      NOT NULL default 0, 
    160151  metadata_type  varchar(200) NOT NULL DEFAULT '', 
    161   metadata_value mediumtext   NOT NULL DEFAULT '', 
    162   deleted        boolean      NOT NULL DEFAULT '0' 
     152  metadata_value mediumtext   NOT NULL DEFAULT '' 
    163153)  
    164 |, qq| 
    165 CREATE INDEX metadata_deleted_index ON metadata (deleted) 
    166154| ]  
    167155    },