From d70638d43fd84d952e0edc7b3a7cd2a66bf8e8ae Mon Sep 17 00:00:00 2001 From: Jenkins User Date: Fri, 29 Jun 2012 04:08:35 +0000 Subject: [PATCH] db-schema dump: snapshot Fri Jun 29 06:08:35 +0200 2012 --- schema/dump.db | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/schema/dump.db b/schema/dump.db index 718b5d8c..9c28c009 100644 --- a/schema/dump.db +++ b/schema/dump.db @@ -1841,7 +1841,7 @@ CREATE TABLE `cfg_schema` ( `applied_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (`id`), UNIQUE KEY `rev_idx` (`revision`,`node`) -) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=14 DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `db_schema`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -1853,7 +1853,7 @@ CREATE TABLE `db_schema` ( `applied_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (`id`), UNIQUE KEY `rev_idx` (`revision`,`node`) -) ENGINE=InnoDB AUTO_INCREMENT=123 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=125 DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; /*!40000 DROP DATABASE IF EXISTS `provisioning`*/; @@ -2972,7 +2972,7 @@ CREATE TABLE `voip_preferences` ( `description` text, PRIMARY KEY (`id`), UNIQUE KEY `attribute_idx` (`attribute`) -) ENGINE=InnoDB AUTO_INCREMENT=70 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=71 DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -3043,7 +3043,7 @@ CREATE TABLE `voip_preferences_enum` ( PRIMARY KEY (`id`), KEY `preference_id` (`preference_id`), CONSTRAINT `voip_preferences_enum_ibfk_1` FOREIGN KEY (`preference_id`) REFERENCES `voip_preferences` (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=19 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=20 DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -3092,8 +3092,6 @@ FOR EACH ROW BEGIN WHERE attribute_id=NEW.preference_id; UPDATE voip_peer_preferences SET value=NEW.value WHERE attribute_id=NEW.preference_id; - UPDATE voip_preferences_enum SET default_val=NEW.value - WHERE OLD.id=NEW.id AND default_val IS NOT NULL AND default_val=OLD.value; END */;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ;