summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2007-05-30 08:34:12 +0000
committerDries Buytaert <dries@buytaert.net>2007-05-30 08:34:12 +0000
commit9c79a1f8a054a737bfa07332da1007c928b81708 (patch)
treed7c104a498131cc4f71046df10cd33e94ab52dc8
parent4fd54aabc574f9f7afb2f10960e033af1cb3275b (diff)
downloadbrdo-9c79a1f8a054a737bfa07332da1007c928b81708.tar.gz
brdo-9c79a1f8a054a737bfa07332da1007c928b81708.tar.bz2
- Patch #147761 by hswong3i: made dblog Oracle-friendly.
-rw-r--r--modules/dblog/dblog.module2
-rw-r--r--modules/dblog/dblog.schema4
2 files changed, 3 insertions, 3 deletions
diff --git a/modules/dblog/dblog.module b/modules/dblog/dblog.module
index 6bc52126e..f2a369709 100644
--- a/modules/dblog/dblog.module
+++ b/modules/dblog/dblog.module
@@ -196,7 +196,7 @@ function dblog_top($type) {
array('data' => t('Message'), 'field' => 'message')
);
- $result = pager_query("SELECT COUNT(wid) AS count, message, variables FROM {watchdog} WHERE type = '%s' GROUP BY message ". tablesort_sql($header), 30, 0, "SELECT COUNT(DISTINCT(message)) FROM {watchdog} WHERE type = '%s'", $type);
+ $result = pager_query("SELECT COUNT(wid) AS count, message, variables FROM {watchdog} WHERE type = '%s' GROUP BY (message, variables) ". tablesort_sql($header), 30, 0, "SELECT COUNT(DISTINCT(message)) FROM {watchdog} WHERE type = '%s'", $type);
$rows = array();
while ($dblog = db_fetch_object($result)) {
diff --git a/modules/dblog/dblog.schema b/modules/dblog/dblog.schema
index 785f1d98f..56cd84a42 100644
--- a/modules/dblog/dblog.schema
+++ b/modules/dblog/dblog.schema
@@ -7,8 +7,8 @@ function dblog_schema() {
'wid' => array('type' => 'serial', 'not null' => TRUE),
'uid' => array('type' => 'int', 'not null' => TRUE, 'default' => 0),
'type' => array('type' => 'varchar', 'length' => 16, 'not null' => TRUE, 'default' => ''),
- 'message' => array('type' => 'text', 'not null' => TRUE, 'size' => 'big'),
- 'variables' => array('type' => 'text', 'not null' => TRUE, 'size' => 'big'),
+ 'message' => array('type' => 'text', 'not null' => TRUE, 'size' => 'medium'),
+ 'variables' => array('type' => 'text', 'not null' => TRUE, 'size' => 'medium'),
'severity' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0, 'size' => 'tiny'),
'link' => array('type' => 'varchar', 'length' => 255, 'not null' => TRUE, 'default' => ''),
'location' => array('type' => 'text', 'not null' => TRUE),