diff options
| -rw-r--r-- | modules/search/search.install | 16 | ||||
| -rw-r--r-- | modules/system/system.install | 17 |
2 files changed, 16 insertions, 17 deletions
diff --git a/modules/search/search.install b/modules/search/search.install index a7d8adbb1..0ba392849 100644 --- a/modules/search/search.install +++ b/modules/search/search.install @@ -89,7 +89,6 @@ function search_schema() { ), 'indexes' => array( 'sid_type' => array('sid', 'type'), - 'word' => array('word'), ), 'primary key' => array('word', 'sid', 'type'), ); @@ -152,3 +151,18 @@ function search_schema() { return $schema; } + +/** + * Replace unique keys in 'search_dataset' and 'search_index' by primary keys. + */ +function search_update_7000() { + $ret = array(); + db_drop_unique_key($ret, 'search_dataset', 'sid_type'); + db_add_primary_key($ret, 'search_dataset', array('sid', 'type')); + + db_drop_index($ret, 'search_index', 'word'); + db_drop_unique_key($ret, 'search_index', 'word_sid_type'); + db_add_primary_key($ret, 'search_index', array('word', 'sid', 'type')); + + return $ret; +} diff --git a/modules/system/system.install b/modules/system/system.install index af0140121..58f5e1f3d 100644 --- a/modules/system/system.install +++ b/modules/system/system.install @@ -3096,22 +3096,7 @@ function system_update_7011() { 'permission' => 'bypass node access', )); } - $insert->execute(); - return $ret; -} - -/** - * Replace unique keys in 'search_dataset' and 'search_index' by primary keys. - */ -function system_update_7012() { - $ret = array(); - db_drop_unique_key($ret, 'search_dataset', 'sid_type'); - db_add_primary_key($ret, 'search_dataset', array('sid', 'type')); - - db_drop_index($ret, 'search_index', 'word'); - db_drop_unique_key($ret, 'search_index', 'word_sid_type'); - db_add_primary_key($ret, 'search_index', array('word', 'sid', 'type')); - + $insert->execute(); return $ret; } |