|
From: Garvin H. <gar...@us...> - 2004-10-13 08:59:23
|
Update of /cvsroot/php-blog/serendipity/sql In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13315/sql Modified Files: db.sql db_update_0.5_0.5.1_mysql.sql db_update_0.5_0.5.1_postgres.sql db_update_0.6.2_0.6.3_mysql.sql db_update_0.6.2_0.6.3_postgres.sql db_update_0.6.5_0.6.6_mysql.sql db_update_0.6.5_0.6.6_postgres.sql db_update_0.6_0.6.1_mysql.sql db_update_0.6_0.6.1_postgres.sql Log Message: * Remove pgsql error notice when querying for author on installation * Fixed names of indices - they are not allowed to be named after an existing column. Use a consistent scheme 'key_idx' for every index key. Index: db_update_0.6.5_0.6.6_postgres.sql =================================================================== RCS file: /cvsroot/php-blog/serendipity/sql/db_update_0.6.5_0.6.6_postgres.sql,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- db_update_0.6.5_0.6.6_postgres.sql 18 Jun 2004 09:04:40 -0000 1.1 +++ db_update_0.6.5_0.6.6_postgres.sql 13 Oct 2004 08:57:52 -0000 1.2 @@ -1 +1 @@ -CREATE UNIQUE INDEX entryid ON {PREFIX}entrycat (entryid, categoryid); \ No newline at end of file +CREATE UNIQUE INDEX entryid_idx ON {PREFIX}entrycat (entryid, categoryid); \ No newline at end of file Index: db.sql =================================================================== RCS file: /cvsroot/php-blog/serendipity/sql/db.sql,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- db.sql 28 Jul 2004 16:39:48 -0000 1.18 +++ db.sql 13 Oct 2004 08:57:52 -0000 1.19 @@ -42,7 +42,7 @@ status varchar(50) not null ); -CREATE {FULLTEXT} INDEX body on {PREFIX}comments (body); +CREATE {FULLTEXT} INDEX body_idx on {PREFIX}comments (body); # # table structure for table '{PREFIX}entries' @@ -65,7 +65,7 @@ moderate_comments {BOOLEAN} ); -CREATE {FULLTEXT} INDEX entry on {PREFIX}entries (title,body,extended); +CREATE {FULLTEXT} INDEX entry_idx on {PREFIX}entries (title,body,extended); CREATE INDEX date_idx ON {PREFIX}entries (timestamp); CREATE INDEX mod_idx ON {PREFIX}entries (last_modified); @@ -122,7 +122,7 @@ authorid int(11) default '0' ); -CREATE INDEX authorid ON {PREFIX}config (authorid); +CREATE INDEX authorid_idx ON {PREFIX}config (authorid); CREATE TABLE {PREFIX}suppress ( ip varchar(15) default NULL, @@ -134,7 +134,7 @@ last timestamp NOT NULL ); -CREATE unique INDEX url on {PREFIX}suppress (host, ip); +CREATE unique INDEX url_idx on {PREFIX}suppress (host, ip); CREATE TABLE {PREFIX}plugins ( name varchar(128) not null, @@ -144,7 +144,7 @@ PRIMARY KEY(name) ); -CREATE INDEX authorid ON {PREFIX}config (authorid); +CREATE INDEX authorid_idx ON {PREFIX}config (authorid); CREATE TABLE {PREFIX}category ( categoryid {AUTOINCREMENT} {PRIMARY}, @@ -171,11 +171,11 @@ path text ); -CREATE {FULLTEXT} INDEX pathkey on {PREFIX}images (path); +CREATE {FULLTEXT} INDEX pathkey_idx on {PREFIX}images (path); CREATE TABLE {PREFIX}entrycat ( entryid int(11) not null, categoryid int(11) not null ); -CREATE UNIQUE INDEX entryid ON {PREFIX}entrycat (entryid, categoryid); +CREATE UNIQUE INDEX entryid_idx ON {PREFIX}entrycat (entryid, categoryid); Index: db_update_0.5_0.5.1_postgres.sql =================================================================== RCS file: /cvsroot/php-blog/serendipity/sql/db_update_0.5_0.5.1_postgres.sql,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- db_update_0.5_0.5.1_postgres.sql 11 Apr 2004 04:22:21 -0000 1.2 +++ db_update_0.5_0.5.1_postgres.sql 13 Oct 2004 08:57:52 -0000 1.3 @@ -17,15 +17,15 @@ UPDATE {PREFIX}config SET name = REPLACE(name, 'serendipity_plugin_content_rewrite', 'serendipity_event_contentrewrite') WHERE name LIKE '%serendipity_plugin_content_rewrite%'; - + UPDATE {PREFIX}plugins SET placement = 'event' WHERE name LIKE '%serendipity_event_contentrewrite%'; - + ALTER TABLE {PREFIX}entries ADD COLUMN last_modified INT; -CREATE INDEX timestamp ON {PREFIX}entries (timestamp); -CREATE INDEX last_modified ON {PREFIX}entries (last_modified); +CREATE INDEX date_idx ON {PREFIX}entries (timestamp); +CREATE INDEX mod_idx ON {PREFIX}entries (last_modified); UPDATE {PREFIX}entries SET last_modified = timestamp; INSERT INTO {PREFIX}plugins(name, placement, sort_order) VALUES ('serendipity_event_nl2br:39979424fea674e78399659e67edaf12', 'event', 10); Index: db_update_0.6.2_0.6.3_mysql.sql =================================================================== RCS file: /cvsroot/php-blog/serendipity/sql/db_update_0.6.2_0.6.3_mysql.sql,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- db_update_0.6.2_0.6.3_mysql.sql 26 May 2004 17:02:35 -0000 1.3 +++ db_update_0.6.2_0.6.3_mysql.sql 13 Oct 2004 08:57:52 -0000 1.4 @@ -1,2 +1,2 @@ ALTER TABLE {PREFIX}images ADD COLUMN path text; -CREATE {FULLTEXT} INDEX pathkey on {PREFIX}images (path); +CREATE {FULLTEXT} INDEX pathkey_idx on {PREFIX}images (path); Index: db_update_0.6_0.6.1_postgres.sql =================================================================== RCS file: /cvsroot/php-blog/serendipity/sql/db_update_0.6_0.6.1_postgres.sql,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- db_update_0.6_0.6.1_postgres.sql 6 Sep 2004 09:15:32 -0000 1.3 +++ db_update_0.6_0.6.1_postgres.sql 13 Oct 2004 08:57:52 -0000 1.4 @@ -8,15 +8,15 @@ UPDATE {PREFIX}config SET authorid=0; ALTER TABLE {PREFIX}config ALTER COLUMN authorid SET NOT NULL; ALTER TABLE {PREFIX}config ALTER COLUMN authorid SET DEFAULT '0'; -CREATE INDEX config_authorid ON {PREFIX}config (authorid); +CREATE INDEX authorid_idx ON {PREFIX}config (authorid); ALTER TABLE {PREFIX}config DROP CONSTRAINT {PREFIX}config_pkey; ALTER TABLE {PREFIX}config ADD PRIMARY KEY (name, authorid); ALTER TABLE {PREFIX}plugins ADD COLUMN authorid INT; ALTER TABLE {PREFIX}plugins ALTER COLUMN authorid SET DEFAULT '0'; -CREATE INDEX plugins_authorid ON {PREFIX}plugins (authorid); +CREATE INDEX authorid_idx ON {PREFIX}plugins (authorid); ALTER TABLE {PREFIX}images ADD COLUMN authorid INT; ALTER TABLE {PREFIX}images ALTER COLUMN authorid SET DEFAULT '0'; -CREATE INDEX images_authorid ON {PREFIX}images (authorid); +CREATE INDEX authorid_idx ON {PREFIX}images (authorid); Index: db_update_0.5_0.5.1_mysql.sql =================================================================== RCS file: /cvsroot/php-blog/serendipity/sql/db_update_0.5_0.5.1_mysql.sql,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- db_update_0.5_0.5.1_mysql.sql 2 Mar 2004 17:57:05 -0000 1.2 +++ db_update_0.5_0.5.1_mysql.sql 13 Oct 2004 08:57:52 -0000 1.3 @@ -18,14 +18,14 @@ UPDATE {PREFIX}config SET name = REPLACE(name, 'serendipity_plugin_content_rewrite', 'serendipity_event_contentrewrite') WHERE name LIKE '%serendipity_plugin_content_rewrite%'; - + UPDATE {PREFIX}plugins SET placement = 'event' WHERE name LIKE '%serendipity_event_contentrewrite%'; ALTER TABLE {PREFIX}entries ADD last_modified INT(10) UNSIGNED default null; -CREATE INDEX timestamp ON {PREFIX}entries (timestamp); -CREATE INDEX last_modified ON {PREFIX}entries (last_modified); +CREATE INDEX date_idx ON {PREFIX}entries (timestamp); +CREATE INDEX mod_idx ON {PREFIX}entries (last_modified); UPDATE {PREFIX}entries SET last_modified = timestamp; INSERT INTO {PREFIX}plugins(name, placement, sort_order) VALUES ('serendipity_event_nl2br:39979424fea674e78399659e67edaf12', 'event', 10); Index: db_update_0.6.2_0.6.3_postgres.sql =================================================================== RCS file: /cvsroot/php-blog/serendipity/sql/db_update_0.6.2_0.6.3_postgres.sql,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- db_update_0.6.2_0.6.3_postgres.sql 6 Sep 2004 09:15:32 -0000 1.4 +++ db_update_0.6.2_0.6.3_postgres.sql 13 Oct 2004 08:57:52 -0000 1.5 @@ -1,4 +1,4 @@ ALTER TABLE {PREFIX}images ADD COLUMN path text; ALTER TABLE {PREFIX}images ALTER COLUMN path SET DEFAULT '/'; UPDATE {PREFIX}images SET path = '/'; -CREATE {FULLTEXT} INDEX pathkey on {PREFIX}images (path); +CREATE {FULLTEXT} INDEX pathkey_idx on {PREFIX}images (path); Index: db_update_0.6_0.6.1_mysql.sql =================================================================== RCS file: /cvsroot/php-blog/serendipity/sql/db_update_0.6_0.6.1_mysql.sql,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- db_update_0.6_0.6.1_mysql.sql 7 Apr 2004 08:17:50 -0000 1.2 +++ db_update_0.6_0.6.1_mysql.sql 13 Oct 2004 08:57:52 -0000 1.3 @@ -3,13 +3,13 @@ UPDATE {PREFIX}authors SET userlevel = 1 WHERE authorid > 1; ALTER TABLE {PREFIX}config ADD authorid INT UNSIGNED NOT NULL DEFAULT '0'; -ALTER TABLE {PREFIX}config ADD INDEX (authorid); +CREATE INDEX authorid_idx ON {PREFIX}config (authorid); ALTER TABLE {PREFIX}config DROP PRIMARY KEY; ALTER TABLE {PREFIX}config ADD PRIMARY KEY (name, authorid); ALTER TABLE {PREFIX}plugins ADD authorid INT UNSIGNED DEFAULT '0'; -ALTER TABLE {PREFIX}plugins ADD INDEX (authorid); +CREATE INDEX authorid_idx ON {PREFIX}plugins (authorid); ALTER TABLE {PREFIX}images ADD authorid INT UNSIGNED DEFAULT '0'; -ALTER TABLE {PREFIX}images ADD INDEX (authorid); +CREATE INDEX authorid_idx ON {PREFIX}images (authorid); Index: db_update_0.6.5_0.6.6_mysql.sql =================================================================== RCS file: /cvsroot/php-blog/serendipity/sql/db_update_0.6.5_0.6.6_mysql.sql,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- db_update_0.6.5_0.6.6_mysql.sql 18 Jun 2004 09:04:40 -0000 1.1 +++ db_update_0.6.5_0.6.6_mysql.sql 13 Oct 2004 08:57:52 -0000 1.2 @@ -1 +1 @@ -CREATE UNIQUE INDEX entryid ON {PREFIX}entrycat (entryid, categoryid); \ No newline at end of file +CREATE UNIQUE INDEX entryid_idx ON {PREFIX}entrycat (entryid, categoryid); \ No newline at end of file |
