Merge branch 'quitagram' into nightly

[quix0rs-gnu-social.git] / classes / File_redirection.php

diff --git a/classes/File_redirection.php b/classes/File_redirection.php
index b585ae78848cc148437dd0baf5e35a32d3d6d706..8c64c58a80c79c4ae18b4df999c050b6bbf5cf5b 100644 (file)
--- a/classes/File_redirection.php
+++ b/classes/File_redirection.php
@@ -43,7 +43,7 @@ class File_redirection extends Managed_DataObject
     {
         return array(
             'fields' => array(
-                'urlhash' => array('type' => 'varchar', 'length' => 64, 'description' => 'sha256 hash of the URL'),
+                'urlhash' => array('type' => 'varchar', 'length' => 64, 'not null' => true, 'description' => 'sha256 hash of the URL'),
                 'url' => array('type' => 'text', 'description' => 'short URL (or any other kind of redirect) for file (id)'),
                 'file_id' => array('type' => 'int', 'description' => 'short URL for what URL/file'),
                 'redirections' => array('type' => 'int', 'description' => 'redirect count'),
@@ -367,21 +367,27 @@ class File_redirection extends Managed_DataObject
             // We already have the urlhash field, so no need to migrate it.
             return;
         }
-        echo "\nFound old $table table, upgrading it to contain 'urlhash' field...\n";
+        echo "\nFound old $table table, upgrading it to contain 'urlhash' field...";
         // We have to create a urlhash that is _not_ the primary key,
         // transfer data and THEN run checkSchema
         $schemadef['fields']['urlhash'] = array (
                                               'type' => 'varchar',
                                               'length' => 64,
-                                              'description' => 'sha256 of destination URL after following redirections',
+                                              'not null' => true,
+                                              'description' => 'sha256 hash of the URL',
                                             );
+        $schemadef['fields']['url'] = array (
+                                              'type' => 'text',
+                                              'description' => 'short URL (or any other kind of redirect) for file (id)',
+                                            );
+        unset($schemadef['primary key']);
         $schema->ensureTable($table, $schemadef);
         echo "DONE.\n";
 
         $classname = ucfirst($table);
         $tablefix = new $classname;
         // urlhash is hash('sha256', $url) in the File table
-        echo "Updating urlhash fields in $table table...\n";
+        echo "Updating urlhash fields in $table table...";
         // Maybe very MySQL specific :(
         $tablefix->query(sprintf('UPDATE %1$s SET %2$s=%3$s;',
                             $schema->quoteIdentifier($table),