From: Janusz Dobrowolski <janusz@frontaccouting.eu>
Date: Thu, 22 Nov 2012 12:58:16 +0000 (+0100)
Subject: Removed obsolete budget_trans table fields.
X-Git-Tag: v2.4.2~19^2~339
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=25f78b5a889ee8da4fcacc2afcf5d1ecde170e37;p=fa-stable.git

Removed obsolete budget_trans table fields.
---

diff --git a/sql/alter2.4.php b/sql/alter2.4.php
index fb988bd4..c065ce05 100644
--- a/sql/alter2.4.php
+++ b/sql/alter2.4.php
@@ -180,8 +180,18 @@ class fa2_4 {
 
 	function do_cleanup()
 	{
-		$sql = "ALTER TABLE `".TB_PREF."tax_group_items` DROP COLUMN `rate`";
-		return db_query($sql);
+		$dropcol = array(
+				'tax_group_items' => array('rate'),
+				'budget_trans' => array('type', 'type_no', 'person_id', 'person_type_id', 'memo_'),
+		);
+
+		foreach($dropcol as $table => $columns)
+			foreach($columns as $col) {
+				if (db_query("ALTER TABLE `".TB_PREF."{$table}` DROP `$col`") == false) {
+					display_error("Cannot drop {$table}.{$col} column:<br>".db_error_msg($db));
+					return false;
+				}
+			}
 	}
 }
 
diff --git a/sql/en_US-demo.sql b/sql/en_US-demo.sql
index 4043aa5b..556796fd 100644
--- a/sql/en_US-demo.sql
+++ b/sql/en_US-demo.sql
@@ -200,19 +200,14 @@ INSERT INTO `0_bom` VALUES(3, '3400', '104', 1, 'DEF', 1);
 
 DROP TABLE IF EXISTS `0_budget_trans`;
 CREATE TABLE IF NOT EXISTS `0_budget_trans` (
-  `counter` int(11) NOT NULL auto_increment,
-  `type` smallint(6) NOT NULL default '0',
-  `type_no` bigint(16) NOT NULL default '1',
+  `id` int(11) NOT NULL auto_increment,
   `tran_date` date NOT NULL default '0000-00-00',
   `account` varchar(15) NOT NULL default '',
   `memo_` tinytext NOT NULL,
   `amount` double NOT NULL default '0',
   `dimension_id` int(11) default '0',
   `dimension2_id` int(11) default '0',
-  `person_type_id` int(11) default NULL,
-  `person_id` tinyblob,
-  PRIMARY KEY  (`counter`),
-  KEY `Type_and_Number` (`type`,`type_no`),
+  PRIMARY KEY  (`id`),
   KEY `Account` (`account`,`tran_date`,`dimension_id`,`dimension2_id`)
 ) ENGINE=InnoDB AUTO_INCREMENT=1 ;
 
diff --git a/sql/en_US-new.sql b/sql/en_US-new.sql
index 7f61422b..0a04e735 100644
--- a/sql/en_US-new.sql
+++ b/sql/en_US-new.sql
@@ -186,19 +186,14 @@ CREATE TABLE IF NOT EXISTS `0_bom` (
 
 DROP TABLE IF EXISTS `0_budget_trans`;
 CREATE TABLE IF NOT EXISTS `0_budget_trans` (
-  `counter` int(11) NOT NULL auto_increment,
-  `type` smallint(6) NOT NULL default '0',
-  `type_no` bigint(16) NOT NULL default '1',
+  `id` int(11) NOT NULL auto_increment,
   `tran_date` date NOT NULL default '0000-00-00',
   `account` varchar(15) NOT NULL default '',
   `memo_` tinytext NOT NULL,
   `amount` double NOT NULL default '0',
   `dimension_id` int(11) default '0',
   `dimension2_id` int(11) default '0',
-  `person_type_id` int(11) default NULL,
-  `person_id` tinyblob,
-  PRIMARY KEY  (`counter`),
-  KEY `Type_and_Number` (`type`,`type_no`),
+  PRIMARY KEY  (`id`),
   KEY `Account` (`account`,`tran_date`,`dimension_id`,`dimension2_id`)
 ) ENGINE=InnoDB AUTO_INCREMENT=1 ;