symbolstix sql unified

.gitignore

@@ -11,6 +11,8 @@ mocha-report.xml
 ##########
 sails/upload
 sails/symbolstx*
+sails/arasaac*
+sails/arasaac
 sails/src/assets/symbolstx*
 sails/src/assets/upload
 sails/upload.tgz

sails/roles/database/files/pictocat.sql

--- MySQL dump 10.13  Distrib 5.7.13, for Linux (x86_64)
---
--- Host: localhost    Database: pictodbclean
--- ------------------------------------------------------
--- Server version	5.7.13
-
-/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
-/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
-/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!40101 SET NAMES utf8 */;
-/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
-/*!40103 SET TIME_ZONE='+00:00' */;
-/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
-/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
-/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
-/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-
---
--- Table structure for table `pictocat`
---
-
-DROP TABLE IF EXISTS `pictocat`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `pictocat` (
-  `id` int(11) NOT NULL,
-  `id_supercat` int(11) DEFAULT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMMENT='Identifies a category, which, itself, may belong to another category';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `pictocat`
---
-
-LOCK TABLES `pictocat` WRITE;
-/*!40000 ALTER TABLE `pictocat` DISABLE KEYS */;
-INSERT INTO `pictocat` VALUES (1,0),(2,1),(3,1),(4,0),(5,0),(6,1),(7,0),(8,1),(9,0),(10,0),(11,0),(12,0),(13,0),(14,0),(15,0),(16,0),(17,16),(18,16),(19,0),(20,0),(21,16),(22,0),(23,22),(24,16),(25,16),(26,0),(27,0),(28,0),(29,0),(30,29),(31,29),(32,29),(33,0),(34,0),(35,22),(36,0),(37,5),(38,0),(39,0),(40,12),(41,15),(42,0),(43,0),(44,0),(45,9),(46,0),(47,0),(48,0),(49,0),(50,0),(51,0),(52,0),(53,0),(54,53),(55,53),(56,53),(57,53),(58,53),(59,53),(60,53),(61,53),(62,53),(63,53),(64,53),(65,51),(66,20),(67,0),(68,0),(69,0),(70,0),(71,0),(72,20),(73,0),(74,0),(75,0),(76,71),(77,20),(78,51),(79,0),(80,0),(81,5),(82,22),(83,0),(84,0),(85,84),(86,84),(87,51),(88,0),(89,20),(90,0),(91,51),(92,80),(93,0),(94,0),(95,0),(96,0),(97,0),(98,97),(99,97),(100,80),(101,69),(102,51),(103,51),(104,0),(105,51),(106,69),(107,69),(108,0),(109,69),(110,69),(111,69),(112,69),(113,69),(114,0),(115,71),(116,0),(117,0),(118,0),(119,0),(120,0),(121,0),(122,0);
-/*!40000 ALTER TABLE `pictocat` ENABLE KEYS */;
-UNLOCK TABLES;
-/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
-
-/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
-/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
-/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
-/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
-/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
-/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
-/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-
--- Dump completed on 2017-01-17  9:48:07
-
---
--- Creacion y volcado de datos para la tabla `pictocattree`
---
-source /vagrant/roles/database/files/pictocat_tree_populate.sql
-source /vagrant/roles/database/files/catexp.sql

sails/roles/database/files/pictodb-schema.sql

@@ -48,17 +48,14 @@ COMMENT="This table registers and action performed by a user at a given time, al
 --
 -- Estructura de tabla para la tabla `catexp`
 --
-CREATE TABLE IF NOT EXISTS `catexp`(
+CREATE TABLE `catexp` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `id_cat` int(11) NOT NULL,
-  `lang` char(5),
+  `lang` char(5) DEFAULT NULL,
   `exp` varchar(30) NOT NULL,
-  PRIMARY KEY(`id`),
-  UNIQUE(exp,lang),
-  CHECK (lang IN ('es-es','en-gb','en-us'))
-)
-COMMENT="Stores the expressions available in several languages for a given category (id_cat)";
-
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `exp` (`exp`,`lang`)
+) ENGINE=InnoDB AUTO_INCREMENT=27958 DEFAULT CHARSET=urf8 COMMENT='Stores the expressions available in several languages for a given category (id_cat)';
 -- --------------------------------------------------------
 
 --
@@ -201,9 +198,9 @@ COMMENT="Stablish access rights to pictos";
 
 CREATE TABLE IF NOT EXISTS `pictocat`(
   `id` int(11) PRIMARY KEY,
-  `id_supercat` int(11)
+  `id_supercat` int(11) DEFAULT NULL
 )
-COMMENT="Identifies a category, which, itself, may belong to another category";
+ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT="Identifies a category, which, itself, may belong to another category";
 
 -- --------------------------------------------------------
 

sails/roles/database/tasks/main.yml

@@ -24,14 +24,6 @@
     state: import
     target: "{{ server_path }}/{{ database_files_relative_path }}/symbolstix.sql"
 
-- name: Imports symbolstix categories
-  mysql_db:
-    login_user: "{{ database_user }}"
-    login_password: "{{ database_user_passwd }}"
-    name: "{{ database_name }}"
-    state: import
-    target: "{{ server_path }}/{{ database_files_relative_path }}/pictocat.sql"
-
 - name: Imports application essential data
   mysql_db:
     login_user: "{{ database_user }}"