diff options
Diffstat (limited to 'install')
| -rw-r--r-- | install/database.sql | 4 | ||||
| -rw-r--r-- | install/update.php | 9 |
2 files changed, 9 insertions, 4 deletions
diff --git a/install/database.sql b/install/database.sql index 914add2d8..39c3b81c2 100644 --- a/install/database.sql +++ b/install/database.sql @@ -630,8 +630,6 @@ CREATE TABLE IF NOT EXISTS `photo` ( `aid` int(10) unsigned NOT NULL DEFAULT '0', `uid` int(10) unsigned NOT NULL, `xchan` char(255) NOT NULL DEFAULT '', - `contact-id` int(10) unsigned NOT NULL DEFAULT '0', - `guid` char(64) NOT NULL, `resource_id` char(255) NOT NULL, `created` datetime NOT NULL, `edited` datetime NOT NULL, @@ -652,7 +650,7 @@ CREATE TABLE IF NOT EXISTS `photo` ( `deny_gid` mediumtext NOT NULL, PRIMARY KEY (`id`), KEY `uid` (`uid`), - KEY `resource-id` (`resource_id`), + KEY `resource_id` (`resource_id`), KEY `album` (`album`), KEY `scale` (`scale`), KEY `profile` (`profile`), diff --git a/install/update.php b/install/update.php index 0459df817..8decfc133 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ <?php -define( 'UPDATE_VERSION' , 1020 ); +define( 'UPDATE_VERSION' , 1021 ); /** * @@ -285,3 +285,10 @@ function update_r1019() { return UPDATE_SUCCESS; return UPDATE_FAILED; } + +function update_r1020() { + $r = q("alter table photo drop `contact-id`, drop guid, drop index `resource-id`, add index ( `resource_id` )"); + if($r) + return UPDATE_SUCCESS; + return UPDATE_FAILED; +} |