Skip to content

yotta / pictogram

Go to a project
Commit af33675d by Arturo Montejo Ráez
Options

errors in database files fixed

parent 32790c89
Expand all
Inline Side-by-side
Showing with 25 additions and 67 deletions
sails/roles/database/files/pictodb-data.sql
...@@ -14,8 +14,8 @@ SET foreign_key_checks=0; ...@@ -14,8 +14,8 @@ SET foreign_key_checks=0;
-- --
-- Default supervisor (ID -1) for PCB autonomous mode -- Default supervisor (ID -1) for PCB autonomous mode
-- --
INSERT INTO `supervisor` (`id`, `name`, `surname`, `gender`, `pic`, `address`, `country`, `email`, `phone`, `lang`, `tts_engine`, `password`, `id_off`, `active`) VALUES INSERT INTO `supervisor` (`id`, `name`, `surname`, `gender`, `pic`, `address`, `country`, `email`, `phone`, `lang`, `tts_engine`, `password`, `active`) VALUES
('-1', 'none', 'none', 'M', 'defaultAvatar.jpg', NULL, NULL, '', NULL, 'es-es', NULL, '', NULL, '0'); ('-1', 'none', 'none', 'M', 'defaultAvatar.jpg', NULL, NULL, '', NULL, 'es-es', NULL, '', '0');
-- --
......
sails/roles/database/files/test-caja.sql
...@@ -6,10 +6,21 @@ SET @TRIGGER_CHECKS = FALSE; ...@@ -6,10 +6,21 @@ SET @TRIGGER_CHECKS = FALSE;
-- --
-- Dumping data for table `supervisor` -- Dumping data for table `supervisor`
-- --
LOCK TABLES `supervisor` WRITE; LOCK TABLES `supervisor` WRITE;
/*!40000 ALTER TABLE `supervisor` DISABLE KEYS */; /*!40000 ALTER TABLE `supervisor` DISABLE KEYS */;
INSERT INTO `supervisor` VALUES (-1,'none','none','M','defaultAvatar.jpg',NULL,'',NULL,'',NULL,'es-es',NULL,'',0,0,'tutor'),(23,'Comunicación Aumentativa JAén (CAJA)','','M','test_caja_dofer.jpg',NULL,'23071',NULL,'dofer@ujaen.es','+34953212888','es-es',NULL,'$2a$10$Q4jHNlC58.ptfl/5wZeHfOIvpJslJHKOFNZO3bWs4it7TifQPQnEa',1,0,'office'),(24,'Miguel Ángel','García Cumbreras','M','test_caja_miguel.jpg',NULL,'23071',NULL,'magc@ujaen.es','+34953212420','es-es',NULL,'$2a$04$XQvWUwGTvjR47ChPwd3f6ukx8Zg.7o1N4Kf6P.zqhVtQxVNArOsXi',1,0,'therapist'),(25,'Arturo','Montejo Ráez','M','test_caja_arturo.jpg',NULL,'23071',NULL,'amontejo@ujaen.es','+34953212882','es-es',NULL,'$2a$04$yoBXAMSgCVGSIr2pnuIOw.J8UCm8f2XkATu5rqsMJiEmlxBHs5.cO',1,0,'therapist'),(26,'Alfonso','Ureña López','M','test_caja_alfonso.jpg',NULL,'23071',NULL,'laurena@ujaen.es','+34953212895','es-es',NULL,'$2a$04$zVGHJFafoZa60wo1yBqF/Oi3RXV/qS2cq0/j/W3Dkf4P1ad0e7.iS',1,0,'therapist'),(27,'Jesús','Navarro Moreno','M','defaultAvatar.jpg',NULL,'23071',NULL,'jnavarro@ujaen.es','+34953211912','es-es',NULL,'$2a$04$8O3Jd5j9/nM/KC.b1a8qRevyUwWUx6XGU3Gm754Y/8PpLO2jv.i76',1,0,'therapist'),(28,'Don Fernando','Padre Fernandito','M','defaultAvatar.jpg','C/ Mayor, 13. Jaén','23071','ES','donfernando@gmail.com','+34 232 232 232','es-es',NULL,'$2a$04$DMOX/cZ4h6cNJW9VlCou7O266q4YDYuS6p0QzP.gBHd08.QnFQWD.',1,0,'tutor'),(29,'Don Arturo','Padre Arturito','M','defaultAvatar.jpg','Avda. Andalucía 1. Jaén','23071','ES','donarturo@gmail.com',NULL,'es-es',NULL,'$2a$04$V2ods9MMmOFvdLTaHJqk3ejKEYdf28gvfDhaBkOSLCFJOC02TweFK',1,0,'tutor'),(30,'Don Miguel','Padre Miguelito','F','defaultAvatar.jpg','C/ Calatrava, 13. Córdoba','23071','ES','donmiguel@gmail.com',NULL,'es-es',NULL,'$2a$04$1UCak614LKz6WpDBtOblQeqFF41tOMy6ERMnP2OuGVZffe8Yi0mJq',1,0,'tutor'),(31,'Don Alfonso','Padre Alfonsito','M','defaultAvatar.jpg','Avda. Andalucía 1. Jaén','23071','ES','donalfonso@gmail.com',NULL,'es-es',NULL,'$2a$06$UtyBV4tLlT7xSqIt8LKPBucGvZ.Wgf7RgGE0fRcjEBDwjxjHlsP3K',1,0,'tutor'),(32,'Doña Alfonsa','Madre Alfonsita','F','defaultAvatar.jpg','C/ Calatrava, 13. Córdoba','23071','ES','doñaalfonsa@gmail.com',NULL,'es-es',NULL,'$2a$04$ALDmQ1oRhRZKUEi1b0eK1ehQmSZiFkhzx48ZBwER0J4vakvlYc5VS',1,0,'tutor'),(33,'Don Jesús','Padre Jesusito','M','defaultAvatar.jpg','Avda. Andalucía 1. Jaén','23071','ES','donjesus@gmail.com',NULL,'es-es',NULL,'$2a$04$Psuu6IMPUj1sbzR.uxq3EOgX1/4dFNmccjkv76LhKp35JzpiCE.fm',1,0,'tutor'); INSERT INTO `supervisor` (`id`, `name`, `surname`, `gender`, `pic`, `address`, `postal_code`, `country`, `email`, `phone`, `lang`, `tts_engine`, `password`, `active`, `arasaac_license`, `role`) VALUES
(23,'Comunicación Aumentativa JAén (CAJA)', '', 'M', 'test_caja_dofer.jpg' ,NULL, '23071', NULL, 'dofer@ujaen.es', '+34953212888','es-es',NULL,'$2a$10$Q4jHNlC58.ptfl/5wZeHfOIvpJslJHKOFNZO3bWs4it7TifQPQnEa',1,0,'office'),
(24,'Miguel Ángel','García Cumbreras', 'M', 'test_caja_miguel.jpg', NULL, '23071', NULL, 'magc@ujaen.es', '+34953212420','es-es',NULL,'$2a$04$XQvWUwGTvjR47ChPwd3f6ukx8Zg.7o1N4Kf6P.zqhVtQxVNArOsXi',1,0,'therapist'),
(25,'Arturo','Montejo Ráez', 'M', 'test_caja_arturo.jpg', NULL, '23071', NULL,' amontejo@ujaen.es', '+34953212882','es-es',NULL,'$2a$04$yoBXAMSgCVGSIr2pnuIOw.J8UCm8f2XkATu5rqsMJiEmlxBHs5.cO',1,0,'therapist'),
(26,'Alfonso','Ureña López', 'M', 'test_caja_alfonso.jpg', NULL, '23071', NULL, 'laurena@ujaen.es', '+34953212895','es-es',NULL,'$2a$04$zVGHJFafoZa60wo1yBqF/Oi3RXV/qS2cq0/j/W3Dkf4P1ad0e7.iS',1,0,'therapist'),
(27,'Jesús','Navarro Moreno', 'M', 'defaultAvatar.jpg', NULL, '23071', NULL, 'jnavarro@ujaen.es', '+34953211912','es-es',NULL,'$2a$04$8O3Jd5j9/nM/KC.b1a8qRevyUwWUx6XGU3Gm754Y/8PpLO2jv.i76',1,0,'therapist'),
(28,'Don Fernando','Padre Fernandito','M','defaultAvatar.jpg','C/ Mayor, 13. Jaén','23071','ES','donfernando@gmail.com',
'+34 232 232 232','es-es',NULL,'$2a$04$DMOX/cZ4h6cNJW9VlCou7O266q4YDYuS6p0QzP.gBHd08.QnFQWD.',1,0,'tutor'),
(29,'Don Arturo','Padre Arturito','M','defaultAvatar.jpg','Avda. Andalucía 1. Jaén','23071','ES','donarturo@gmail.com', NULL,'es-es',NULL,'$2a$04$V2ods9MMmOFvdLTaHJqk3ejKEYdf28gvfDhaBkOSLCFJOC02TweFK',1,0,'tutor'),
(30,'Don Miguel','Padre Miguelito','F','defaultAvatar.jpg','C/ Calatrava, 13. Córdoba','23071','ES','donmiguel@gmail.com', NULL,'es-es',NULL,'$2a$04$1UCak614LKz6WpDBtOblQeqFF41tOMy6ERMnP2OuGVZffe8Yi0mJq',1,0,'tutor'),
(31,'Don Alfonso','Padre Alfonsito','M','defaultAvatar.jpg','Avda. Andalucía 1. Jaén','23071','ES','donalfonso@gmail.com', NULL,'es-es',NULL,'$2a$06$UtyBV4tLlT7xSqIt8LKPBucGvZ.Wgf7RgGE0fRcjEBDwjxjHlsP3K',1,0,'tutor'),
(32,'Doña Alfonsa','Madre Alfonsita','F','defaultAvatar.jpg','C/ Calatrava, 13. Córdoba','23071','ES','doñaalfonsa@gmail.com', NULL,'es-es',NULL,'$2a$04$ALDmQ1oRhRZKUEi1b0eK1ehQmSZiFkhzx48ZBwER0J4vakvlYc5VS',1,0,'tutor'),
(33,'Don Jesús','Padre Jesusito','M','defaultAvatar.jpg','Avda. Andalucía 1. Jaén','23071','ES','donjesus@gmail.com', NULL,'es-es',NULL,'$2a$04$Psuu6IMPUj1sbzR.uxq3EOgX1/4dFNmccjkv76LhKp35JzpiCE.fm',1,0,'tutor');
/*!40000 ALTER TABLE `supervisor` ENABLE KEYS */; /*!40000 ALTER TABLE `supervisor` ENABLE KEYS */;
UNLOCK TABLES; UNLOCK TABLES;
...@@ -19,7 +30,7 @@ UNLOCK TABLES; ...@@ -19,7 +30,7 @@ UNLOCK TABLES;
LOCK TABLES `sup_off` WRITE; LOCK TABLES `sup_off` WRITE;
/*!40000 ALTER TABLE `sup_off` DISABLE KEYS */; /*!40000 ALTER TABLE `sup_off` DISABLE KEYS */;
INSERT INTO `sup_off` VALUES (-1,NULL),(28,NULL),(29,NULL),(30,NULL),(31,NULL),(32,NULL),(33,NULL),(23,23),(24,23),(25,23),(26,23),(27,23); INSERT INTO `sup_off` VALUES (1, -1,NULL),(2,28,NULL),(3,29,NULL),(4,30,NULL),(5,31,NULL),(6,32,NULL),(7,33,NULL),(8,23,23),(9,24,23),(10,25,23),(11,26,23),(12,27,23);
/*!40000 ALTER TABLE `sup_off` ENABLE KEYS */; /*!40000 ALTER TABLE `sup_off` ENABLE KEYS */;
UNLOCK TABLES; UNLOCK TABLES;
......
sails/roles/database/files/triggers-enrolments-integrity-constraints.sql
...@@ -3,40 +3,10 @@ ...@@ -3,40 +3,10 @@
DELIMITER ;; DELIMITER ;;
DROP TRIGGER IF EXISTS TRG_NEW_STUDENT_MAXENROLMENTS;;
-- Integrity rule 1: It is not possible to enrol a higer number of student than office.max_enrolments
-- NOTE this has been disabled as accounts are now controlled by licenses
DROP TRIGGER IF EXISTS TRG_NEW_STUDENT_MAXENROLMENTS;
-- CREATE TRIGGER TRG_NEW_STUDENT_MAXENROLMENTS
-- BEFORE INSERT ON student
-- FOR EACH ROW
-- thisTrigger: BEGIN
-- DECLARE max_enr,curr_enr INT;
--
-- IF ((@TRIGGER_CHECKS = FALSE)
-- OR (@TRIGGER_BEFORE_INSERT_CHECKS = FALSE))
-- AND (USER() = 'root@localhost')
-- THEN
-- LEAVE thisTrigger;
-- END IF;
--
-- IF new.id_off IS NOT NULL THEN
-- SELECT
-- max_students, current_students INTO max_enr, curr_enr
-- FROM
-- office
-- WHERE
-- office.id=new.id_off;
--
-- IF curr_enr>=max_enr THEN
-- SIGNAL SQLSTATE '45000'
-- SET MESSAGE_TEXT = 'Maximum number of enrolments reached', MYSQL_ERRNO = 1001;
-- END IF;
-- END IF;
-- END;;
-- Integrity rule 2: office.current_enrolments updating (adding core) -- Integrity rule 2: office.current_enrolments updating (adding core)
DROP TRIGGER IF EXISTS TRG_NEW_STUDENT_UPDATE_ENROLMENTS; DROP TRIGGER IF EXISTS TRG_NEW_STUDENT_UPDATE_ENROLMENTS;;
CREATE TRIGGER TRG_NEW_STUDENT_UPDATE_ENROLMENTS CREATE TRIGGER TRG_NEW_STUDENT_UPDATE_ENROLMENTS
AFTER INSERT ON student AFTER INSERT ON student
FOR EACH ROW FOR EACH ROW
...@@ -56,7 +26,7 @@ thisTrigger: BEGIN ...@@ -56,7 +26,7 @@ thisTrigger: BEGIN
END;; END;;
DROP PROCEDURE IF EXISTS active_scene_update; DROP PROCEDURE IF EXISTS active_scene_update;;
CREATE PROCEDURE active_scene_update(IN _id_stu INTEGER) CREATE PROCEDURE active_scene_update(IN _id_stu INTEGER)
BEGIN BEGIN
DECLARE _id_scene INTEGER; DECLARE _id_scene INTEGER;
...@@ -66,7 +36,7 @@ BEGIN ...@@ -66,7 +36,7 @@ BEGIN
END;; END;;
-- Procedure to add core when new scene is created -- Procedure to add core when new scene is created
DROP PROCEDURE IF EXISTS scene_create_core ; DROP PROCEDURE IF EXISTS scene_create_core;;
CREATE PROCEDURE scene_create_core(IN id_scene INTEGER, IN id_stu INTEGER) CREATE PROCEDURE scene_create_core(IN id_scene INTEGER, IN id_stu INTEGER)
BEGIN BEGIN
...@@ -83,27 +53,6 @@ CREATE PROCEDURE scene_create_core(IN id_scene INTEGER, IN id_stu INTEGER) ...@@ -83,27 +53,6 @@ CREATE PROCEDURE scene_create_core(IN id_scene INTEGER, IN id_stu INTEGER)
END;; END;;
-- Integrity rule 3: office.current_enrolments and supervisor assigments updating. -- Integrity rule 3: office.current_enrolments and supervisor assigments updating.
DROP TRIGGER IF EXISTS TRG_MODIFY_STUDENT_ENROLMENTS; DROP TRIGGER IF EXISTS TRG_MODIFY_STUDENT_ENROLMENTS;;
-- CREATE TRIGGER TRG_MODIFY_STUDENT_ENROLMENTS DELIMITER;
-- AFTER UPDATE ON student
-- FOR EACH ROW
-- thisTrigger: BEGIN
-- IF ((@TRIGGER_CHECKS = FALSE)
-- OR (@TRIGGER_AFTER_UPDATE_CHECKS = FALSE))
-- AND (USER() = 'root@localhost')
-- THEN
-- LEAVE thisTrigger;
-- END IF;
--
-- IF NOT (old.id_off<=>new.id_off) THEN
-- IF (old.id_off IS NOT NULL) THEN
-- DELETE
-- stu_sup
-- FROM
-- stu_sup INNER JOIN supervisor ON (stu_sup.id_sup=supervisor.id)
-- WHERE
-- id_stu=new.id AND old.id_off=supervisor.id_off;
-- END IF;
-- END IF;
-- END;;
sails/src/node_modules/sails-mysql/lib/sql.js
...@@ -468,7 +468,7 @@ function sqlTypeCast(attr) { ...@@ -468,7 +468,7 @@ function sqlTypeCast(attr) {
break; break;
case 'datetime': case 'datetime':
expandedType = 'DATETIME(3)'; expandedType = 'DATETIME';
break; break;
case 'time': case 'time':
...@@ -499,8 +499,7 @@ function toSqlDate(date) { ...@@ -499,8 +499,7 @@ function toSqlDate(date) {
('00' + date.getDate()).slice(-2) + ' ' + ('00' + date.getDate()).slice(-2) + ' ' +
('00' + date.getHours()).slice(-2) + ':' + ('00' + date.getHours()).slice(-2) + ':' +
('00' + date.getMinutes()).slice(-2) + ':' + ('00' + date.getMinutes()).slice(-2) + ':' +
('00' + date.getSeconds()).slice(-2) + '.' + ('00' + date.getSeconds()).slice(-2);
('00' + date.getMilliseconds()).slice(-3);
return date; return date;
} }
......
sails/src/node_modules/sails-mysql/lib/utils.js
...@@ -242,8 +242,7 @@ utils.toSqlDate = function toSqlDate(date) { ...@@ -242,8 +242,7 @@ utils.toSqlDate = function toSqlDate(date) {
('00' + date.getDate()).slice(-2) + ' ' + ('00' + date.getDate()).slice(-2) + ' ' +
('00' + date.getHours()).slice(-2) + ':' + ('00' + date.getHours()).slice(-2) + ':' +
('00' + date.getMinutes()).slice(-2) + ':' + ('00' + date.getMinutes()).slice(-2) + ':' +
('00' + date.getSeconds()).slice(-2) + "." + ('00' + date.getSeconds()).slice(-2);
('00' + date.getMilliseconds()).slice(-3);
return date; return date;
}; };
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment