Targoman · kambizzandi · Mar 7, 2022 · Feb 24, 2022 · Mar 4, 2022 · Mar 4, 2022
diff --git a/.gitmodules b/.gitmodules
@@ -25,3 +25,6 @@
 [submodule "3rdParty/QFieldValidator"]
 	path = 3rdParty/QFieldValidator
 	url = https://github.com/Targoman/QFieldValidator.git
+[submodule "3rdParty/TargomanCommon"]
+	path = 3rdParty/TargomanCommon
+	url = https://github.com/Targoman/TargomanCommon.git
diff --git a/3rdParty/TargomanCommon b/3rdParty/TargomanCommon
diff --git a/App/App.pro b/App/App.pro
@@ -43,11 +43,9 @@ SOURCES += \
     Server/main.cpp
 
 OTHER_FILES += \
-    dumpDBSchema.sh \
-    Schemas/Common.my.sql \
-    Schemas/CommonFuncs.my.sql \
-    Schemas/I18N.my.sql \
-    ../conf/api.conf
+    ../conf/api.conf \
+    migrations/db/* \
+    migrations/local/*
 
 # +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-#
 LIBS += -lTargomanAPIInterface

diff --git a/App/dumpDBSchema.sh b/App/dumpDBSchema.sh
diff --git a/Modules/Account/Account.pro b/Modules/Account/Account.pro
@@ -10,3 +10,7 @@ include($$QBUILD_PATH/templates/projectConfigs.pri)
 
 addSubdirs(moduleSrc, Dependencies)
 addSubdirs(functionalTest, Dependencies)
+
+OTHER_FILES += \
+    migrations/db/* \
+    migrations/local/*
diff --git a/Modules/Account/moduleSrc/ORM/Schema.my.sql → ...t/migrations/db/m20220216_114615_init.sql b/Modules/Account/moduleSrc/ORM/Schema.my.sql → ...t/migrations/db/m20220216_114615_init.sql
diff --git a/Modules/Account/moduleSrc/ORM/Data.my.sql → ...rations/db/m20220306_092403_init_data.sql b/Modules/Account/moduleSrc/ORM/Data.my.sql → ...rations/db/m20220306_092403_init_data.sql
@@ -1,3 +1,5 @@
+/* Migration File: m20220306_092403_init_data.sql */
+
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET NAMES utf8 */;
 /*!50503 SET NAMES utf8mb4 */;

diff --git a/Modules/Account/moduleSrc/dumpDBSchema.sh b/Modules/Account/moduleSrc/dumpDBSchema.sh
diff --git a/Modules/Account/moduleSrc/moduleSrc.pro b/Modules/Account/moduleSrc/moduleSrc.pro
@@ -58,12 +58,9 @@ SOURCES += \
     Payment/Gateways/gtwMellatBank.cpp \
     Payment/Gateways/gtwZibal.cpp
 
-OTHER_FILES += \
-    dumpDBSchema.sh \
-    ORM/Schema.my.sql
+OTHER_FILES +=
 
 ################################################################################
 include($$QBUILD_PATH/templates/moduleConfigs.pri)
 
-DISTFILES += \
-    ORM/Data.my.sql
+DISTFILES +=
diff --git a/Modules/Advert/Advert.pro b/Modules/Advert/Advert.pro
@@ -10,3 +10,7 @@ include($$QBUILD_PATH/templates/projectConfigs.pri)
 
 addSubdirs(moduleSrc, Dependencies)
 addSubdirs(functionalTest, Dependencies)
+
+OTHER_FILES += \
+    migrations/db/* \
+    migrations/local/*
diff --git a/Modules/Advert/moduleSrc/ORM/Schema.my.sql → ...t/migrations/db/m20220306_094420_init.sql b/Modules/Advert/moduleSrc/ORM/Schema.my.sql → ...t/migrations/db/m20220306_094420_init.sql
diff --git a/Modules/Advert/moduleSrc/dumpDBSchema.sh b/Modules/Advert/moduleSrc/dumpDBSchema.sh
diff --git a/Modules/Advert/moduleSrc/moduleSrc.pro b/Modules/Advert/moduleSrc/moduleSrc.pro
@@ -27,9 +27,7 @@ SOURCES += \
     ORM/Accounting.cpp \
     ORM/Locations.cpp \
 
-OTHER_FILES += \
-    dumpDBSchema.sh \
-    ORM/Schema.my.sql \
+OTHER_FILES +=
 
 ################################################################################
 include($$QBUILD_PATH/templates/moduleConfigs.pri)
diff --git a/Modules/Common/Common.pro b/Modules/Common/Common.pro
@@ -10,3 +10,7 @@ include($$QBUILD_PATH/templates/projectConfigs.pri)
 
 addSubdirs(moduleSrc, Dependencies)
 addSubdirs(functionalTest, Dependencies)
+
+OTHER_FILES += \
+    migrations/db/* \
+    migrations/local/*
diff --git a/App/Schemas/Common.my.sql → ...n/migrations/db/m20220306_094432_init.sql b/App/Schemas/Common.my.sql → ...n/migrations/db/m20220306_094432_init.sql
@@ -1,8 +1,9 @@
+/* Migration File: m20220306_094432_init.sql */
 
 /*!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 utf8mb4 */;
+/*!50503 SET NAMES utf8mb4 */;
 /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
 /*!40103 SET TIME_ZONE='+00:00' */;
 /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
@@ -15,7 +16,7 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `Common` /*!40100 DEFAULT CHARACTER SET
 USE `Common`;
 DROP TABLE IF EXISTS `tblAlertTemplates`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `tblAlertTemplates` (
   `altlID` int unsigned NOT NULL AUTO_INCREMENT,
   `altCode` varchar(50) NOT NULL,
@@ -32,7 +33,7 @@ CREATE TABLE `tblAlertTemplates` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 DROP TABLE IF EXISTS `tblAlerts`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `tblAlerts` (
   `alrID` bigint unsigned NOT NULL AUTO_INCREMENT,
   `alrType` char(1) NOT NULL DEFAULT 'I' COMMENT 'I: Informational, C: Critical, W:Warning',
@@ -56,7 +57,7 @@ CREATE TABLE `tblAlerts` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 DROP TABLE IF EXISTS `tblDBG`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `tblDBG` (
   `dbgID` bigint unsigned NOT NULL AUTO_INCREMENT,
   `dbgFrom` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
@@ -69,7 +70,7 @@ CREATE TABLE `tblDBG` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 DROP TABLE IF EXISTS `tblDownloadRequests`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `tblDownloadRequests` (
   `dwrID` int unsigned NOT NULL AUTO_INCREMENT,
   `dwr_ssnID` bigint unsigned NOT NULL,
@@ -95,8 +96,8 @@ CREATE TABLE `tblDownloadRequests` (
 DELIMITER ;;
 CREATE FUNCTION `fnCreateRandomMD5`() RETURNS char(32) CHARSET utf8mb4
     NO SQL
-BEGIN
-  RETURN MD5(CONCAT(RAND(), UUID()));
+BEGIN
+  RETURN MD5(CONCAT(RAND(), UUID()));
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -113,16 +114,16 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-CREATE PROCEDURE `spLogDebug`(
-	IN `iFrom` VARCHAR(50),
-	IN `iInfo` VARCHAR(500)
+CREATE PROCEDURE `spLogDebug`(
+    IN `iFrom` VARCHAR(50),
+    IN `iInfo` VARCHAR(500)
 )
-BEGIN
-    INSERT
-      INTO Common.tblDBG 
-       SET tblDBG.dbgFrom = iFrom
-         , tblDBG.dbgInfo = iInfo
-    ; 
+BEGIN
+    INSERT
+      INTO Common.tblDBG
+       SET tblDBG.dbgFrom = iFrom
+         , tblDBG.dbgInfo = iInfo
+    ;
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -138,4 +139,3 @@ DELIMITER ;
 /*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-
diff --git a/Modules/Common/moduleSrc/ORM/Schema.my.sql b/Modules/Common/moduleSrc/ORM/Schema.my.sql
diff --git a/Modules/Common/moduleSrc/dumpDBSchema.sh b/Modules/Common/moduleSrc/dumpDBSchema.sh
diff --git a/Modules/Common/moduleSrc/moduleSrc.pro b/Modules/Common/moduleSrc/moduleSrc.pro
@@ -17,9 +17,7 @@ SOURCES += \
     Common.cpp \
     ORM/Alerts.cpp \
 
-OTHER_FILES += \
-    dumpDBSchema.sh \
-    ORM/Schema.my.sql \
+OTHER_FILES +=
 
 ################################################################################
 include($$QBUILD_PATH/templates/moduleConfigs.pri)