update ddl, reference data and demo schemas based on patch

mifosng-db/0001a-mifosplatform-core-ddl-latest.sql

@@ -23,6 +23,7 @@ DROP TABLE IF EXISTS `m_document`;
 DROP TABLE IF EXISTS `m_fund`;
 DROP TABLE IF EXISTS `m_group`;
 DROP TABLE IF EXISTS `m_group_client`;
+DROP TABLE IF EXISTS `m_guarantor`;
 DROP TABLE IF EXISTS `m_loan`;
 DROP TABLE IF EXISTS `m_loan_charge`;
 DROP TABLE IF EXISTS `m_loan_officer_assignment_history`;
@@ -566,16 +567,40 @@ CREATE TABLE `m_loan` (
   KEY `FK_loan_ltp_strategy` (`loan_transaction_strategy_id`),
   KEY `FK_m_loan_m_staff` (`loan_officer_id`),
   KEY `group_id` (`group_id`),
-  KEY `FK_m_loan_guarantor` (`guarantor_id`),
   CONSTRAINT `FK7C885877240145` FOREIGN KEY (`fund_id`) REFERENCES `m_fund` (`id`),
   CONSTRAINT `FKB6F935D87179A0CB` FOREIGN KEY (`client_id`) REFERENCES `m_client` (`id`),
   CONSTRAINT `FKB6F935D8C8D4B434` FOREIGN KEY (`product_id`) REFERENCES `m_product_loan` (`id`),
   CONSTRAINT `FK_loan_ltp_strategy` FOREIGN KEY (`loan_transaction_strategy_id`) REFERENCES `ref_loan_transaction_processing_strategy` (`id`),
-  CONSTRAINT `FK_m_loan_guarantor` FOREIGN KEY (`guarantor_id`) REFERENCES `m_client` (`id`),
   CONSTRAINT `FK_m_loan_m_staff` FOREIGN KEY (`loan_officer_id`) REFERENCES `m_staff` (`id`),
   CONSTRAINT `m_loan_ibfk_1` FOREIGN KEY (`group_id`) REFERENCES `m_group` (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
+CREATE TABLE `m_guarantor` (
+	`id` BIGINT(20) NOT NULL AUTO_INCREMENT,
+	`loan_id` BIGINT(20) NOT NULL,
+	`type_enum` SMALLINT(5) NOT NULL,
+	`entity_id` BIGINT(20) NULL DEFAULT NULL,
+	`firstname` VARCHAR(50) NULL DEFAULT NULL,
+	`lastname` VARCHAR(50) NULL DEFAULT NULL,
+	`dob` DATE NULL DEFAULT NULL,
+	`address_line_1` VARCHAR(500) NULL DEFAULT NULL,
+	`address_line_2` VARCHAR(500) NULL DEFAULT NULL,
+	`city` VARCHAR(50) NULL DEFAULT NULL,
+	`state` VARCHAR(50) NULL DEFAULT NULL,
+	`country` VARCHAR(50) NULL DEFAULT NULL,
+	`zip` VARCHAR(20) NULL DEFAULT NULL,
+	`house_phone_number` VARCHAR(20) NULL DEFAULT NULL,
+	`mobile_number` VARCHAR(20) NULL DEFAULT NULL,
+	`comment` VARCHAR(500) NULL DEFAULT NULL,
+	PRIMARY KEY (`id`),
+	INDEX `FK_m_guarantor_m_loan` (`loan_id`),
+	CONSTRAINT `FK_m_guarantor_m_loan` FOREIGN KEY (`loan_id`) REFERENCES `m_loan` (`id`)
+)
+ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+ALTER TABLE `m_loan`
+	ADD CONSTRAINT `FK_m_loan_guarantor` FOREIGN KEY (`guarantor_id`) REFERENCES `m_guarantor` (`id`);
+
 CREATE TABLE `m_loan_charge` (
   `id` bigint(20) NOT NULL AUTO_INCREMENT,
   `loan_id` bigint(20) NOT NULL,

mifosng-db/0002-mifosng-base-reference-data.sql

@@ -291,6 +291,11 @@ INSERT INTO `m_permission` VALUES
 (211,'portfolio','UPDATE_SAVINGSACCOUNT','SAVINGSACCOUNT','UPDATE',1),(212,'portfolio','DELETE_SAVINGSACCOUNT','SAVINGSACCOUNT','DELETE',1),
 (213,'authorisation','PERMISSIONS_ROLE','ROLE','PERMISSIONS',1);
 
+INSERT INTO `m_permission` (`grouping`, `code`, `entity_name`, `action_name`, `can_maker_checker`) VALUES ('portfolio', 'CREATE_GUARANTOR', 'GUARANTOR', 'CREATE', 1);
+INSERT INTO `m_permission` (`grouping`, `code`, `entity_name`, `action_name`, `can_maker_checker`) VALUES ('portfolio', 'DELETE_GUARANTOR', 'GUARANTOR', 'DELETE', 1);
+INSERT INTO `m_permission` (`grouping`, `code`, `entity_name`, `action_name`, `can_maker_checker`) VALUES ('portfolio', 'READ_GUARANTOR', 'GUARANTOR', 'READ', 0);
+INSERT INTO `m_permission` (`grouping`, `code`, `entity_name`, `action_name`, `can_maker_checker`) VALUES ('portfolio', 'UPDATE_GUARANTOR', 'GUARANTOR', 'UPDATE', 1);
+
 INSERT INTO `m_permission`
 (
 `grouping`,
@@ -367,26 +372,6 @@ rp.permission_id\r  where ur.appuser_id = ${currentUserId}\r  and (p.code in (\'
 
 r.report_name))\r )\r  order by r.report_name, rp.parameter_id');
 
--- Add datatables for guarantor stuff in here for now rather than DDL as we expect it may change
-DROP TABLE IF EXISTS `m_guarantor_external`;
-CREATE TABLE `m_guarantor_external` (
-  `loan_id` bigint(20) NOT NULL,
-  `firstname` varchar(50) NOT NULL,
-  `lastname` varchar(50) NOT NULL,
-  `dob` date DEFAULT NULL,
-  `address_line_1` varchar(500) DEFAULT NULL,
-  `address_line_2` varchar(500) DEFAULT NULL,
-  `city` varchar(50) DEFAULT NULL,
-  `state` varchar(50) DEFAULT NULL,
-  `country` varchar(50) DEFAULT NULL,
-  `zip` varchar(20) DEFAULT NULL,
-  `house_phone_number` varchar(20) DEFAULT NULL,
-  `mobile_number` varchar(20) DEFAULT NULL,
-  `comment` varchar(20) DEFAULT NULL,
-  PRIMARY KEY (`loan_id`),
-  CONSTRAINT `FK_m_guarantor_m_loan` FOREIGN KEY (`loan_id`) REFERENCES `m_loan` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
 INSERT INTO `x_registered_table` (`registered_table_name`, `application_table_name`)
 VALUES ('m_guarantor_external','m_loan');
 

mifosng-db/patches/06-guarantor-redux.sql

@@ -26,7 +26,6 @@ CREATE TABLE `m_guarantor` (
 	INDEX `FK_m_guarantor_m_loan` (`loan_id`),
 	CONSTRAINT `FK_m_guarantor_m_loan` FOREIGN KEY (`loan_id`) REFERENCES `m_loan` (`id`)
 )
-COLLATE='utf8_general_ci'
 ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 -- Update loan table

mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/gaurantor/GuarantorConstants.java

@@ -11,7 +11,7 @@ public class GuarantorConstants {
     public static enum GUARANTOR_JSON_INPUT_PARAMS {
         LOAN_ID("loanId"), GUARANTOR_TYPE_ID("guarantorTypeId"), ENTITY_ID("entityId"), FIRSTNAME("firstname"), LASTNAME("lastname"), ADDRESS_LINE_1(
                 "addressLine1"), ADDRESS_LINE_2("addressLine2"), CITY("city"), STATE("state"), ZIP("zip"), COUNTRY("country"), MOBILE_NUMBER(
-                "mobileNumber"), PHONE_NUMBER("housePhoneNumber"), COMMENT("comment"), DATE_OF_BIRTH("dob"), ;
+                "mobileNumber"), PHONE_NUMBER("housePhoneNumber"), COMMENT("comment"), DATE_OF_BIRTH("dob");
 
         private final String value;