From 26c3cb0bff602edde480298e3be0a854bdf742dc Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Fri, 26 Jun 2020 17:10:34 +0200
Subject: [PATCH] WIP: patch
---
patches/patch20200623-3.0.0rc2/patch.sql | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/patches/patch20200623-3.0.0rc2/patch.sql b/patches/patch20200623-3.0.0rc2/patch.sql
index eca07fa..99b7837 100644
--- a/patches/patch20200623-3.0.0rc2/patch.sql
+++ b/patches/patch20200623-3.0.0rc2/patch.sql
@@ -2,6 +2,7 @@
-- REMOVE SQLITE datatype
+DELETE FROM name_data WHERE entity_id = 50;
DELETE FROM entities WHERE id = 50;
ALTER TABLE files ADD UNIQUE (`path`);
@@ -15,8 +16,8 @@ ALTER TABLE files ADD COLUMN IF NOT EXISTS (
ALTER TABLE entities MODIFY COLUMN `role` enum('RECORDTYPE','RECORD','FILE','DOMAIN','PROPERTY','DATATYPE','ROLE','QUERYTEMPLATE', 'DIRECTORY') COLLATE utf8_unicode_ci NOT NULL;
-INSERT IGNORE INTO entities (id, description, role, acl) VALUES (9, "The directory role.", "ROLE", 0);
-INSERT IGNORE INTO name_data (domain_id, entity_id, property_id, value, status, pidx) VALUES (0, 9, 20, "DIRECTORY", "FIX", 0);
+INSERT INTO entities (id, description, role, acl) VALUES (9, "The directory role.", "ROLE", 0);
+INSERT INTO name_data (domain_id, entity_id, property_id, value, status, pidx) VALUES (0, 9, 20, "DIRECTORY", "FIX", 0);
UPDATE files SET storageId=path;
@@ -55,7 +56,7 @@ BEGIN
SET dir_exists = FALSE;
ITERATE loop2;
END IF;
- INSERT INTO entities (name, description, role, acl) VALUES (NULL, NULL, "DIRECTORY", 0);
+ INSERT INTO entities (description, role, acl) VALUES (NULL, NULL, "DIRECTORY", 0);
SET dir_id = LAST_INSERT_ID();
INSERT INTO files (file_id, path, size, hash, checked_timestamp, mimetype, fileStorage, storageId) VALUES (dir_id, LEFT(dir_path, CHAR_LENGTH(dir_path)-1), 0, NULL, 0, "inode/directory", "DEFAULT", LEFT(dir_path, CHAR_LENGTH(dir_path)-1));
END LOOP;
--
GitLab