Index: database/database.mysql
===================================================================
RCS file: /cvs/drupal/drupal/database/database.mysql,v
retrieving revision 1.174
diff -u -r1.174 database.mysql
--- database/database.mysql 23 Mar 2005 20:36:41 -0000 1.174
+++ database/database.mysql 13 Apr 2005 22:21:51 -0000
@@ -797,7 +797,7 @@
INSERT INTO role (rid, name) VALUES (2, 'authenticated user');
INSERT INTO permission VALUES (2,'access comments, access content, post comments, post comments without approval',0);
-REPLACE variable SET name='update_start', value='s:10:"2005-03-21";';
+REPLACE variable SET name='update_start', value='s:10:"2005-04-13";';
REPLACE variable SET name='theme_default', value='s:10:"bluemarine";';
REPLACE blocks SET module = 'user', delta = '0', status = '1';
Index: database/database.pgsql
===================================================================
RCS file: /cvs/drupal/drupal/database/database.pgsql,v
retrieving revision 1.110
diff -u -r1.110 database.pgsql
--- database/database.pgsql 3 Apr 2005 08:56:48 -0000 1.110
+++ database/database.pgsql 13 Apr 2005 22:21:52 -0000
@@ -574,7 +574,7 @@
CREATE TABLE search_total (
word varchar(50) NOT NULL default '',
- count integer default NULL
+ count float default NULL
);
CREATE INDEX search_total_word_idx ON search_total(word);
@@ -788,15 +788,15 @@
INSERT INTO system VALUES ('themes/bluemarine/xtemplate.xtmpl','bluemarine','theme','themes/engines/xtemplate/xtemplate.engine',1,0,0);
INSERT INTO system VALUES ('themes/engines/xtemplate/xtemplate.engine','xtemplate','theme_engine','',1,0,0);
-INSERT INTO variable(name,value) VALUES('update_start', 's:10:"2005-03-21";');
+INSERT INTO variable(name,value) VALUES('update_start', 's:10:"2005-04-13";');
INSERT INTO variable(name,value) VALUES('theme_default','s:10:"bluemarine";');
INSERT INTO users(uid,name,mail) VALUES(0,'','');
INSERT INTO users_roles(uid,rid) VALUES(0, 1);
-INSERT INTO role (rid, name) VALUES (1, 'anonymous user');
+INSERT INTO role (name) VALUES ('anonymous user');
INSERT INTO permission VALUES (1,'access content',0);
-INSERT INTO role (rid, name) VALUES (2, 'authenticated user');
+INSERT INTO role (name) VALUES ('authenticated user');
INSERT INTO permission VALUES (2,'access comments, access content, post comments, post comments without approval',0);
INSERT INTO blocks(module,delta,status) VALUES('user', 0, 1);
Index: database/updates.inc
===================================================================
RCS file: /cvs/drupal/drupal/database/updates.inc,v
retrieving revision 1.100.2.2
diff -u -r1.100.2.2 updates.inc
--- database/updates.inc 8 Apr 2005 13:19:25 -0000 1.100.2.2
+++ database/updates.inc 13 Apr 2005 22:21:54 -0000
@@ -104,7 +104,8 @@
"2005-02-23" => "update_125",
"2005-03-03" => "update_126",
"2005-03-18" => "update_127",
- "2005-03-21" => "update_128"
+ "2005-03-21" => "update_128",
+ "2005-04-13" => "update_129"
);
function update_32() {
@@ -2326,17 +2327,6 @@
return $ret;
}
-function update_sql($sql) {
- $edit = $_POST["edit"];
- $result = db_query($sql);
- if ($result) {
- return array('1', nl2br(htmlentities($sql)) ." ", "OK
\n");
- }
- else {
- return array('0', nl2br(htmlentities($sql)) ." ", "FAILED
\n");
- }
-}
-
function update_128() {
$ret = array();
@@ -2350,4 +2340,38 @@
return $ret;
}
+function update_129() {
+ /**
+ * PostgreSQL only update.
+ */
+ $ret = array();
+
+ if ($GLOBALS['db_type'] == 'pgsql') {
+ $ret[] = update_sql('DROP TABLE {search_total}');
+
+ $ret[] = update_sql("CREATE TABLE {search_total} (
+ word varchar(50) NOT NULL default '',
+ count float default NULL)");
+ $ret[] = update_sql('CREATE INDEX {search_total}_word_idx ON {search_total}(word)');
+
+ /**
+ * Wipe the search index
+ */
+ include_once('modules/search.module');
+ search_wipe();
+ }
+
+ return $ret;
+}
+
+function update_sql($sql) {
+ $edit = $_POST["edit"];
+ $result = db_query($sql);
+ if ($result) {
+ return array('1', nl2br(htmlentities($sql)) ." ", "OK
\n");
+ }
+ else {
+ return array('0', nl2br(htmlentities($sql)) ." ", "FAILED
\n");
+ }
+}
?>
Index: modules/statistics.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/statistics.module,v
retrieving revision 1.186
diff -u -r1.186 statistics.module
--- modules/statistics.module 31 Mar 2005 09:25:33 -0000 1.186
+++ modules/statistics.module 13 Apr 2005 22:21:55 -0000
@@ -283,7 +283,7 @@
array('data' => t('User'), 'field' => 'u.name'),
);
- $sql = "SELECT COUNT(a.uid) AS hits, a.uid, u.name FROM {accesslog} a LEFT JOIN {users} u ON a.uid = u.uid GROUP BY a.uid". tablesort_sql($header);
+ $sql = "SELECT COUNT(a.uid) AS hits, a.uid, u.name FROM {accesslog} a LEFT JOIN {users} u ON a.uid = u.uid GROUP BY a.uid, u.name". tablesort_sql($header);
$sql_cnt = "SELECT COUNT(DISTINCT(uid)) FROM {accesslog}";
$result = pager_query($sql, 30, 0, $sql_cnt);
Index: modules/taxonomy.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy.module,v
retrieving revision 1.192.2.1
diff -u -r1.192.2.1 taxonomy.module
--- modules/taxonomy.module 12 Apr 2005 19:20:13 -0000 1.192.2.1
+++ modules/taxonomy.module 13 Apr 2005 22:21:56 -0000
@@ -118,9 +118,8 @@
}
function taxonomy_save_vocabulary($edit) {
- if (!$edit['nodes']) {
- $edit['nodes'] = array();
- }
+ $edit['nodes'] = ($edit['nodes']) ? $edit['nodes'] : array();
+ $edit['weight'] = ($edit['weight']) ? $edit['weight'] : 0;
$data = array('name' => $edit['name'], 'description' => $edit['description'], 'help' => $edit['help'], 'multiple' => $edit['multiple'], 'required' => $edit['required'], 'hierarchy' => $edit['hierarchy'], 'relations' => $edit['relations'], 'weight' => $edit['weight'], 'module' => isset($edit['module']) ? $edit['module'] : 'taxonomy');
if ($edit['vid'] && $edit['name']) {