Reduce differences between ofm and ofmServices

[philhug]

Currently the following delta exists.

DROP TABLE `O1A4`;
DROP TABLE `S2A7`;
DROP TABLE `U14`;
DROP TABLE `S2A1`;
DROP TABLE `G4A1`;
DROP TABLE `U1_O1A`;
DROP TABLE `U2A4`;
DROP TABLE `U2A6`;
DROP TABLE `S3A6`;
DROP TABLE `O1A2`;
DROP TABLE `U15`;
DROP TABLE `S2A3`;
DROP TABLE `AMMNT_ACTIVITYDATARECORDER`;
DROP TABLE `S3A4`;
DROP TABLE `AMMNT_S4_SPATIALINDEX_CHANGES`;
DROP TABLE `U2A7`;
DROP TABLE `G4T`;
DROP TABLE `O1A5`;
DROP TABLE `S2A6`;
DROP TABLE `S2A4`;
DROP TABLE `AMMNT_S4_SPATIALINDEX`;
DROP TABLE `U2T`;
DROP TABLE `O1A1`;
DROP TABLE `O1A7`;
DROP TABLE `G4A2`;
DROP TABLE `P1T`;
DROP TABLE `U2A5`;
DROP TABLE `AMMNT_FIR`;
DROP TABLE `S3L`;
DROP TABLE `G1T`;
DROP TABLE `S2L`;
DROP TABLE `G5T`;
DROP TABLE `U2A1`;
DROP TABLE `G4A4`;
DROP TABLE `U2L`;
DROP TABLE `O1A3`;
DROP TABLE `G4A3`;
DROP TABLE `U2A2`;
DROP TABLE `S1L`;
DROP TABLE `U13`;
DROP TABLE `U2A3`;
DROP TABLE `S5L`;
DROP TABLE `O1T`;
DROP TABLE `P1L`;
DROP TABLE `P1A`;
DROP TABLE `O1_O1A`;
DROP TABLE `U3T`;
DROP TABLE `O1A6`;
DROP TABLE `S3A1`;
DROP TABLE `S5T`;
DROP TABLE `G2T`;

CREATE TABLE `CDT` (
`id` BIGINT (20) NOT NULL AUTO_INCREMENT,
`creator` VARCHAR (500) NOT NULL,
`cover` VARCHAR (10000) NOT NULL,
`AccountDesignator` VARCHAR (45) NOT NULL,
`proprietorCode` VARCHAR (100) NOT NULL,
`created` DATETIME DEFAULT CURRENT_TIMESTAMP,
`lastTransaction` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
`destroyed` TINYINT (4) DEFAULT 0,
`lastTransactionDesignation` VARCHAR (500) NOT NULL DEFAULT 'credits created',
`email` VARCHAR (500) DEFAULT '[email protected]',
`token` VARCHAR (45) NOT NULL DEFAULT 'OFM CREDIT (ofmCr)',
`blockSize` INT (11) NOT NULL,
`sender` VARCHAR (1000) DEFAULT 'OFMA',
`senderEmail` VARCHAR (500) DEFAULT '[email protected]',
PRIMARY KEY (`id`),
INDEX `accountDesig` (`AccountDesignator`, `email`),
INDEX `proprieterCode` (`proprietorCode`, `email`),
INDEX `lastTransaction` (`lastTransaction`)
) ENGINE = InnoDB, AUTO_INCREMENT = 2626699, DEFAULT CHARACTER SET = latin1;
CREATE TABLE `idsToMigrate` (
`id` BIGINT (20) NOT NULL,
`accountDesignator` VARCHAR (1000) DEFAULT NULL,
`email` VARCHAR (1000) DEFAULT NULL,
PRIMARY KEY (`id`)
) ENGINE = InnoDB, DEFAULT CHARACTER SET = latin1;
CREATE TABLE `CDT_VAL` (
`emailAddress` VARCHAR (100) NOT NULL,
`validationCode` VARCHAR (4) NOT NULL,
`validUntil` TIMESTAMP NOT NULL,
`validated` TINYINT (4) NOT NULL,
`requestedByEmail` VARCHAR (200) DEFAULT NULL,
`latch_amount` DOUBLE DEFAULT NULL,
`latch_proprietor` VARCHAR (200) DEFAULT NULL,
`latch_addressee` VARCHAR (200) DEFAULT NULL,
`latch_purpose` VARCHAR (200) DEFAULT NULL,
PRIMARY KEY (`emailAddress`, `validated`)
) ENGINE = InnoDB, DEFAULT CHARACTER SET = latin1, COMMENT = '	';

ALTER TABLE `S3A5` DROP INDEX `index1`;
ALTER TABLE `S3A5` DROP INDEX `index3`;
ALTER TABLE `S3A5` DROP INDEX `index4`;
ALTER TABLE `S3A5` DROP INDEX `index5`;
ALTER TABLE `S3A5` ADD INDEX `index1` (`ServiceEntityID`, `ServiceEntityPropertiesTypeID`, `ParentServiceId`, `UserID`, `ammnt_FirId`);
ALTER TABLE `S3A7` DROP INDEX `Index2`;
ALTER TABLE `S3A7` DROP INDEX `Index3`;
ALTER TABLE `S3A7` DROP INDEX `index4`;
ALTER TABLE `S3A7` DROP INDEX `index1`;
ALTER TABLE `S3A7` ADD INDEX `index1` (`ServiceEntityID`, `ServiceEntityPropertiesTypeID`, `UserID`, `ParentServiceId`, `ammnt_FirId`);
ALTER TABLE `S4` DROP INDEX `index4`;
ALTER TABLE `S4` DROP INDEX `index5`;
ALTER TABLE `S4` DROP INDEX `index6`;
ALTER TABLE `S4` DROP INDEX `index1`;
ALTER TABLE `S4` DROP INDEX `index2`;
ALTER TABLE `S4` DROP INDEX `index3`;
ALTER TABLE `S4` CHANGE COLUMN `Revision` `Revision` INT (11) DEFAULT NULL;
ALTER TABLE `S4` ADD INDEX `serviceEntityid` (`ServiceEntityID`, `OrganizationID`, `UserID`, `Revision`, `ammnt_FirId`, `ParentServiceID`);
ALTER TABLE `S2A2` CHANGE COLUMN `ServicePropertiesTypeValue` `ServicePropertiesTypeValue` INT (11) NOT NULL;
ALTER TABLE `S3A3` DROP INDEX `Index3`;
ALTER TABLE `S3A3` DROP INDEX `index4`;
ALTER TABLE `S3A3` DROP INDEX `index5`;
ALTER TABLE `S3A3` DROP INDEX `index1`;
ALTER TABLE `S3A3` ADD INDEX `index1` (`ServiceEntityID`, `ServiceEntityPropertiesTypeID`, `UserID`, `ammnt_FirId`, `ParentServiceId`);
ALTER TABLE `S2A5` CHANGE COLUMN `ServicePropertiesTypeValue` `ServicePropertiesTypeValue` DATETIME DEFAULT NULL;
ALTER TABLE `S3T` DROP COLUMN `ServiceEntityTypeApiName`;
ALTER TABLE `S3T` DROP COLUMN `hidden`;
ALTER TABLE `AMMNT_COMMIT` DROP INDEX `date`;
ALTER TABLE `AMMNT_COMMIT` DROP INDEX `date2`;
ALTER TABLE `AMMNT_COMMIT` DROP INDEX `property`;
ALTER TABLE `AMMNT_COMMIT` ADD INDEX `date` (`ParentServiceId`, `TimeStamp`);
ALTER TABLE `S3A2` DROP INDEX `index1`;
ALTER TABLE `S3A2` DROP INDEX `index3`;
ALTER TABLE `S3A2` DROP INDEX `index4`;
ALTER TABLE `S3A2` DROP INDEX `index5`;
ALTER TABLE `S3A2` ADD INDEX `index1` (`ServiceEntityID`, `ServiceEntityPropertiesTypeID`, `UserID`, `ammnt_FirId`, `ParentServiceId`);
ALTER TABLE `U1T` DROP COLUMN `openIdSubject`;
ALTER TABLE `U1T` DROP COLUMN `openIdProvider`;