diff --git a/sites/all/modules/unl/unl.install b/sites/all/modules/unl/unl.install index 3269633873f09c5085f6496baffedf8a0fc97d6e..5ca132fe6ae1202721dab5531969436c803a835a 100644 --- a/sites/all/modules/unl/unl.install +++ b/sites/all/modules/unl/unl.install @@ -10,12 +10,6 @@ function unl_schema() { 'unsigned' => TRUE, 'not null' => TRUE, ), - 'site_path_prefix' => array( - 'type' => 'varchar', - 'length' => 255, - 'not null' => TRUE, - 'default' => '', - ), 'site_path' => array( 'type' => 'varchar', 'length' => 255, @@ -37,18 +31,26 @@ function unl_schema() { 'type' => 'int', 'not null' => TRUE, 'default' => 1, + ), + 'db_prefix' => array( + 'type' => 'varchar', + 'length' => 255, + 'not null' => TRUE, + 'default' => '', ) ), 'primary key' => array('site_id'), 'unique keys' => array( - 'sub_site' => array('site_path_prefix', 'site_path'), + 'sub_site' => array('site_path'), ) ); - return $schema; } +/** + * Updates prior to upgrading to unl module 7.x-1.0 + */ function unl_update_7100() { $table = array( 'description' => 'Table of tables to be programatically created', @@ -58,6 +60,12 @@ function unl_update_7100() { 'unsigned' => TRUE, 'not null' => TRUE, ), + 'site_path_prefix' => array( + 'type' => 'varchar', + 'length' => 255, + 'not null' => TRUE, + 'default' => '', + ), 'site_path' => array( 'type' => 'varchar', 'length' => 255, @@ -74,17 +82,6 @@ function unl_update_7100() { 'type' => 'int', 'not null' => TRUE, 'default' => 0, - ), - 'clean_url' => array( - 'type' => 'int', - 'not null' => TRUE, - 'default' => 1, - ), - 'db_prefix' => array( - 'type' => 'varchar', - 'length' => 255, - 'not null' => TRUE, - 'default' => '', ) ), 'primary key' => array('site_id'),