summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2007-11-17 14:01:24 +0000
committerDries Buytaert <dries@buytaert.net>2007-11-17 14:01:24 +0000
commit6bb15d29daac4b39d2b184928d5c4fa50e7456ab (patch)
treee11a7ec0ecc45e5ddd147854f57a3ecc79e99b9d /modules
parentc01f6bad7bb7698f74a3ce68e7d1de7fb65eebc2 (diff)
downloadbrdo-6bb15d29daac4b39d2b184928d5c4fa50e7456ab.tar.gz
brdo-6bb15d29daac4b39d2b184928d5c4fa50e7456ab.tar.bz2
- Patch #192348 by douggreen and bjaspan: fixed database inconsistencies.
Diffstat (limited to 'modules')
-rw-r--r--modules/search/search.install2
-rw-r--r--modules/system/system.install2
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/search/search.install b/modules/search/search.install
index 168e17959..ff8f692de 100644
--- a/modules/search/search.install
+++ b/modules/search/search.install
@@ -55,7 +55,7 @@ function search_schema() {
'description' => t('Set to force node reindexing.'),
),
),
- 'indexes' => array('sid_type' => array('sid', 'type')),
+ 'unique keys' => array('sid_type' => array('sid', 'type')),
);
$schema['search_index'] = array(
diff --git a/modules/system/system.install b/modules/system/system.install
index f51c2e54c..03250d52c 100644
--- a/modules/system/system.install
+++ b/modules/system/system.install
@@ -4515,7 +4515,7 @@ function system_update_6036() {
// Since it's possible that some existing sites have duplicates,
// create the index using the IGNORE keyword, which ignores duplicate errors.
// However, pgsql doesn't support it
- $ret[] = update_sql("ALTER IGNORE TABLE {search_index} ADD UNIQUE KEY sid_word_type (sid, word, type)");
+ $ret[] = update_sql("ALTER IGNORE TABLE {search_index} ADD UNIQUE KEY word_sid_type (word, sid, type)");
$ret[] = update_sql("ALTER IGNORE TABLE {search_dataset} ADD UNIQUE KEY sid_type (sid, type)");
}
else {