diff --git a/RELEASE_NOTES b/RELEASE_NOTES index dc3380b9..b71dd37f 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -1,3 +1,10 @@ +1.4.4: +------ + +Renamed "group" table to "usergroup" +Be sure to run util/db-upgrade.sql on the mysql piler database + + 1.4.3: ------ diff --git a/VERSION b/VERSION index 428b770e..1c99cf0e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.4.3 +1.4.4 diff --git a/config.php.in b/config.php.in index 71bbe68e..e9a12fa1 100644 --- a/config.php.in +++ b/config.php.in @@ -389,7 +389,7 @@ foreach ($config as $k => $v) { define('TABLE_USER', 'user'); -define('TABLE_GROUP', 'group'); +define('TABLE_GROUP', 'usergroup'); define('TABLE_GROUP_USER', 'group_user'); define('TABLE_GROUP_EMAIL', 'group_email'); define('TABLE_FOLDER', 'folder'); diff --git a/util/db-upgrade.sql b/util/db-upgrade.sql index cd1feef9..9d146741 100644 --- a/util/db-upgrade.sql +++ b/util/db-upgrade.sql @@ -6,3 +6,9 @@ alter table sph_index change column todomain todomain blob(512) default null; alter table metadata change column subject `subject` blob(512) default null; + + +SELECT Count(*) INTO @exists FROM information_schema.tables WHERE table_schema = 'piler' AND table_type = 'BASE TABLE' AND table_name = 'group'; +SET @query = If(@exists>0, 'RENAME TABLE `group` TO usergroup', 'SELECT 1 from dual'); +PREPARE stmt FROM @query; +EXECUTE stmt;