summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Wittens <steven@10.no-reply.drupal.org>2004-09-05 16:22:16 +0000
committerSteven Wittens <steven@10.no-reply.drupal.org>2004-09-05 16:22:16 +0000
commit7c4f8bae8742d25a87d2c550fb163b7bfe5d568a (patch)
tree376bd43cd090099f89a28a25c6401a30b56efbca
parent42f1c0c93c98c7124f7aba91c2cd8b3dba0c1068 (diff)
downloadbrdo-7c4f8bae8742d25a87d2c550fb163b7bfe5d568a.tar.gz
brdo-7c4f8bae8742d25a87d2c550fb163b7bfe5d568a.tar.bz2
#9861: Updates.inc/database.pgsql: incorrect menu sequence when $db_prefix was used.
-rw-r--r--database/database.pgsql4
-rw-r--r--database/updates.inc2
2 files changed, 5 insertions, 1 deletions
diff --git a/database/database.pgsql b/database/database.pgsql
index 0eaa8f0a1..58251fb0d 100644
--- a/database/database.pgsql
+++ b/database/database.pgsql
@@ -734,6 +734,10 @@ INSERT INTO permission VALUES (2,'access comments, access content, post comments
INSERT INTO blocks(module,delta,status) VALUES('user', '0', '1');
INSERT INTO blocks(module,delta,status) VALUES('user', '1', '1');
+INSERT INTO sequences (name, id) VALUES ('menu_mid', 1);
+
+INSERT INTO node_access VALUES (0, 0, 'all', 1, 0, 0);
+
INSERT INTO filter_formats VALUES (1,'Filtered HTML',',1,2,',1);
INSERT INTO filter_formats VALUES (2,'PHP code','',0);
INSERT INTO filter_formats VALUES (3,'Full HTML','',1));
diff --git a/database/updates.inc b/database/updates.inc
index 8f650b268..5260d1604 100644
--- a/database/updates.inc
+++ b/database/updates.inc
@@ -962,7 +962,6 @@ function update_83() {
status int(1) unsigned NOT NULL default '0',
PRIMARY KEY (mid)
);");
- $ret[] = update_sql("INSERT INTO {sequences} (name, id) VALUES ('menu_mid', 1)");
}
else {
$ret[] = update_sql("CREATE TABLE {menu} (
@@ -977,6 +976,7 @@ function update_83() {
);");
}
+ db_next_id('{menu}_mid');
return $ret;
}