Had to avoid using indexes in the migration phase

File and File_redirection still had their indexes in the temporary migration table definition.

diff --git a/classes/File.php b/classes/File.php
index c7239777ea8dddbf68bceefec121b3aae024f509..34cd4cdbc7269db01f4f0a0d715060a41310a030 100644 (file)
--- a/classes/File.php
+++ b/classes/File.php
@@ -46,7 +46,7 @@ class File extends Managed_DataObject
             'fields' => array(
                 'id' => array('type' => 'serial', 'not null' => true),
                 'urlhash' => array('type' => 'varchar', 'length' => 64, 'not null' => true, 'description' => 'sha256 of destination URL (url field)'),
-                'url' => array('type' => 'text', 'description' => 'destination URL after following redirections'),
+                'url' => array('type' => 'text', 'description' => 'destination URL after following possible redirections'),
                 'mimetype' => array('type' => 'varchar', 'length' => 50, 'description' => 'mime type of resource'),
                 'size' => array('type' => 'int', 'description' => 'size of resource when available'),
                 'title' => array('type' => 'varchar', 'length' => 191, 'description' => 'title of resource when available'),
@@ -629,8 +629,14 @@ class File extends Managed_DataObject
         $schemadef['fields']['urlhash'] = array (
                                               'type' => 'varchar',
                                               'length' => 64,
-                                              'description' => 'sha256 of destination URL after following redirections',
+                                              'not null' => true,
+                                              'description' => 'sha256 of destination URL (url field)',
                                             );
+        $schemadef['fields']['url'] = array (
+                                              'type' => 'text',
+                                              'description' => 'destination URL after following possible redirections',
+                                            );
+        unset($schemadef['unique keys']);
         $schema->ensureTable($table, $schemadef);
         echo "DONE.\n";
 

diff --git a/classes/File_redirection.php b/classes/File_redirection.php
index ade04fbcbcac278057cec38ea4b20e0280fef381..8c64c58a80c79c4ae18b4df999c050b6bbf5cf5b 100644 (file)
--- a/classes/File_redirection.php
+++ b/classes/File_redirection.php
@@ -373,8 +373,14 @@ class File_redirection extends Managed_DataObject
         $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";