r2702 - drop unused "deleted" column completely

diff --git a/inc/database.php b/inc/database.php
index 38e0d7b62d82837e115cd8ec32c63f7d7df6365f..82266441e1832b7021d07e33eb17754ad98982b8 100644 (file)
--- a/inc/database.php
+++ b/inc/database.php
@@ -125,7 +125,7 @@ function getNarrowObjectList ($varname = '')
                "select RackObject.id as id, RackObject.name as name, dict_value as objtype_name, " .
                "objtype_id from " .
                "RackObject inner join Dictionary on objtype_id=dict_key join Chapter on Chapter.id = Dictionary.chapter_id " .
-               "where RackObject.deleted = 'no' and Chapter.name = 'RackObjectType' " .
+               "where Chapter.name = 'RackObjectType' " .
                "order by objtype_id, name";
        $result = useSelectBlade ($query, __FUNCTION__);
        while ($row = $result->fetch (PDO::FETCH_ASSOC))
@@ -352,7 +352,7 @@ function getRackData ($rack_id = 0, $silent = FALSE)
        $query =
                "select Rack.id, Rack.name, row_id, height, Rack.comment, RackRow.name as row_name from " .
                "Rack left join RackRow on Rack.row_id = RackRow.id  " .
-               "where  Rack.id='${rack_id}' and Rack.deleted = 'no'";
+               "where Rack.id='${rack_id}'";
        $result = useSelectBlade ($query, __FUNCTION__);
        if (($row = $result->fetch (PDO::FETCH_ASSOC)) == NULL)
        {
@@ -407,7 +407,7 @@ function getObjectInfo ($object_id = 0, $set_dname = TRUE)
        $query =
                "select RackObject.id as id, RackObject.name as name, label, barcode, dict_value as objtype_name, asset_no, dict_key as objtype_id, has_problems, comment from " .
                "RackObject inner join Dictionary on objtype_id = dict_key join Chapter on Chapter.id = Dictionary.chapter_id " .
-               "where RackObject.id = '${object_id}' and RackObject.deleted = 'no' and Chapter.name = 'RackObjectType' limit 1";
+               "where RackObject.id = '${object_id}' and Chapter.name = 'RackObjectType'";
        $result = useSelectBlade ($query, __FUNCTION__);
        if (($ret = $result->fetch (PDO::FETCH_ASSOC)) == NULL)
        {

diff --git a/inc/interface.php b/inc/interface.php
index 5388bc52ae0743e193ed8b49ac1ce3d9482fe4df..b28570777f949b7da90957e27d758a4cdaf2aaed 100644 (file)
--- a/inc/interface.php
+++ b/inc/interface.php
@@ -1919,25 +1919,25 @@ function renderHistory ($object_type, $object_id)
        switch ($object_type)
        {
                case 'row':
-                       $query = "select ctime, user_name, name, deleted, comment from RackRowHistory where id = ${object_id} order by ctime";
-                       $header = '<tr><th>change time</th><th>author</th><th>rack row name</th><th>is deleted?</th><th>rack row comment</th></tr>';
-                       $extra = 4;
+                       $query = "select ctime, user_name, name, comment from RackRowHistory where id = ${object_id} order by ctime";
+                       $header = '<tr><th>change time</th><th>author</th><th>rack row name</th><th>rack row comment</th></tr>';
+                       $extra = 3;
                        break;
                case 'rack':
                        $query =
-                               "select ctime, user_name, rh.name, rh.deleted, rr.name as name, rh.height, rh.comment " .
+                               "select ctime, user_name, rh.name, rr.name as name, rh.height, rh.comment " .
                                "from RackHistory as rh left join RackRow as rr on rh.row_id = rr.id " .
                                "where rh.id = ${object_id} order by ctime";
-                       $header = '<tr><th>change time</th><th>author</th><th>rack name</th><th>is deleted?</th><th>rack row name</th><th>rack height</th><th>rack comment</th></tr>';
-                       $extra = 6;
+                       $header = '<tr><th>change time</th><th>author</th><th>rack name</th><th>rack row name</th><th>rack height</th><th>rack comment</th></tr>';
+                       $extra = 5;
                        break;
                case 'object':
                        $query =
-                               "select ctime, user_name, RackObjectHistory.name as name, label, barcode, asset_no, deleted, has_problems, dict_value, comment " .
+                               "select ctime, user_name, RackObjectHistory.name as name, label, barcode, asset_no, has_problems, dict_value, comment " .
                                "from RackObjectHistory inner join Dictionary on objtype_id = dict_key join Chapter on Dictionary.chapter_id = Chapter.id " .
                                "where Chapter.name = 'RackObjectType' and RackObjectHistory.id=${object_id} order by ctime";
-                       $header = '<tr><th>change time</th><th>author</th><th>common name</th><th>visible label</th><th>barcode</th><th>asset no</th><th>is deleted?</th><th>has problems?</th><th>object type</th><th>comment</th></tr>';
-                       $extra = 9;
+                       $header = '<tr><th>change time</th><th>author</th><th>common name</th><th>visible label</th><th>barcode</th><th>asset no</th><th>has problems?</th><th>object type</th><th>comment</th></tr>';
+                       $extra = 8;
                        break;
                default:
                        showError ("Uknown object type '${object_type}'", __FUNCTION__);

diff --git a/install/init-sample-racks.sql b/install/init-sample-racks.sql
index 1617ddebcfeff5b0496cff8dab7ac0ca8525f6c7..3a571b34586b82f499fb4fce27c82a2ba39aede6 100644 (file)
--- a/install/init-sample-racks.sql
+++ b/install/init-sample-racks.sql
@@ -349,64 +349,65 @@ INSERT INTO `Rack` VALUES (45,'M01','no',50000,42,'',NULL);
 INSERT INTO `Rack` VALUES (46,'NY102','no',50002,42,'server farm wing B',NULL);
 INSERT INTO `Rack` VALUES (47,'T01','no',50001,16,'',NULL);
 
-INSERT INTO `RackObject` VALUES (905,'london router','bbrtr1',NULL,'no',7,'net247','no','');
-INSERT INTO `RackObject` VALUES (906,'londonswitch1','',NULL,'no',8,NULL,'no','');
-INSERT INTO `RackObject` VALUES (907,'New-York router 1','bbrtr2a',NULL,'no',7,'net55','no','');
-INSERT INTO `RackObject` VALUES (908,'moscow router','bbrtr3',NULL,'no',7,NULL,'no',NULL);
-INSERT INTO `RackObject` VALUES (909,'tokyo router','bbrtr4',NULL,'no',7,NULL,'no',NULL);
-INSERT INTO `RackObject` VALUES (910,'London server 1','lserver01',NULL,'no',4,'srv500','no','');
-INSERT INTO `RackObject` VALUES (911,'London server 2','lserver02',NULL,'no',4,'srv501','no','');
-INSERT INTO `RackObject` VALUES (912,'London server 3','lserver03',NULL,'no',4,'srv502','no','');
-INSERT INTO `RackObject` VALUES (913,'London server 4','lserver04',NULL,'no',4,'srv503','yes','this one needs replacement');
-INSERT INTO `RackObject` VALUES (914,'London server 5','lserver05',NULL,'no',4,'srv504','no','');
-INSERT INTO `RackObject` VALUES (915,'london LB','llb',NULL,'no',8,'net1000','no','');
-INSERT INTO `RackObject` VALUES (916,'shared storage','',NULL,'no',5,NULL,'no','');
-INSERT INTO `RackObject` VALUES (917,'london-NAS','',NULL,'no',7,'net1001','no','');
-INSERT INTO `RackObject` VALUES (918,'London server 6','lserver06',NULL,'no',4,'srv505','no',NULL);
-INSERT INTO `RackObject` VALUES (919,'London server 7','lserver07',NULL,'no',4,'srv506','no',NULL);
-INSERT INTO `RackObject` VALUES (920,'backup library','lbackup',NULL,'no',6,'misc200','no',NULL);
-INSERT INTO `RackObject` VALUES (921,'lserver06 array','lserver06 array',NULL,'no',5,NULL,'no',NULL);
-INSERT INTO `RackObject` VALUES (922,'lserver07 array','lserver07 array',NULL,'no',5,NULL,'no',NULL);
-INSERT INTO `RackObject` VALUES (923,'Tokyo server 1','tserver01',NULL,'no',4,'srv654','no',NULL);
-INSERT INTO `RackObject` VALUES (924,'Tokyo server 2','tserver02',NULL,'no',4,'srv848','no',NULL);
-INSERT INTO `RackObject` VALUES (925,'Tokyo server 3','tserver03',NULL,'no',4,'srv139','no',NULL);
-INSERT INTO `RackObject` VALUES (926,'Tokyo switch','tswitch',NULL,'no',8,'net385','no',NULL);
-INSERT INTO `RackObject` VALUES (927,'New-York router 2','bbrtr2b',NULL,'no',7,'net498','no',NULL);
-INSERT INTO `RackObject` VALUES (928,'New-York IPVS LB A','nylba',NULL,'no',4,'net554','no',NULL);
-INSERT INTO `RackObject` VALUES (929,'New-York IPVS LB B','nylbb',NULL,'no',4,'net555','no',NULL);
-INSERT INTO `RackObject` VALUES (930,'New-York server switch A','nyswitcha',NULL,'no',8,'net084','no',NULL);
-INSERT INTO `RackObject` VALUES (931,'New-York server switch B','nyswitchb',NULL,'no',8,'net486','no',NULL);
-INSERT INTO `RackObject` VALUES (932,'New-York server 1A','nysrv1a',NULL,'no',4,'srv287','no',NULL);
-INSERT INTO `RackObject` VALUES (933,'New-York server 1B','nysrv1b',NULL,'no',4,'srv288','no',NULL);
-INSERT INTO `RackObject` VALUES (934,'New-York server 2A','nysrv2a',NULL,'no',4,NULL,'no',NULL);
-INSERT INTO `RackObject` VALUES (935,'New-York server 2B','nysrv2b',NULL,'no',4,NULL,'no',NULL);
-INSERT INTO `RackObject` VALUES (936,'New-York server 3A','nysrv3a',NULL,'no',4,NULL,'no',NULL);
-INSERT INTO `RackObject` VALUES (937,'New-York server 3B','nysrv3b',NULL,'no',4,NULL,'no',NULL);
-INSERT INTO `RackObject` VALUES (938,'New-York server 4A','nysrv4a',NULL,'no',4,NULL,'no',NULL);
-INSERT INTO `RackObject` VALUES (939,'New-York server 4B','nysrv4b',NULL,'no',4,NULL,'no',NULL);
-INSERT INTO `RackObject` VALUES (940,'New-York server 5A','nysrv5a',NULL,'no',4,NULL,'no',NULL);
-INSERT INTO `RackObject` VALUES (941,'New-York server 5B','nysrv5b',NULL,'no',4,NULL,'no',NULL);
-INSERT INTO `RackObject` VALUES (942,'wing A UPS','',NULL,'no',12,NULL,'no',NULL);
-INSERT INTO `RackObject` VALUES (943,'wing B UPS','',NULL,'no',12,NULL,'no',NULL);
-INSERT INTO `RackObject` VALUES (944,'network UPS','',NULL,'no',12,NULL,'no',NULL);
-INSERT INTO `RackObject` VALUES (945,NULL,'',NULL,'no',9,NULL,'no',NULL);
-INSERT INTO `RackObject` VALUES (946,NULL,'',NULL,'no',9,NULL,'no',NULL);
-INSERT INTO `RackObject` VALUES (947,NULL,'',NULL,'no',2,NULL,'no',NULL);
-INSERT INTO `RackObject` VALUES (948,NULL,'',NULL,'no',2,NULL,'no',NULL);
-INSERT INTO `RackObject` VALUES (949,NULL,'',NULL,'no',2,NULL,'no',NULL);
-INSERT INTO `RackObject` VALUES (950,NULL,'',NULL,'no',2,NULL,'no',NULL);
-INSERT INTO `RackObject` VALUES (951,NULL,'',NULL,'no',2,NULL,'no',NULL);
-INSERT INTO `RackObject` VALUES (952,NULL,'',NULL,'no',2,NULL,'no',NULL);
-INSERT INTO `RackObject` VALUES (953,NULL,'',NULL,'no',2,NULL,'no',NULL);
-INSERT INTO `RackObject` VALUES (954,NULL,'',NULL,'no',2,NULL,'no',NULL);
-INSERT INTO `RackObject` VALUES (955,NULL,'',NULL,'no',2,NULL,'no',NULL);
-INSERT INTO `RackObject` VALUES (956,'mps1','','200161','no',4,NULL,'no',NULL);
-INSERT INTO `RackObject` VALUES (957,'mps2','','200283','no',4,NULL,'no',NULL);
-INSERT INTO `RackObject` VALUES (958,'mps3','','200881','no',4,NULL,'no',NULL);
-INSERT INTO `RackObject` VALUES (959,'mps4','','200458','no',4,NULL,'no',NULL);
-INSERT INTO `RackObject` VALUES (960,'mps5','','200112','no',4,NULL,'no',NULL);
-INSERT INTO `RackObject` VALUES (961,'mskswitch','',NULL,'no',8,'sw0001','no',NULL);
-INSERT INTO `RackObject` VALUES (962,'moscow kvm switch','','300221','no',445,'sw0002','no',NULL);
+INSERT INTO `RackObject` (id, name, label, barcode, objtype_id, asset_no, has_problems, comment) VALUES 
+(905,'london router','bbrtr1',NULL,7,'net247','no',''),
+(906,'londonswitch1','',NULL,8,NULL,'no',''),
+(907,'New-York router 1','bbrtr2a',NULL,7,'net55','no',''),
+(908,'moscow router','bbrtr3',NULL,7,NULL,'no',NULL),
+(909,'tokyo router','bbrtr4',NULL,7,NULL,'no',NULL),
+(910,'London server 1','lserver01',NULL,4,'srv500','no',''),
+(911,'London server 2','lserver02',NULL,4,'srv501','no',''),
+(912,'London server 3','lserver03',NULL,4,'srv502','no',''),
+(913,'London server 4','lserver04',NULL,4,'srv503','yes','this one needs replacement'),
+(914,'London server 5','lserver05',NULL,4,'srv504','no',''),
+(915,'london LB','llb',NULL,8,'net1000','no',''),
+(916,'shared storage','',NULL,5,NULL,'no',''),
+(917,'london-NAS','',NULL,7,'net1001','no',''),
+(918,'London server 6','lserver06',NULL,4,'srv505','no',NULL),
+(919,'London server 7','lserver07',NULL,4,'srv506','no',NULL),
+(920,'backup library','lbackup',NULL,6,'misc200','no',NULL),
+(921,'lserver06 array','lserver06 array',NULL,5,NULL,'no',NULL),
+(922,'lserver07 array','lserver07 array',NULL,5,NULL,'no',NULL),
+(923,'Tokyo server 1','tserver01',NULL,4,'srv654','no',NULL),
+(924,'Tokyo server 2','tserver02',NULL,4,'srv848','no',NULL),
+(925,'Tokyo server 3','tserver03',NULL,4,'srv139','no',NULL),
+(926,'Tokyo switch','tswitch',NULL,8,'net385','no',NULL),
+(927,'New-York router 2','bbrtr2b',NULL,7,'net498','no',NULL),
+(928,'New-York IPVS LB A','nylba',NULL,4,'net554','no',NULL),
+(929,'New-York IPVS LB B','nylbb',NULL,4,'net555','no',NULL),
+(930,'New-York server switch A','nyswitcha',NULL,8,'net084','no',NULL),
+(931,'New-York server switch B','nyswitchb',NULL,8,'net486','no',NULL),
+(932,'New-York server 1A','nysrv1a',NULL,4,'srv287','no',NULL),
+(933,'New-York server 1B','nysrv1b',NULL,4,'srv288','no',NULL),
+(934,'New-York server 2A','nysrv2a',NULL,4,NULL,'no',NULL),
+(935,'New-York server 2B','nysrv2b',NULL,4,NULL,'no',NULL),
+(936,'New-York server 3A','nysrv3a',NULL,4,NULL,'no',NULL),
+(937,'New-York server 3B','nysrv3b',NULL,4,NULL,'no',NULL),
+(938,'New-York server 4A','nysrv4a',NULL,4,NULL,'no',NULL),
+(939,'New-York server 4B','nysrv4b',NULL,4,NULL,'no',NULL),
+(940,'New-York server 5A','nysrv5a',NULL,4,NULL,'no',NULL),
+(941,'New-York server 5B','nysrv5b',NULL,4,NULL,'no',NULL),
+(942,'wing A UPS','',NULL,12,NULL,'no',NULL),
+(943,'wing B UPS','',NULL,12,NULL,'no',NULL),
+(944,'network UPS','',NULL,12,NULL,'no',NULL),
+(945,NULL,'',NULL,9,NULL,'no',NULL),
+(946,NULL,'',NULL,9,NULL,'no',NULL),
+(947,NULL,'',NULL,2,NULL,'no',NULL),
+(948,NULL,'',NULL,2,NULL,'no',NULL),
+(949,NULL,'',NULL,2,NULL,'no',NULL),
+(950,NULL,'',NULL,2,NULL,'no',NULL),
+(951,NULL,'',NULL,2,NULL,'no',NULL),
+(952,NULL,'',NULL,2,NULL,'no',NULL),
+(953,NULL,'',NULL,2,NULL,'no',NULL),
+(954,NULL,'',NULL,2,NULL,'no',NULL),
+(955,NULL,'',NULL,2,NULL,'no',NULL),
+(956,'mps1','','200161',4,NULL,'no',NULL),
+(957,'mps2','','200283',4,NULL,'no',NULL),
+(958,'mps3','','200881',4,NULL,'no',NULL),
+(959,'mps4','','200458',4,NULL,'no',NULL),
+(960,'mps5','','200112',4,NULL,'no',NULL),
+(961,'mskswitch','',NULL,8,'sw0001','no',NULL),
+(962,'moscow kvm switch','','300221',445,'sw0002','no',NULL);
 
 INSERT INTO `RackSpace` VALUES (41,9,'interior','T',905);
 INSERT INTO `RackSpace` VALUES (41,9,'front','T',905);

diff --git a/install/init-structure.sql b/install/init-structure.sql
index fe139808c17c26e09a8c144bae192a08053cec67..f599580e0688bc0ac76899642c60a9df5ea37c1c 100644 (file)
--- a/install/init-structure.sql
+++ b/install/init-structure.sql
@@ -226,7 +226,6 @@ CREATE TABLE `RackRow` (
 CREATE TABLE `Rack` (
   `id` int(10) unsigned NOT NULL auto_increment,
   `name` char(255) default NULL,
-  `deleted` enum('yes','no') NOT NULL default 'no',
   `row_id` int(10) unsigned NOT NULL default '1',
   `height` tinyint(3) unsigned NOT NULL default '42',
   `comment` text,
@@ -238,7 +237,6 @@ CREATE TABLE `Rack` (
 CREATE TABLE `RackHistory` (
   `id` int(10) unsigned default NULL,
   `name` char(255) default NULL,
-  `deleted` enum('yes','no') default NULL,
   `row_id` int(10) unsigned default NULL,
   `height` tinyint(3) unsigned default NULL,
   `comment` text,
@@ -252,7 +250,6 @@ CREATE TABLE `RackObject` (
   `name` char(255) default NULL,
   `label` char(255) default NULL,
   `barcode` char(16) default NULL,
-  `deleted` enum('yes','no') NOT NULL default 'no',
   `objtype_id` int(10) unsigned NOT NULL default '1',
   `asset_no` char(64) default NULL,
   `has_problems` enum('yes','no') NOT NULL default 'no',
@@ -268,7 +265,6 @@ CREATE TABLE `RackObjectHistory` (
   `name` char(255) default NULL,
   `label` char(255) default NULL,
   `barcode` char(16) default NULL,
-  `deleted` enum('yes','no') default NULL,
   `objtype_id` int(10) unsigned default NULL,
   `asset_no` char(64) default NULL,
   `has_problems` enum('yes','no') NOT NULL default 'no',

diff --git a/upgrade.php b/upgrade.php
index ab8239a0cd644a1cd09cc510f01d830469b86638..9b8dbb47b950ce4f91fc52ebb5774d0f434330dd 100644 (file)
--- a/upgrade.php
+++ b/upgrade.php
@@ -232,6 +232,10 @@ CREATE TABLE `LDAPCache` (
   KEY `scanidx` (`presented_username`,`successful_hash`)
 ) ENGINE=InnoDB;";
                        $query[] = "alter table UserAccount modify column user_password_hash char(40) NULL";
+                       $query[] = 'ALTER TABLE Rack DROP COLUMN deleted';
+                       $query[] = 'ALTER TABLE RackHistory DROP COLUMN deleted';
+                       $query[] = 'ALTER TABLE RackObject DROP COLUMN deleted';
+                       $query[] = 'ALTER TABLE RackObjectHistory DROP COLUMN deleted';
                        $query[] = "UPDATE Config SET varvalue = '0.17.0' WHERE varname = 'DB_VERSION'";
 
                        break;