Merge branch 'migrate-sql' into 'master'

to make the SQL work with recent MariaDB

See merge request zstackio/zstack!6088

Author: zstackio

conf/db/upgrade/V1.6__schema.sql

@@ -12,7 +12,7 @@ CREATE TABLE  `zstack`.`SchedulerVO` (
     `triggerName` varchar(255),
     `triggerGroup` varchar(255),
     `jobClassName` varchar(255),
-    `jobData` varchar(65535),
+    `jobData` text,
     `status` varchar(255),
     `managementNodeUuid` varchar(32) DEFAULT NULL,
     `lastOpDate` timestamp ON UPDATE CURRENT_TIMESTAMP COMMENT 'last operation date',

conf/db/upgrade/V2.1.0__schema.sql

@@ -637,7 +637,7 @@ CREATE FUNCTION `Upgrade_Scheduler` (
     repeatCount int unsigned,
     cronScheduler varchar(255),
     jobClassName varchar(255),
-    jobData varchar(65535),
+    jobData text,
     state varchar(255),
     startTime timestamp,
     stopTime timestamp,

conf/db/upgrade/V3.0.0__schema.sql

@@ -88,8 +88,8 @@ CREATE TABLE `zstack`.`IAM2TicketFlowVO` (
 	CONSTRAINT fkIAM2TicketFlowVOTicketFlowVO FOREIGN KEY (uuid) REFERENCES TicketFlowVO (uuid) ON UPDATE RESTRICT ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
-INSERT INTO ResourceVO (uuid, resourceName, resourceType) SELECT t.uuid, t.name, "TicketFlowVO" FROM TicketFlowVO t;
-INSERT INTO ResourceVO (uuid, resourceName, resourceType) SELECT t.uuid, t.name, "TicketFlowCollectionVO" FROM TicketFlowCollectionVO t;
+INSERT INTO ResourceVO (uuid, resourceName, resourceType, concreteResourceType) SELECT t.uuid, t.name, "TicketFlowVO", "org.zstack.ticket.entity.TicketFlowVO" FROM TicketFlowVO t;
+INSERT INTO ResourceVO (uuid, resourceName, resourceType, concreteResourceType) SELECT t.uuid, t.name, "TicketFlowCollectionVO", "org.zstack.ticket.entity.TicketFlowCollectionVO" FROM TicketFlowCollectionVO t;
 
 CREATE TABLE IF NOT EXISTS `DatabaseBackupVO` (
     `uuid`        VARCHAR(32)     NOT NULL,

conf/db/upgrade/V3.7.2__schema.sql

@@ -9,7 +9,7 @@ CREATE TABLE IF NOT EXISTS `zstack`.`PriceTableVO` (
     PRIMARY KEY (`uuid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
-INSERT INTO ResourceVO (`uuid`, `resourceName`, `resourceType`) VALUES ("12a087c058cc45d5bf80a605f17c0083", "global_default", 'PriceTableVO');
+INSERT INTO ResourceVO (`uuid`, `resourceName`, `resourceType`, `concreteResourceType`) VALUES ("12a087c058cc45d5bf80a605f17c0083", "global_default", 'PriceTableVO', "org.zstack.billing.table.PriceTableVO");
 INSERT INTO PriceTableVO (`uuid`, `name`, `lastOpDate`, `createDate`) VALUES ("12a087c058cc45d5bf80a605f17c0083", "global_default", CURRENT_TIMESTAMP(), CURRENT_TIMESTAMP());
 
 ALTER TABLE PriceVO ADD COLUMN tableUuid VARCHAR(32) DEFAULT NULL;

conf/db/upgrade/beforeValidate.sql

@@ -0,0 +1,23 @@
+use zstack;
+
+-- Update `schema_version' since we've changed SQL to match the expectation
+-- of the newer version MariaDB.
+DELIMITER $$
+
+DROP PROCEDURE IF EXISTS `update_schema_checksum` $$
+
+CREATE PROCEDURE `update_schema_checksum`()
+BEGIN
+    IF EXISTS(SELECT table_name FROM information_schema.tables WHERE table_name = 'schema_version')
+    THEN
+        update `schema_version` set `checksum`=1083194846  where `script`='V1.6__schema.sql'   and `checksum` <> 1083194846;
+        update `schema_version` set `checksum`=-1569422253 where `script`='V2.1.0__schema.sql' and `checksum` <> -1569422253;
+        update `schema_version` set `checksum`=1564279419  where `script`='V3.0.0__schema.sql' and `checksum` <> 1564279419;
+        update `schema_version` set `checksum`=565652311   where `script`='V3.7.2__schema.sql' and `checksum` <> 565652311;
+    END IF;
+END $$
+
+DELIMITER  ;
+
+CALL update_schema_checksum();
+DROP PROCEDURE IF EXISTS update_schema_checksum;