Move /parse_url module to /parseurl

[friendica.git] / update.php

diff --git a/update.php b/update.php
index 444189cc636734344da65fa412662f7cbd64965b..68e4fb4d3d687bdab9b1435701934c646eecbb5a 100644 (file)
--- a/update.php
+++ b/update.php
@@ -773,19 +773,13 @@ function update_1399()
 
 function update_1400()
 {
-/*     
        if (!DBA::e("INSERT IGNORE INTO `post` (`uri-id`, `parent-uri-id`, `thr-parent-id`, `owner-id`, `author-id`, `network`,
-               `created`, `received`, `edited`, `gravity`, `causer-id`, `post-type`, `vid`, `private`, `visible`, `deleted`)
+               `created`, `received`, `edited`, `gravity`, `causer-id`, `post-type`, `vid`, `private`, `visible`, `deleted`, `global`)
                SELECT `uri-id`, `parent-uri-id`, `thr-parent-id`, `owner-id`, `author-id`, `network`, `created`, `received`, `edited`, 
-                       `gravity`, `causer-id`, `post-type`, `vid`, `private`, `visible`, `deleted` FROM `item`")) {
+                       `gravity`, `causer-id`, `post-type`, `vid`, `private`, `visible`, `deleted`, `global` FROM `item`")) {
                        return Update::FAILED;
        }
 
-       if (!DBA::e("UPDATE `post` INNER JOIN `item` ON `item`.`uri-id` = `post`.`uri-id` AND `item`.`uid` = 0
-               SET `post`.`global` = true")) {
-               return Update::FAILED;
-
-// --------------------------------------
        if (!DBA::e("UPDATE `post-user` INNER JOIN `item` ON `item`.`uri-id` = `post-user`.`uri-id` AND `item`.`uid` = `post-user`.`uid`
                INNER JOIN `event` ON `item`.`event-id` = `event`.`id` AND `event`.`id` != 0
                SET `post-user`.`event-id` = `item`.`event-id`")) {
@@ -805,7 +799,13 @@ function update_1400()
                return Update::FAILED;
        }
 
-       */
+       if (!DBA::e("INSERT IGNORE INTO `post-thread-user` (`uri-id`, `owner-id`, `author-id`, `causer-id`, `network`,
+               `created`, `received`, `changed`, `commented`, `uid`,  `wall`, `contact-id`, `unseen`, `hidden`, `origin`, `psid`, `post-user-id`)
+               SELECT `uri-id`, `owner-id`, `author-id`, `causer-id`, `network`, `created`, `received`, `received`, `received`,
+                       `uid`, `wall`, `contact-id`, `unseen`, `hidden`, `origin`, `psid`, `id`
+               FROM `post-user` WHERE `gravity` = 0 AND NOT EXISTS(SELECT `uri-id` FROM `post-thread-user` WHERE `post-user-id` = `post-user`.id)")) {
+               return Update::FAILED;
+       }
 
        if (!DBA::e("UPDATE `post-thread-user` INNER JOIN `post-thread` ON `post-thread-user`.`uri-id` = `post-thread`.`uri-id`
                SET `post-thread-user`.`owner-id` = `post-thread`.`owner-id`, `post-thread-user`.`author-id` = `post-thread`.`author-id`,
@@ -815,6 +815,15 @@ function update_1400()
                return Update::FAILED;
        }
 
-       
+       return Update::SUCCESS;
+}
+
+function pre_update_1403()
+{
+       // Necessary before a primary key change
+       if (!DBA::e("DROP TABLE `parsed_url`")) {
+               return Update::FAILED;
+       }
+
        return Update::SUCCESS;
 }