Removed obsolete budget_trans table fields.

diff --git a/sql/alter2.4.php b/sql/alter2.4.php
index fb988bd450bcd50c695fdbbeea08ec856f2e9264..c065ce057820c73771940f7df9c1501caf479da8 100644 (file)
--- 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 4043aa5b4ea186a4f16b23f0f8a6b8d684b146de..556796fd1713ae64e63d00b94ac10d177271708f 100644 (file)
--- 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 7f61422be31a8cade1acb79fd0582134c409a51e..0a04e735b1b91b1077404faf01715dc40ec66efc 100644 (file)
--- 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 ;