WIP: file storage refactoring

procedures/entityVersioning.sql

@@ -432,7 +432,7 @@ DROP PROCEDURE IF EXISTS setFileProperties //
  *   The byte size (or NULL for directories).
  * FilePath
  *   The path of the object.
- * FileMimetype
+ * FileMimeType
  *   The mimetype (use "inode/directory" for directories, use NULL for unknown)
  * FileStorageID
  *   The ID of the back-end file storage where this object is located.
@@ -447,7 +447,7 @@ CREATE PROCEDURE setFileProperties (
     in FileSize BIGINT UNSIGNED,
     in FileHash VARCHAR(255),
     in FileChecked BIGINT,
-    in FileMimetype VARBINARY(255),
+    in FileMimeType VARBINARY(255),
     in FileStorageId VARBINARY(255),
     in FileKey VARBINARY(40000),
     in FileParentID INT UNSIGNED,
@@ -475,7 +475,7 @@ BEGIN
         INSERT INTO files (file_id, path, size, hash, checked_timestamp,
                 mimetype, file_storage_id, file_key, hash_algorithm)
             VALUES (FileID, FilePath, FileSize, unhex(FileHash), FileChecked,
-                FileMimetype, FileStorageId, FileKey, FileHashAlgo);
+                FileMimeType, FileStorageId, FileKey, FileHashAlgo);
     END IF;
 
 END //

procedures/listFSODescriptorByParentDirectory.sql

@@ -48,7 +48,7 @@ listFSODescriptorByParentDirectoryBody: BEGIN
             size AS FileSize,
             hex(hash) AS FileHash,
             checked_timestamp AS FileHashChecked,
-            mimetype AS FileMimetype,
+            mimetype AS FileMimeType,
             file_storage_id AS FileStorageID,
             file_key AS FileKey
         FROM files

procedures/retrieveEntity.sql

@@ -47,7 +47,7 @@ drop procedure if exists db_5_0.retrieveEntity //
  * ---------
  * Tuple of (DatatypeID, Collection, EntityID, EntityName, EntityDesc,
  *           EntityRole, FileSize, FilePath, FileHash, FileHashAlgo,
- *           FileHashChecked, FileMimetype, FileStorageID, FileKey,
+ *           FileHashChecked, FileMimeType, FileStorageID, FileKey,
  *           FileParentID, ACL, Version)
  */
 create procedure db_5_0.retrieveEntity(
@@ -60,7 +60,7 @@ retrieveEntityBody: BEGIN
     DECLARE FileHash VARCHAR(255) DEFAULT NULL;
     DECLARE FileHashAlgo VARCHAR(255) DEFAULT NULL;
     DECLARE FileHashChecked BIGINT DEFAULT NULL;
-    DECLARE FileMimetype VARBINARY(255) DEFAULT NULL;
+    DECLARE FileMimeType VARBINARY(255) DEFAULT NULL;
     DECLARE FileStorageID VARBINARY(255) DEFAULT NULL;
     DECLARE FileKey VARBINARY(15920) DEFAULT NULL;
     DECLARE DatatypeID INT UNSIGNED DEFAULT NULL;
@@ -90,7 +90,7 @@ retrieveEntityBody: BEGIN
             END IF;
 
             SELECT path, size, hex(hash), hash_algorithm, checked_timestamp,  mimetype, file_storage_id, file_key
-                INTO FilePath, FileSize, FileHash, FileHashAlgo, FileHashChecked, FileMimetype, FileStorageID, FileKey
+                INTO FilePath, FileSize, FileHash, FileHashAlgo, FileHashChecked, FileMimeType, FileStorageID, FileKey
                 FROM archive_files
                 WHERE file_id = EntityID
                 AND _iversion = IVersion
@@ -130,7 +130,6 @@ retrieveEntityBody: BEGIN
                     AND entity_ID = EntityID
                     AND property_id = 20
                     AND _iversion = IVersion
-                    -- LIMIT 1 -- TODO Remove this line if all tests pass.
                     ) AS EntityName,
                 e.description AS EntityDesc,
                 e.role AS EntityRole,
@@ -138,7 +137,7 @@ retrieveEntityBody: BEGIN
                 FilePath AS FilePath,
                 FileHash AS FileHash,
                 FileHashChecked AS FileHashChecked,
-                FileMimetype as FileMimetype,
+                FileMimeType as FileMimeType,
                 FileStorageID as FileStorageID,
                 FileKey as FileKey,
                 (SELECT acl FROM entity_acl AS a WHERE a.id = e.acl) AS ACL,
@@ -155,7 +154,7 @@ retrieveEntityBody: BEGIN
     END IF;
 
     SELECT path, /*parent_directory,*/ size, hex(hash), hash_algorithm, checked_timestamp, mimetype, file_storage_id, file_key
-        INTO FilePath, /*FileParentID,*/ FileSize, FileHash, FileHashAlgo, FileHashChecked, FileMimetype, FileStorageID, FileKey
+        INTO FilePath, /*FileParentID,*/ FileSize, FileHash, FileHashAlgo, FileHashChecked, FileMimeType, FileStorageID, FileKey
         FROM files
         WHERE file_id = EntityID
         LIMIT 1;
@@ -192,7 +191,7 @@ retrieveEntityBody: BEGIN
         FileHash AS FileHash,
         FileHashAlgo AS FileHashAlgo,
         FileHashChecked AS FileHashChecked,
-        FileMimetype as FileMimetype,
+        FileMimeType as FileMimeType,
         FileStorageID as FileStorageID,
         FileKey as FileKey,
         /*FileParentID as FileParentID,*/

procedures/retrieveFSODescriptorByPath.sql

@@ -54,7 +54,7 @@ retrieveFSODescriptorByPathBody: BEGIN
             size AS FileSize,
             hex(hash) AS FileHash,
             checked_timestamp AS FileHashChecked,
-            mimetype AS FileMimetype,
+            mimetype AS FileMimeType,
             file_storage_id AS FileStorageID,
             file_key AS FileKey
         FROM files