From e302b699382dbb1072d746636063f8383e635230 Mon Sep 17 00:00:00 2001 From: Pradeep Nayak Date: Wed, 12 Jun 2013 20:39:10 +0530 Subject: [PATCH] -- worked on CRM-12799, removed cruft for civicrm_payment ---------------------------------------- * CRM-12799: Remove cruft from 4.3.alpha1.tpl file http://issues.civicrm.org/jira/browse/CRM-12799 --- CRM/Upgrade/Incremental/sql/4.3.5.mysql.tpl | 2 ++ .../Incremental/sql/4.3.alpha1.mysql.tpl | 17 ----------------- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/CRM/Upgrade/Incremental/sql/4.3.5.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.3.5.mysql.tpl index 8f9d5a7116..c42b212e3d 100644 --- a/CRM/Upgrade/Incremental/sql/4.3.5.mysql.tpl +++ b/CRM/Upgrade/Incremental/sql/4.3.5.mysql.tpl @@ -1 +1,3 @@ {* file to handle db changes in 4.3.5 during upgrade*} +-- CRM-12799 +DROP TABLE IF EXISTS civicrm_payment; \ No newline at end of file diff --git a/CRM/Upgrade/Incremental/sql/4.3.alpha1.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.3.alpha1.mysql.tpl index 617397c1b6..fca123ea63 100644 --- a/CRM/Upgrade/Incremental/sql/4.3.alpha1.mysql.tpl +++ b/CRM/Upgrade/Incremental/sql/4.3.alpha1.mysql.tpl @@ -263,23 +263,6 @@ CREATE TABLE IF NOT EXISTS `civicrm_financial_item` ( KEY `FK_civicrm_financial_item_financial_account_id` (`financial_account_id`) )ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; -CREATE TABLE IF NOT EXISTS `civicrm_payment` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'Id', - `payment_batch_number` int(10) unsigned NOT NULL COMMENT 'Payment Batch Nnumber', - `payment_number` int(10) unsigned NOT NULL COMMENT 'Payment Number', - `financial_type_id` int(10) unsigned NOT NULL COMMENT 'Financial Type ID', - `contact_id` int(10) unsigned NOT NULL COMMENT 'Contact ID', - `payment_created_date` date DEFAULT NULL COMMENT 'Payment Created Date.', - `payment_date` date DEFAULT NULL COMMENT 'Payment Date.', - `payable_to_name` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT 'Payable To Name.', - `payable_to_address` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT 'Payable To Address.', - `amount` decimal(20,2) NOT NULL COMMENT 'Requested grant amount, in default currency.', - `currency` varchar(3) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT '3 character string, value from config setting or input via user.', - `payment_reason` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT 'Payment Reason.', - `replaces_payment_id` varchar(8) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT 'Replaces Payment Id.', - PRIMARY KEY (`id`) -)ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - ALTER TABLE `civicrm_batch` ADD `payment_instrument_id` int(10) unsigned DEFAULT NULL COMMENT 'fk to Payment Instrument options in civicrm_option_values', ADD `exported_date` datetime DEFAULT NULL; -- 2.25.1