From fad43ba87472d3b95fc401a7657b647f27696d81 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 10 Jun 2020 10:46:41 +0200
Subject: [PATCH] add field 'core' to table tblVersion

---
 SeedDMS_Core/Core/inc.ClassDMS.php       |  6 +++---
 install/create_tables-innodb.sql         |  3 ++-
 install/create_tables-postgres.sql       |  3 ++-
 install/create_tables-sqlite3.sql        |  3 ++-
 install/update-6.1.0/update-postgres.sql |  4 +++-
 install/update-6.1.0/update-sqlite3.sql  | 16 +++++++++++++++-
 install/update-6.1.0/update.sql          |  4 +++-
 7 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index 343093bb4..417402191 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -574,12 +574,12 @@ class SeedDMS_Core_DMS {
 	 *
 	 * @return array|bool
 	 */
-	function getDBVersion() { /* {{{ */
+	function getDBVersion($module='core') { /* {{{ */
 		$tbllist = $this->db->TableList();
 		$tbllist = explode(',',strtolower(join(',',$tbllist)));
 		if(!array_search('tblversion', $tbllist))
 			return false;
-		$queryStr = "SELECT * FROM `tblVersion` order by `major`,`minor`,`subminor` limit 1";
+		$queryStr = "SELECT * FROM `tblVersion` order by `major`,`minor`,`subminor` WHERE `module`=".$this->db->qstr($module)." limit 1";
 		$resArr = $this->db->getResultArray($queryStr);
 		if (is_bool($resArr) && $resArr == false)
 			return false;
@@ -601,7 +601,7 @@ class SeedDMS_Core_DMS {
 		$tbllist = explode(',',strtolower(join(',',$tbllist)));
 		if(!array_search('tblversion', $tbllist))
 			return true;
-		$queryStr = "SELECT * FROM `tblVersion` order by `major`,`minor`,`subminor` limit 1";
+		$queryStr = "SELECT * FROM `tblVersion` order by `major`,`minor`,`subminor` WHERE `module`='core' limit 1";
 		$resArr = $this->db->getResultArray($queryStr);
 		if (is_bool($resArr) && $resArr == false)
 			return false;
diff --git a/install/create_tables-innodb.sql b/install/create_tables-innodb.sql
index ec7f4031a..ed10a7342 100644
--- a/install/create_tables-innodb.sql
+++ b/install/create_tables-innodb.sql
@@ -997,7 +997,8 @@ CREATE TABLE `tblVersion` (
   `date` datetime NOT NULL,
   `major` smallint(6) DEFAULT NULL,
   `minor` smallint(6) DEFAULT NULL,
-  `subminor` smallint(6) DEFAULT NULL
+  `subminor` smallint(6) DEFAULT NULL,
+  `module` varchar(255) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 -- --------------------------------------------------------
diff --git a/install/create_tables-postgres.sql b/install/create_tables-postgres.sql
index c068d2a27..fa58de924 100644
--- a/install/create_tables-postgres.sql
+++ b/install/create_tables-postgres.sql
@@ -811,7 +811,8 @@ CREATE TABLE "tblVersion" (
   "date" TIMESTAMP NOT NULL,
   "major" INTEGER,
   "minor" INTEGER,
-  "subminor" INTEGER
+  "subminor" INTEGER,
+  "module" varchar(255) DEFAULT NULL,
 ) ;
 
 -- --------------------------------------------------------
diff --git a/install/create_tables-sqlite3.sql b/install/create_tables-sqlite3.sql
index ea7aca40b..17fc50e3a 100644
--- a/install/create_tables-sqlite3.sql
+++ b/install/create_tables-sqlite3.sql
@@ -820,7 +820,8 @@ CREATE TABLE `tblVersion` (
   `date` TEXT NOT NULL,
   `major` INTEGER,
   `minor` INTEGER,
-  `subminor` INTEGER
+  `subminor` INTEGER,
+	`module` varchar(255)
 ) ;
 
 -- --------------------------------------------------------
diff --git a/install/update-6.1.0/update-postgres.sql b/install/update-6.1.0/update-postgres.sql
index 08dffefe8..24f2fee77 100644
--- a/install/update-6.1.0/update-postgres.sql
+++ b/install/update-6.1.0/update-postgres.sql
@@ -1,5 +1,7 @@
 START TRANSACTION;
 
+ALTER TABLE "tblVersion" ADD COLUMN "module" TYPE varchar(255) DEFAULT NULL;
+
 ALTER TABLE "tblUsers" ALTER COLUMN "pwd" TYPE varchar(255) DEFAULT NULL;
 
 ALTER TABLE "tblUserPasswordHistory" ALTER COLUMN "pwd" varchar(255) DEFAULT NULL;
@@ -32,6 +34,6 @@ CREATE TABLE "tblFolderAttributeDefinitionGroup" (
   UNIQUE ("folder", "attrgrp")
 );
 
-UPDATE "tblVersion" set "major"=6, "minor"=1, "subminor"=0;
+UPDATE "tblVersion" set "major"=6, "minor"=1, "subminor"=0, "module"='core';
 
 COMMIT;
diff --git a/install/update-6.1.0/update-sqlite3.sql b/install/update-6.1.0/update-sqlite3.sql
index 0b2fad2a3..0ba1c8ee8 100644
--- a/install/update-6.1.0/update-sqlite3.sql
+++ b/install/update-6.1.0/update-sqlite3.sql
@@ -1,5 +1,19 @@
 BEGIN;
 
+CREATE TABLE `new_tblVersion` (
+  `date` TEXT NOT NULL,
+  `major` INTEGER,
+  `minor` INTEGER,
+  `subminor` INTEGER,
+	`module` varchar(255)
+) ;
+
+INSERT INTO `new_tblVersion` SELECT * FROM `tblVersion`;
+
+DROP TABLE `tblVersion`;
+
+ALTER TABLE `new_tblVersion` RENAME TO `tblVersion`;
+
 CREATE TABLE `new_tblUsers` (
   `id` INTEGER PRIMARY KEY AUTOINCREMENT,
   `login` varchar(50) default NULL,
@@ -76,6 +90,6 @@ CREATE TABLE `tblFolderAttributeDefinitionGroup` (
   UNIQUE(`folder`, `attrgrp`)
 );
 
-UPDATE tblVersion set major=6, minor=1, subminor=0;
+UPDATE `tblVersion` set `major`=6, `minor`=1, `subminor`=0, `module`='core';
 
 COMMIT;
diff --git a/install/update-6.1.0/update.sql b/install/update-6.1.0/update.sql
index 2ad3a2e1a..2d4338d9d 100644
--- a/install/update-6.1.0/update.sql
+++ b/install/update-6.1.0/update.sql
@@ -1,5 +1,7 @@
 START TRANSACTION;
 
+ALTER TABLE `tblVersion` ADD COLUMN `module` varchar(255) DEFAULT NULL;
+
 ALTER TABLE `tblUsers` CHANGE `pwd` `pwd` varchar(255) DEFAULT NULL;
 
 ALTER TABLE `tblUserPasswordHistory` CHANGE `pwd` `pwd` varchar(255) DEFAULT NULL;
@@ -37,7 +39,7 @@ CREATE TABLE `tblFolderAttributeDefinitionGroup` (
 	CONSTRAINT `tblFolderAttributeDefinitionGroup_attrgrp` FOREIGN KEY (`attrgrp`) REFERENCES `tblAttributeDefinitionGroups` (`id`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
-UPDATE tblVersion set major=6, minor=1, subminor=0;
+UPDATE `tblVersion` set `major`=6, `minor`=1, `subminor`=0, `module`='core';
 
 COMMIT;