summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Rothstein <drothstein@gmail.com>2013-01-27 16:57:30 -0500
committerDavid Rothstein <drothstein@gmail.com>2013-01-27 16:57:30 -0500
commitda660bbd04ba0388d6d46a92c4cb8de68917405d (patch)
tree814c28f9943dfd4ab1acd2e225b48ce613dd5c75
parent43c399884b889529595131d2b0be413484a6eb4d (diff)
downloadbrdo-da660bbd04ba0388d6d46a92c4cb8de68917405d.tar.gz
brdo-da660bbd04ba0388d6d46a92c4cb8de68917405d.tar.bz2
Issue #1879022 by omegamonk: Fixed Enforced dependencies errors updating to recent versions of Drupal 7.
-rw-r--r--modules/node/node.install2
-rw-r--r--modules/system/system.install2
2 files changed, 4 insertions, 0 deletions
diff --git a/modules/node/node.install b/modules/node/node.install
index 16d3dbaa0..43bfd531f 100644
--- a/modules/node/node.install
+++ b/modules/node/node.install
@@ -914,6 +914,7 @@ function node_update_7012() {
* Change {node}.vid default value from 0 to NULL to avoid deadlock issues on MySQL.
*/
function node_update_7013() {
+ db_drop_unique_key('node', 'vid');
db_change_field('node', 'vid', 'vid', array(
'description' => 'The current {node_revision}.vid version identifier.',
'type' => 'int',
@@ -921,6 +922,7 @@ function node_update_7013() {
'not null' => FALSE,
'default' => NULL,
));
+ db_add_unique_key('node', 'vid', array('vid'));
}
/**
diff --git a/modules/system/system.install b/modules/system/system.install
index 7b667678e..338e73a21 100644
--- a/modules/system/system.install
+++ b/modules/system/system.install
@@ -3032,6 +3032,7 @@ function system_update_7073() {
'default' => '',
'binary' => TRUE,
));
+ db_drop_unique_key('file_managed', 'uri');
db_change_field('file_managed', 'uri', 'uri', array(
'description' => 'The URI to access the file (either local or remote).',
'type' => 'varchar',
@@ -3040,6 +3041,7 @@ function system_update_7073() {
'default' => '',
'binary' => TRUE,
));
+ db_add_unique_key('file_managed', 'uri', array('uri'));
}
/**