Merge branch 'master' of https://gitlab.irap.omp.eu/epallier/labinvent

root
2 parents 6dba78dc 7cc1b02e
Showing 4 changed files with 12 additions and 5 deletions Show diff stats
database/labinvent_2.1_12-05-16.sql
database/update/script_sql/.gitignore
database/update/script_sql/db-update-2016-06-27-irap.sql
database/update/script_sql/db-update-2016-06-27.sql
@@ -77,10 +77,10 @@ CREATE TABLE IF NOT EXISTS `documents` (
   `nom` VARCHAR(100) DEFAULT NULL,
   `materiel_id` int(11) DEFAULT NULL,
   `suivi_id` int(11) DEFAULT NULL,
-  `type_document_id` int(11) DEFAULT 1,
+  `type_document_id` int(11) DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `fk_documents_materiel_id` (`materiel_id`),
-  KEY `fk_documents_suivi_id` (`suivi_id`)
+  KEY `fk_documents_suivi_id` (`suivi_id`),
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
  
 -- --------------------------------------------------------
-/db-update-2016-06-20-build.sql
+/*-build.sql
 /db-update-2016-06-24-build.sql
-/db-update-2016-06-24-2.sql~
+/*~
 /db-update-2016-06-24-2-build.sql
 use database;
  
+set foreign_key_checks=0;
+
+ALTER TABLE `documents` DROP `type_document_id`;
+
+ALTER TABLE `documents` ADD `type_document_id` int(11) DEFAULT NULL;
 ALTER TABLE `documents` ADD CONSTRAINT `fk_documents_type_documents_id` FOREIGN KEY (`type_document_id`) REFERENCES `type_documents` (`id`) ON DELETE NO ACTION ON UPDATE NO ACTION;
  
 use database;
  
-ALTER TABLE `documents` ADD `type_document_id` int(11) DEFAULT 1;
+set foreign_key_checks=0;
+
+ALTER TABLE `documents` ADD `type_document_id` int(11) DEFAULT NULL;
  
 CREATE TABLE IF NOT EXISTS `type_documents` (
   `id` int(11) NOT NULL AUTO_INCREMENT,