Data

- Fix creazione stored + migration
- refresh appsettings.json

MP.MONO.Data/SqlScripts/Stored/stp_paretoStatus.sql

@@ -1,7 +1,3 @@
----- stored
---DELIMITER //
---GO
-
 CREATE OR REPLACE PROCEDURE stp_paretoStatus(
 	IN machine_id INT,
 	IN dt_from DATETIME,
@@ -15,9 +11,4 @@ BEGIN
 		AND	DtRif >= dt_from 
 		AND	DtRif <= dt_to	
 	GROUP BY CodStatus;
-END;
---//
---GO
-
---DELIMITER ;
---GO
+END;

MP.MONO.Data/SqlScripts/Stored/stp_removeOldData.sql

@@ -1,14 +1,11 @@
----- stored
---DELIMITER //
-
 CREATE OR REPLACE PROCEDURE stp_removeOldData(
 	IN day_keep INT
 )
 READS SQL DATA
 BEGIN
 
-	SET		@adesso = ADDDATE(CURRENT_DATE(), INTERVAL -1 SECOND);
-	SET		@dt_min = ADDDATE(CURRENT_DATE(), INTERVAL -day_keep DAY);
+	SET		@adesso = ADDDATE(CURRENT_TIMESTAMP, INTERVAL -1 SECOND);
+	SET		@dt_min = ADDDATE(CURRENT_TIMESTAMP, INTERVAL -day_keep DAY);
 
 	START TRANSACTION;
 	
@@ -17,36 +14,36 @@ BEGIN
 		FROM		AlarmLog
 			WHERE	DtRif <= @dt_min;	
 		INSERT INTO TaskExec(DtRif, CodTask, Result)
-		SELECT	CURRENT_DATE() AS DtRif
+		SELECT	CURRENT_TIMESTAMP AS DtRif
 					,'Cleanup AlarmLog' 	AS CodTask
-					,'Deleted' + ROW_COUNT() +' rows' AS Result;
+					,CONCAT('Deleted ', CAST(ROW_COUNT() AS NCHAR), ' rows') AS Result;
 		
 		-- AlarmRec
 		DELETE
 		FROM		AlarmRec
 			WHERE	DtStart <= @dt_min;		
 		INSERT INTO TaskExec(DtRif, CodTask, Result)
-		SELECT	CURRENT_DATE() AS DtRif
+		SELECT	CURRENT_TIMESTAMP AS DtRif
 					,'Cleanup AlarmRec' 	AS CodTask
-					,'Deleted' + ROW_COUNT() +' rows' AS Result;
+					,CONCAT('Deleted ', CAST(ROW_COUNT() AS NCHAR), ' rows') AS Result;
 			
 		-- DataLog
 		DELETE
 		FROM		DataLog
 			WHERE	DtRif <= @dt_min;
 		INSERT INTO TaskExec(DtRif, CodTask, Result)
-		SELECT	CURRENT_DATE() AS DtRif
+		SELECT	CURRENT_TIMESTAMP AS DtRif
 					,'Cleanup DataLog' 	AS CodTask
-					,'Deleted' + ROW_COUNT() +' rows' AS Result;
+					,CONCAT('Deleted ', CAST(ROW_COUNT() AS NCHAR), ' rows') AS Result;
 		
 		-- StatusLog
 		DELETE
 		FROM		StatusLog
 			WHERE	DtRif <= @dt_min;
 		INSERT INTO TaskExec(DtRif, CodTask, Result)
-		SELECT	CURRENT_DATE() AS DtRif
+		SELECT	CURRENT_TIMESTAMP AS DtRif
 					,'Cleanup StatusLog' 	AS CodTask
-					,'Deleted' + ROW_COUNT() +' rows' AS Result;	
+					,CONCAT('Deleted ', CAST(ROW_COUNT() AS NCHAR), ' rows') AS Result;
 	
 	
 	COMMIT;
@@ -57,6 +54,3 @@ BEGIN
 		WHERE	DtRif > @adesso;
 		
 END
---//
-
---DELIMITER ;