? cvs_get_vanilla.sh ? database.mysql_15.patch ? database.pgsql.inc_1.patch ? database.pgsql.inc_2.patch ? db_rewrite_nail_1.patch ? edit_anonymous-43032_1.diff ? edit_anonymous-43032_2.diff ? pgsql_7.3_compatibility-58113_0.diff ? system_177.pg.patch ? updates.inc.207.diff Index: database/database.pgsql =================================================================== RCS file: /cvs/drupal/drupal/database/database.pgsql,v retrieving revision 1.171 diff -u -p -r1.171 database.pgsql --- database/database.pgsql 4 Mar 2006 18:12:10 -0000 1.171 +++ database/database.pgsql 11 Apr 2006 14:38:49 -0000 @@ -390,8 +390,9 @@ CREATE INDEX locales_target_plural_idx O -- +CREATE SEQUENCE menu_mid_seq START 2; CREATE TABLE menu ( - mid serial, + mid integer NOT NULL DEFAULT nextval('menu_mid_seq'), pid integer NOT NULL default '0', path varchar(255) NOT NULL default '', title varchar(255) NOT NULL default '', @@ -868,16 +869,11 @@ INSERT INTO locales_meta (locale, name, INSERT INTO variable (name, value) VALUES ('node_options_forum', 'a:1:{i:0;s:6:"status";}'); -INSERT INTO menu VALUES (2, 0, '', 'Primary links', '', 0, 115); +INSERT INTO menu(pid, path, title, description, weight, type) VALUES (0, '', 'Primary links', '', 0, 115); INSERT INTO variable VALUES ('menu_primary_menu', 'i:2;'); INSERT INTO variable VALUES ('menu_secondary_menu', 'i:2;'); --- ---- Alter some sequences ---- -ALTER SEQUENCE menu_mid_seq RESTART 3; - ---- --- Functions --- @@ -900,7 +896,11 @@ CREATE OR REPLACE FUNCTION "concat"(text SELECT $1 || $2; ' LANGUAGE 'sql'; -CREATE OR REPLACE FUNCTION "if"(boolean, anyelement, anyelement) RETURNS anyelement AS ' +CREATE OR REPLACE FUNCTION "if"(boolean, text, text) RETURNS text AS ' + SELECT CASE WHEN $1 THEN $2 ELSE $3 END; +' LANGUAGE 'sql'; + +CREATE OR REPLACE FUNCTION "if"(boolean, integer, integer) RETURNS integer AS ' SELECT CASE WHEN $1 THEN $2 ELSE $3 END; ' LANGUAGE 'sql'; Index: scripts/prefix.sh =================================================================== RCS file: /cvs/drupal/drupal/scripts/prefix.sh,v retrieving revision 1.7 diff -u -p -r1.7 prefix.sh --- scripts/prefix.sh 27 Mar 2006 10:28:34 -0000 1.7 +++ scripts/prefix.sh 11 Apr 2006 14:38:49 -0000 @@ -25,5 +25,6 @@ sed "s/^CREATE TABLE /CREATE TABLE $PREF s/^CREATE UNIQUE INDEX \(.*\) ON /CREATE UNIQUE INDEX $PREFIX\\1 ON $PREFIX/; s/^UPDATE \(.*\) SET /UPDATE $PREFIX\\1 SET /; s/^DROP TABLE IF EXISTS /DROP TABLE IF EXISTS $PREFIX/; + s/ DEFAULT nextval('/ DEFAULT nextval('$PREFIX/; " $2