Merge pull request 'Hotfix-create-proc-to-kill-connection' (!2385) from Hotfix-create-proc-to-kill-connection into master

Reviewed-on: #2385
Reviewed-by: Juan Ferrer <juan@verdnatura.es>

db/routines/util/procedures/connection_kill.sql

@@ -0,0 +1,13 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `util`.`connection_kill`(
+	vConnectionId BIGINT
+)
+BEGIN
+/**
+ * Kill a connection
+ *
+ * @param vConnectionId
+ */
+	KILL vConnectionId;
+END$$
+DELIMITER ;

db/routines/vn/procedures/collection_assign.sql

@@ -30,10 +30,7 @@ BEGIN
 	-- Si hay colecciones sin terminar, sale del proceso
 	CALL collection_get(vUserFk);
 
-	SELECT (pc.maxNotReadyCollections - COUNT(*)) <= 0,
+	SELECT (pc.maxNotReadyCollections - COUNT(*)) <= 0 INTO vHasTooMuchCollections
-			pc.collectionAssignLockname
-		INTO vHasTooMuchCollections,
-			 vLockName
 		FROM productionConfig pc
 			LEFT JOIN tCollection ON TRUE;
 
@@ -49,7 +46,7 @@ BEGIN
 		WHERE workerFk = vUserFk;
 
 	SET vLockName = CONCAT_WS('/',
-		vLockName,
+		'collection_assign',
 		vWarehouseFk,
 		vItemPackingTypeFk
 	);

db/routines/vn/procedures/collection_new.sql

@@ -63,8 +63,7 @@ BEGIN
 			o.numberOfWagons,
 			o.trainFk,
 			o.linesLimit,
-			o.volumeLimit,
+			o.volumeLimit
-			pc.collectionNewLockname
 		INTO vMaxTickets,
 				vHasUniqueCollectionTime,
 				vWorkerCode,
@@ -74,15 +73,14 @@ BEGIN
 				vWagons,
 				vTrainFk,
 				vLinesLimit,
-				vVolumeLimit,
+				vVolumeLimit
-				vLockName
 		FROM productionConfig pc
 			JOIN worker w ON w.id = vUserFk
 			JOIN state st ON st.`code` = 'ON_PREPARATION'
 			JOIN operator o ON o.workerFk = vUserFk;
 
 	SET vLockName = CONCAT_WS('/',
-		vLockName,
+		'collection_new',
 		vWarehouseFk,
 		vItemPackingTypeFk
 	);

db/versions/11021-bronzeErica/00-firstScript.sql

@@ -0,0 +1,13 @@
+
+	ALTER TABLE vn.productionConfig
+		DROP COLUMN IF EXISTS collectionNewLockname,
+		DROP COLUMN IF EXISTS collectionAssignLockname;
+
+	DELIMITER $$
+	CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `util`.`connection_kill`()
+	BEGIN
+
+	END$$
+	DELIMITER ;
+
+	GRANT EXECUTE ON PROCEDURE util.connection_kill TO 'developer';