[geeklog-cvs] geeklog: Fix install issue with PgSQL. Bug #0001251.
geeklog-cvs at lists.geeklog.net
geeklog-cvs at lists.geeklog.net
Sat Feb 12 13:42:25 EST 2011
changeset 8101:b1bc44c6eedd
url: http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/b1bc44c6eedd
user: Rouslan Placella <rouslan at placella.com>
date: Fri Feb 11 23:23:41 2011 +0000
description:
Fix install issue with PgSQL. Bug #0001251.
diffstat:
plugins/calendar/sql/pgsql_install.php | 8 +-
plugins/links/sql/pgsql_install.php | 6 +-
plugins/polls/sql/pgsql_install.php | 10 +-
plugins/spamx/sql/pgsql_install.php | 2 +-
plugins/staticpages/sql/pgsql_install.php | 12 +-
sql/pgsql_tableanddata.php | 94 +++++++++++++++---------------
6 files changed, 66 insertions(+), 66 deletions(-)
diffs (290 lines):
diff -r 606f73b62379 -r b1bc44c6eedd plugins/calendar/sql/pgsql_install.php
--- a/plugins/calendar/sql/pgsql_install.php Sat Jan 29 14:18:20 2011 +0100
+++ b/plugins/calendar/sql/pgsql_install.php Fri Feb 11 23:23:41 2011 +0000
@@ -58,10 +58,10 @@
timestart time default NULL,
timeend time default NULL,
PRIMARY KEY (eid));
- CREATE INDEX events_eid ON {$_TABLES['events']}(eid);
- CREATE INDEX events_event_type ON {$_TABLES['events']}(event_type);
- CREATE INDEX events_datestart ON {$_TABLES['events']}(datestart);
- CREATE INDEX events_dateend ON {$_TABLES['events']}(dateend);
+ CREATE INDEX {$_TABLES['events']}_eid ON {$_TABLES['events']}(eid);
+ CREATE INDEX {$_TABLES['events']}_event_type ON {$_TABLES['events']}(event_type);
+ CREATE INDEX {$_TABLES['events']}_datestart ON {$_TABLES['events']}(datestart);
+ CREATE INDEX {$_TABLES['events']}_dateend ON {$_TABLES['events']}(dateend);
";
$_SQL[] = "
diff -r 606f73b62379 -r b1bc44c6eedd plugins/links/sql/pgsql_install.php
--- a/plugins/links/sql/pgsql_install.php Sat Jan 29 14:18:20 2011 +0100
+++ b/plugins/links/sql/pgsql_install.php Fri Feb 11 23:23:41 2011 +0000
@@ -64,7 +64,7 @@
perm_members int NOT NULL default '2',
perm_anon int NOT NULL default '2',
PRIMARY KEY (cid));
- CREATE INDEX links_pid ON {$_TABLES['linkcategories']}(pid);
+ CREATE INDEX {$_TABLES['linkcategories']}_pid ON {$_TABLES['linkcategories']}(pid);
";
@@ -84,8 +84,8 @@
perm_members int NOT NULL default '2',
perm_anon int NOT NULL default '2',
PRIMARY KEY (lid));
- CREATE INDEX links_category ON {$_TABLES['links']}(cid);
- CREATE INDEX links_date ON {$_TABLES['links']}(date);
+ CREATE INDEX {$_TABLES['links']}_category ON {$_TABLES['links']}(cid);
+ CREATE INDEX {$_TABLES['links']}_date ON {$_TABLES['links']}(date);
";
$_SQL[] = "
diff -r 606f73b62379 -r b1bc44c6eedd plugins/polls/sql/pgsql_install.php
--- a/plugins/polls/sql/pgsql_install.php Sat Jan 29 14:18:20 2011 +0100
+++ b/plugins/polls/sql/pgsql_install.php Fri Feb 11 23:23:41 2011 +0000
@@ -73,11 +73,11 @@
perm_members int NOT NULL default '2',
perm_anon int NOT NULL default '2',
PRIMARY KEY (pid));
- CREATE INDEX pollquestions_qid ON {$_TABLES['polltopics']}(pid);
- CREATE INDEX pollquestions_created ON {$_TABLES['polltopics']}(created);
- CREATE INDEX pollquestions_display ON {$_TABLES['polltopics']}(display);
- CREATE INDEX pollquestions_commentcode ON {$_TABLES['polltopics']}(commentcode);
- CREATE INDEX pollquestions_statuscode ON {$_TABLES['polltopics']}(statuscode);
+ CREATE INDEX {$_TABLES['polltopics']}_pid ON {$_TABLES['polltopics']}(pid);
+ CREATE INDEX {$_TABLES['polltopics']}_created ON {$_TABLES['polltopics']}(created);
+ CREATE INDEX {$_TABLES['polltopics']}_display ON {$_TABLES['polltopics']}(display);
+ CREATE INDEX {$_TABLES['polltopics']}_commentcode ON {$_TABLES['polltopics']}(commentcode);
+ CREATE INDEX {$_TABLES['polltopics']}_statuscode ON {$_TABLES['polltopics']}(statuscode);
";
$_SQL[] = "
diff -r 606f73b62379 -r b1bc44c6eedd plugins/spamx/sql/pgsql_install.php
--- a/plugins/spamx/sql/pgsql_install.php Sat Jan 29 14:18:20 2011 +0100
+++ b/plugins/spamx/sql/pgsql_install.php Fri Feb 11 23:23:41 2011 +0000
@@ -34,7 +34,7 @@
CREATE TABLE {$_TABLES['spamx']} (
name varchar(20) NOT NULL default '',
value varchar(255) NOT NULL default '');
- CREATE INDEX spamx_name ON {$_TABLES['spamx']}(name);
+ CREATE INDEX {$_TABLES['spamx']}_name ON {$_TABLES['spamx']}(name);
";
$DEFVALUES[] = "INSERT INTO {$_TABLES['vars']} (name, value) VALUES ('spamx.counter', '0')";
diff -r 606f73b62379 -r b1bc44c6eedd plugins/staticpages/sql/pgsql_install.php
--- a/plugins/staticpages/sql/pgsql_install.php Sat Jan 29 14:18:20 2011 +0100
+++ b/plugins/staticpages/sql/pgsql_install.php Fri Feb 11 23:23:41 2011 +0000
@@ -66,12 +66,12 @@
sp_inblock int default '1',
postmode varchar(16) NOT NULL default 'html',
PRIMARY KEY (sp_id));
- CREATE INDEX staticpage_sp_uid ON {$_TABLES['staticpage']}(sp_uid);
- CREATE INDEX staticpage_created ON {$_TABLES['staticpage']}(created);
- CREATE INDEX staticpage_sp_onmenu ON {$_TABLES['staticpage']}(sp_onmenu);
- CREATE INDEX staticpage_sp_centerblock ON {$_TABLES['staticpage']}(sp_centerblock);
- CREATE INDEX staticpage_sp_tid ON {$_TABLES['staticpage']}(sp_tid);
- CREATE INDEX staticpage_sp_where ON {$_TABLES['staticpage']}(sp_where);
+ CREATE INDEX {$_TABLES['staticpage']}_sp_uid ON {$_TABLES['staticpage']}(sp_uid);
+ CREATE INDEX {$_TABLES['staticpage']}_created ON {$_TABLES['staticpage']}(created);
+ CREATE INDEX {$_TABLES['staticpage']}_sp_onmenu ON {$_TABLES['staticpage']}(sp_onmenu);
+ CREATE INDEX {$_TABLES['staticpage']}_sp_centerblock ON {$_TABLES['staticpage']}(sp_centerblock);
+ CREATE INDEX {$_TABLES['staticpage']}_sp_tid ON {$_TABLES['staticpage']}(sp_tid);
+ CREATE INDEX {$_TABLES['staticpage']}_sp_where ON {$_TABLES['staticpage']}(sp_where);
";
?>
diff -r 606f73b62379 -r b1bc44c6eedd sql/pgsql_tableanddata.php
--- a/sql/pgsql_tableanddata.php Sat Jan 29 14:18:20 2011 +0100
+++ b/sql/pgsql_tableanddata.php Fri Feb 11 23:23:41 2011 +0000
@@ -44,12 +44,12 @@
perm_anon smallint NOT NULL default '2',
PRIMARY KEY (bid)
);
- CREATE INDEX blocks_bid ON {$_TABLES['blocks']}(bid);
- CREATE INDEX blocks_is_enabled ON {$_TABLES['blocks']}(is_enabled);
- CREATE INDEX blocks_tid ON {$_TABLES['blocks']}(tid);
- CREATE INDEX blocks_type ON {$_TABLES['blocks']}(type);
- CREATE INDEX blocks_name ON {$_TABLES['blocks']}(name);
- CREATE INDEX blocks_onleft ON {$_TABLES['blocks']}(onleft);
+ CREATE INDEX {$_TABLES['blocks']}_bid ON {$_TABLES['blocks']}(bid);
+ CREATE INDEX {$_TABLES['blocks']}_is_enabled ON {$_TABLES['blocks']}(is_enabled);
+ CREATE INDEX {$_TABLES['blocks']}_tid ON {$_TABLES['blocks']}(tid);
+ CREATE INDEX {$_TABLES['blocks']}_type ON {$_TABLES['blocks']}(type);
+ CREATE INDEX {$_TABLES['blocks']}_name ON {$_TABLES['blocks']}(name);
+ CREATE INDEX {$_TABLES['blocks']}_onleft ON {$_TABLES['blocks']}(onleft);
";
$_SQL[] = "
@@ -106,11 +106,11 @@
ipaddress varchar(39) NOT NULL default '',
PRIMARY KEY (cid)
);
- CREATE INDEX comments_sid ON {$_TABLES['comments']}(sid);
- CREATE INDEX comments_uid ON {$_TABLES['comments']}(uid);
- CREATE INDEX comments_lft ON {$_TABLES['comments']}(lft);
- CREATE INDEX comments_rht ON {$_TABLES['comments']}(rht);
- CREATE INDEX comments_date ON {$_TABLES['comments']}(date);
+ CREATE INDEX {$_TABLES['comments']}_sid ON {$_TABLES['comments']}(sid);
+ CREATE INDEX {$_TABLES['comments']}_uid ON {$_TABLES['comments']}(uid);
+ CREATE INDEX {$_TABLES['comments']}_lft ON {$_TABLES['comments']}(lft);
+ CREATE INDEX {$_TABLES['comments']}_rht ON {$_TABLES['comments']}(rht);
+ CREATE INDEX {$_TABLES['comments']}_date ON {$_TABLES['comments']}(date);
";
$_SQL[] = "
@@ -175,7 +175,7 @@
ft_descr varchar(255) NOT NULL default '',
ft_gl_core smallint NOT NULL default '0',
PRIMARY KEY (ft_id));
- CREATE INDEX ft_name ON {$_TABLES['features']}(ft_name);
+ CREATE INDEX {$_TABLES['features']}_ft_name ON {$_TABLES['features']}(ft_name);
";
$_SQL[] = "
@@ -192,8 +192,8 @@
ug_uid smallint default NULL,
ug_grp_id smallint default NULL
);
- CREATE INDEX group_assignments_ug_main_grp_id ON {$_TABLES['group_assignments']}(ug_main_grp_id);
- CREATE INDEX group_assignments_ug_uid ON {$_TABLES['group_assignments']}(ug_uid);
+ CREATE INDEX {$_TABLES['group_assignments']}_ug_main_grp_id ON {$_TABLES['group_assignments']}(ug_main_grp_id);
+ CREATE INDEX {$_TABLES['group_assignments']}_ug_uid ON {$_TABLES['group_assignments']}(ug_uid);
";
$_SQL[] = "
@@ -205,7 +205,7 @@
grp_default smallint NOT NULL default '0',
PRIMARY KEY (grp_id)
);
-CREATE UNIQUE INDEX grp_name ON {$_TABLES['groups']}(grp_name);
+CREATE UNIQUE INDEX {$_TABLES['groups']}_grp_name ON {$_TABLES['groups']}(grp_name);
";
$_SQL[] = "
@@ -225,7 +225,7 @@
method varchar(80) default NULL,
is_enabled smallint NOT NULL DEFAULT '1',
PRIMARY KEY (pid));
- CREATE INDEX pingservice_is_enabled ON {$_TABLES['pingservice']}(is_enabled);
+ CREATE INDEX {$_TABLES['pingservice']}_is_enabled ON {$_TABLES['pingservice']}(is_enabled);
";
$_SQL[] = "
@@ -237,7 +237,7 @@
pi_homepage varchar(128) NOT NULL default '',
PRIMARY KEY (pi_name)
);
- CREATE INDEX plugins_enabled ON {$_TABLES['plugins']}(pi_enabled);
+ CREATE INDEX {$_TABLES['plugins']}_enabled ON {$_TABLES['plugins']}(pi_enabled);
";
$_SQL[] = "
@@ -257,8 +257,8 @@
md5_sess_id varchar(128) default NULL,
PRIMARY KEY (sess_id)
);
- CREATE INDEX start_time ON {$_TABLES['sessions']} (start_time);
- CREATE INDEX remote_ip ON {$_TABLES['sessions']}(remote_ip);
+ CREATE INDEX {$_TABLES['sessions']}_start_time ON {$_TABLES['sessions']} (start_time);
+ CREATE INDEX {$_TABLES['sessions']}_remote_ip ON {$_TABLES['sessions']}(remote_ip);
";
$_SQL[] = "
@@ -276,8 +276,8 @@
date int default NULL,
type varchar(30) NOT NULL default 'submit',
PRIMARY KEY (id));
- CREATE UNIQUE INDEX type_ipaddress on {$_TABLES['speedlimit']}(type,ipaddress);
- CREATE UNIQUE INDEX date on {$_TABLES['speedlimit']}(date);
+ CREATE UNIQUE INDEX {$_TABLES['speedlimit']}_type_ipaddress on {$_TABLES['speedlimit']}(type,ipaddress);
+ CREATE UNIQUE INDEX {$_TABLES['speedlimit']}_date on {$_TABLES['speedlimit']}(date);
";
$_SQL[] = "
@@ -324,15 +324,15 @@
perm_anon smallint NOT NULL default '2',
PRIMARY KEY (sid)
);
-CREATE INDEX stories_sid ON {$_TABLES['stories']}(sid);
-CREATE INDEX stories_tid ON {$_TABLES['stories']}(tid);
-CREATE INDEX stories_uid ON {$_TABLES['stories']}(uid);
-CREATE INDEX stories_featured ON {$_TABLES['stories']}(featured);
-CREATE INDEX stories_hits ON {$_TABLES['stories']}(hits);
-CREATE INDEX stories_statuscode ON {$_TABLES['stories']}(statuscode);
-CREATE INDEX stories_expire ON {$_TABLES['stories']}(expire);
-CREATE INDEX stories_date ON {$_TABLES['stories']}(date);
-CREATE INDEX stories_frontpage ON {$_TABLES['stories']}(frontpage);
+CREATE INDEX {$_TABLES['stories']}_sid ON {$_TABLES['stories']}(sid);
+CREATE INDEX {$_TABLES['stories']}_tid ON {$_TABLES['stories']}(tid);
+CREATE INDEX {$_TABLES['stories']}_uid ON {$_TABLES['stories']}(uid);
+CREATE INDEX {$_TABLES['stories']}_featured ON {$_TABLES['stories']}(featured);
+CREATE INDEX {$_TABLES['stories']}_hits ON {$_TABLES['stories']}(hits);
+CREATE INDEX {$_TABLES['stories']}_statuscode ON {$_TABLES['stories']}(statuscode);
+CREATE INDEX {$_TABLES['stories']}_expire ON {$_TABLES['stories']}(expire);
+CREATE INDEX {$_TABLES['stories']}_date ON {$_TABLES['stories']}(date);
+CREATE INDEX {$_TABLES['stories']}_frontpage ON {$_TABLES['stories']}(frontpage);
";
$_SQL[] = "
@@ -369,10 +369,10 @@
update_info text,
PRIMARY KEY (fid)
);
-CREATE INDEX syndication_type on {$_TABLES['syndication']}(type);
-CREATE INDEX syndication_topic ON {$_TABLES['syndication']}(topic);
-CREATE INDEX syndication_is_enabled ON {$_TABLES['syndication']}(is_enabled);
-CREATE INDEX syndication_updated ON {$_TABLES['syndication']}(updated);
+CREATE INDEX {$_TABLES['syndication']}_type on {$_TABLES['syndication']}(type);
+CREATE INDEX {$_TABLES['syndication']}_topic ON {$_TABLES['syndication']}(topic);
+CREATE INDEX {$_TABLES['syndication']}_is_enabled ON {$_TABLES['syndication']}(is_enabled);
+CREATE INDEX {$_TABLES['syndication']}_updated ON {$_TABLES['syndication']}(updated);
";
$_SQL[] = "
@@ -421,10 +421,10 @@
PRIMARY KEY (cid)
);
- CREATE INDEX trackback_sid ON {$_TABLES['trackback']}(sid);
- CREATE INDEX trackback_url ON {$_TABLES['trackback']}(url);
- CREATE INDEX trackback_type ON {$_TABLES['trackback']}(type);
- CREATE INDEX trackback_date ON {$_TABLES['trackback']}(date);
+ CREATE INDEX {$_TABLES['trackback']}_sid ON {$_TABLES['trackback']}(sid);
+ CREATE INDEX {$_TABLES['trackback']}_url ON {$_TABLES['trackback']}(url);
+ CREATE INDEX {$_TABLES['trackback']}_type ON {$_TABLES['trackback']}(type);
+ CREATE INDEX {$_TABLES['trackback']}_date ON {$_TABLES['trackback']}(date);
";
$_SQL[] = "
@@ -456,9 +456,9 @@
maxstories smallint default NULL,
PRIMARY KEY (uid)
);
-CREATE INDEX userindex_uid ON {$_TABLES['userindex']}(uid);
-CREATE INDEX userindex_noboxes ON {$_TABLES['userindex']}(noboxes);
-CREATE INDEX userindex_maxstories ON {$_TABLES['userindex']}(maxstories);
+CREATE INDEX {$_TABLES['userindex']}_uid ON {$_TABLES['userindex']}(uid);
+CREATE INDEX {$_TABLES['userindex']}_noboxes ON {$_TABLES['userindex']}(noboxes);
+CREATE INDEX {$_TABLES['userindex']}_maxstories ON {$_TABLES['userindex']}(maxstories);
";
$_SQL[] = "
@@ -513,12 +513,12 @@
num_reminders smallint NOT NULL default 0,
PRIMARY KEY (uid)
);
- CREATE INDEX LOGIN ON {$_TABLES['users']}(uid,passwd,username);
- CREATE INDEX users_username ON {$_TABLES['users']}(username);
- CREATE INDEX users_fullname ON {$_TABLES['users']}(fullname);
- CREATE INDEX users_email ON {$_TABLES['users']}(email);
- CREATE INDEX users_passwd ON {$_TABLES['users']}(passwd);
- CREATE INDEX users_pwrequestid ON {$_TABLES['users']}(pwrequestid);
+ CREATE INDEX {$_TABLES['users']}_LOGIN ON {$_TABLES['users']}(uid,passwd,username);
+ CREATE INDEX {$_TABLES['users']}_username ON {$_TABLES['users']}(username);
+ CREATE INDEX {$_TABLES['users']}_fullname ON {$_TABLES['users']}(fullname);
+ CREATE INDEX {$_TABLES['users']}_email ON {$_TABLES['users']}(email);
+ CREATE INDEX {$_TABLES['users']}_passwd ON {$_TABLES['users']}(passwd);
+ CREATE INDEX {$_TABLES['users']}_pwrequestid ON {$_TABLES['users']}(pwrequestid);
";
$_SQL[] = "
More information about the geeklog-cvs
mailing list