Adding upstream version 1.11.1.upstream/1.11.1upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

4 files changed, 58 insertions, 0 deletions

diff --git a/schema/mysql-migrations/upgrade_183.sql b/schema/mysql-migrations/upgrade_183.sql
new file mode 100644
index 0000000..3e9577d
--- /dev/null
+++ b/schema/mysql-migrations/upgrade_183.sql
@@ -0,0 +1,9 @@
+ALTER TABLE icinga_notification
+  ADD COLUMN users_var VARCHAR(255) DEFAULT NULL AFTER zone_id;
+
+ALTER TABLE icinga_notification
+  ADD COLUMN user_groups_var VARCHAR(255) DEFAULT NULL AFTER users_var;
+
+INSERT INTO director_schema_migration
+  (schema_version, migration_time)
+  VALUES (183, NOW());
diff --git a/schema/mysql-migrations/upgrade_184.sql b/schema/mysql-migrations/upgrade_184.sql
new file mode 100644
index 0000000..8081654
--- /dev/null
+++ b/schema/mysql-migrations/upgrade_184.sql
@@ -0,0 +1,9 @@
+ALTER TABLE branched_icinga_notification
+  ADD COLUMN users_var VARCHAR(255) DEFAULT NULL AFTER zone;
+
+ALTER TABLE branched_icinga_notification
+  ADD COLUMN user_groups_var VARCHAR(255) DEFAULT NULL AFTER users_var;
+
+INSERT INTO director_schema_migration
+  (schema_version, migration_time)
+  VALUES (184, NOW());
diff --git a/schema/mysql-migrations/upgrade_186.sql b/schema/mysql-migrations/upgrade_186.sql
new file mode 100644
index 0000000..f0c8bda
--- /dev/null
+++ b/schema/mysql-migrations/upgrade_186.sql
@@ -0,0 +1,35 @@
+ALTER TABLE director_datafield ADD COLUMN uuid VARBINARY(16) DEFAULT NULL AFTER id;
+SET @tmp_uuid = LOWER(CONCAT(
+     LPAD(HEX(FLOOR(RAND()   * 0xffff)), 4, '0'),
+     LPAD(HEX(FLOOR(RAND() * 0xffff)), 4, '0'), '-',
+     LPAD(HEX(FLOOR(RAND() * 0xffff)), 4, '0'), '-',
+     '4',
+     LPAD(HEX(FLOOR(RAND() * 0x0fff)), 3, '0'), '-',
+     HEX(FLOOR(RAND() * 4 + 8)),
+     LPAD(HEX(FLOOR(RAND() * 0x0fff)), 3, '0'), '-',
+     LPAD(HEX(FLOOR(RAND() * 0xffff)), 4, '0'),
+     LPAD(HEX(FLOOR(RAND() * 0xffff)), 4, '0'),
+     LPAD(HEX(FLOOR(RAND() * 0xffff)), 4, '0')
+));
+UPDATE director_datafield SET uuid = UNHEX(LPAD(LPAD(HEX(id), 8, '0'), 32, REPLACE(@tmp_uuid, '-', ''))) WHERE uuid IS NULL;
+ALTER TABLE director_datafield MODIFY COLUMN uuid VARBINARY(16) NOT NULL, ADD UNIQUE INDEX uuid (uuid);
+
+ALTER TABLE director_datalist ADD COLUMN uuid VARBINARY(16) DEFAULT NULL AFTER id;
+SET @tmp_uuid = LOWER(CONCAT(
+     LPAD(HEX(FLOOR(RAND()   * 0xffff)), 4, '0'),
+     LPAD(HEX(FLOOR(RAND() * 0xffff)), 4, '0'), '-',
+     LPAD(HEX(FLOOR(RAND() * 0xffff)), 4, '0'), '-',
+     '4',
+     LPAD(HEX(FLOOR(RAND() * 0x0fff)), 3, '0'), '-',
+     HEX(FLOOR(RAND() * 4 + 8)),
+     LPAD(HEX(FLOOR(RAND() * 0x0fff)), 3, '0'), '-',
+     LPAD(HEX(FLOOR(RAND() * 0xffff)), 4, '0'),
+     LPAD(HEX(FLOOR(RAND() * 0xffff)), 4, '0'),
+     LPAD(HEX(FLOOR(RAND() * 0xffff)), 4, '0')
+));
+UPDATE director_datalist SET uuid = UNHEX(LPAD(LPAD(HEX(id), 8, '0'), 32, REPLACE(@tmp_uuid, '-', ''))) WHERE uuid IS NULL;
+ALTER TABLE director_datalist MODIFY COLUMN uuid VARBINARY(16) NOT NULL, ADD UNIQUE INDEX uuid (uuid);
+
+INSERT INTO director_schema_migration
+  (schema_version, migration_time)
+  VALUES (186, NOW());
diff --git a/schema/mysql-migrations/upgrade_187.sql b/schema/mysql-migrations/upgrade_187.sql
new file mode 100644
index 0000000..0e96f14
--- /dev/null
+++ b/schema/mysql-migrations/upgrade_187.sql
@@ -0,0 +1,5 @@
+ALTER TABLE import_row_modifier ADD COLUMN filter_expression TEXT DEFAULT NULL AFTER priority;
+
+INSERT INTO director_schema_migration
+  (schema_version, migration_time)
+  VALUES (187, NOW());