gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-13 21:21:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-5.0.x' into seeddms-5.1.x

Browse Source
This commit is contained in:
Uwe Steinmann 2017-06-28 15:27:50 +02:00
commit 1db5675990
3 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG
View File

@ -116,6 +116,8 @@
- update last access time only once a minute - update last access time only once a minute
- run action 'css' in view if it exists, move css code for timeline - run action 'css' in view if it exists, move css code for timeline
- show role of users in user list and substitute user list - show role of users in user list and substitute user list
- mysql sql_mode=only_full_group_by can be set without causing errors when
creating a temporary table
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
Changes in version 4.3.34 Changes in version 4.3.34

24
SeedDMS_Core/Core/inc.DBAccessPDO.php
View File

@ -373,8 +373,8 @@ class SeedDMS_Core_DatabaseAccess {
"SELECT `tblDocumentReviewLog`.`reviewID`, ". "SELECT `tblDocumentReviewLog`.`reviewID`, ".
"MAX(`tblDocumentReviewLog`.`reviewLogID`) AS `maxLogID` ". "MAX(`tblDocumentReviewLog`.`reviewLogID`) AS `maxLogID` ".
"FROM `tblDocumentReviewLog` ". "FROM `tblDocumentReviewLog` ".
"GROUP BY `tblDocumentReviewLog`.`reviewID` ". "GROUP BY `tblDocumentReviewLog`.`reviewID` "; //.
"ORDER BY `maxLogID`"; // "ORDER BY `maxLogID`";
break; break;
case 'pgsql': case 'pgsql':
$queryStr = "CREATE TEMPORARY TABLE IF NOT EXISTS `ttreviewid` (`reviewID` INTEGER, `maxLogID` INTEGER, PRIMARY KEY (`reviewID`));". $queryStr = "CREATE TEMPORARY TABLE IF NOT EXISTS `ttreviewid` (`reviewID` INTEGER, `maxLogID` INTEGER, PRIMARY KEY (`reviewID`));".
@ -389,8 +389,8 @@ class SeedDMS_Core_DatabaseAccess {
"SELECT `tblDocumentReviewLog`.`reviewID`, ". "SELECT `tblDocumentReviewLog`.`reviewID`, ".
"MAX(`tblDocumentReviewLog`.`reviewLogID`) AS `maxLogID` ". "MAX(`tblDocumentReviewLog`.`reviewLogID`) AS `maxLogID` ".
"FROM `tblDocumentReviewLog` ". "FROM `tblDocumentReviewLog` ".
"GROUP BY `tblDocumentReviewLog`.`reviewID` ". "GROUP BY `tblDocumentReviewLog`.`reviewID` "; //.
"ORDER BY `maxLogID`"; // "ORDER BY `maxLogID`";
} }
if (!$this->_ttreviewid) { if (!$this->_ttreviewid) {
if (!$this->getResult($queryStr)) if (!$this->getResult($queryStr))
@ -414,8 +414,8 @@ class SeedDMS_Core_DatabaseAccess {
"SELECT `tblDocumentApproveLog`.`approveID`, ". "SELECT `tblDocumentApproveLog`.`approveID`, ".
"MAX(`tblDocumentApproveLog`.`approveLogID`) AS `maxLogID` ". "MAX(`tblDocumentApproveLog`.`approveLogID`) AS `maxLogID` ".
"FROM `tblDocumentApproveLog` ". "FROM `tblDocumentApproveLog` ".
"GROUP BY `tblDocumentApproveLog`.`approveID` ". "GROUP BY `tblDocumentApproveLog`.`approveID` "; //.
"ORDER BY `maxLogID`"; // "ORDER BY `maxLogID`";
break; break;
case 'pgsql': case 'pgsql':
$queryStr = "CREATE TEMPORARY TABLE IF NOT EXISTS `ttapproveid` (`approveID` INTEGER, `maxLogID` INTEGER, PRIMARY KEY (`approveID`));". $queryStr = "CREATE TEMPORARY TABLE IF NOT EXISTS `ttapproveid` (`approveID` INTEGER, `maxLogID` INTEGER, PRIMARY KEY (`approveID`));".
@ -430,8 +430,8 @@ class SeedDMS_Core_DatabaseAccess {
"SELECT `tblDocumentApproveLog`.`approveID`, ". "SELECT `tblDocumentApproveLog`.`approveID`, ".
"MAX(`tblDocumentApproveLog`.`approveLogID`) AS `maxLogID` ". "MAX(`tblDocumentApproveLog`.`approveLogID`) AS `maxLogID` ".
"FROM `tblDocumentApproveLog` ". "FROM `tblDocumentApproveLog` ".
"GROUP BY `tblDocumentApproveLog`.`approveID` ". "GROUP BY `tblDocumentApproveLog`.`approveID` "; //.
"ORDER BY `maxLogID`"; // "ORDER BY `maxLogID`";
} }
if (!$this->_ttapproveid) { if (!$this->_ttapproveid) {
if (!$this->getResult($queryStr)) if (!$this->getResult($queryStr))
@ -455,8 +455,8 @@ class SeedDMS_Core_DatabaseAccess {
"SELECT `tblDocumentStatusLog`.`statusID` AS `statusID`, ". "SELECT `tblDocumentStatusLog`.`statusID` AS `statusID`, ".
"MAX(`tblDocumentStatusLog`.`statusLogID`) AS `maxLogID` ". "MAX(`tblDocumentStatusLog`.`statusLogID`) AS `maxLogID` ".
"FROM `tblDocumentStatusLog` ". "FROM `tblDocumentStatusLog` ".
"GROUP BY `tblDocumentStatusLog`.`statusID` ". "GROUP BY `tblDocumentStatusLog`.`statusID` "; //.
"ORDER BY `maxLogID`"; // "ORDER BY `maxLogID`";
break; break;
case 'pgsql': case 'pgsql':
$queryStr = "CREATE TEMPORARY TABLE IF NOT EXISTS `ttstatid` (`statusID` INTEGER, `maxLogID` INTEGER, PRIMARY KEY (`statusID`));". $queryStr = "CREATE TEMPORARY TABLE IF NOT EXISTS `ttstatid` (`statusID` INTEGER, `maxLogID` INTEGER, PRIMARY KEY (`statusID`));".
@ -471,8 +471,8 @@ class SeedDMS_Core_DatabaseAccess {
"SELECT `tblDocumentStatusLog`.`statusID`, ". "SELECT `tblDocumentStatusLog`.`statusID`, ".
"MAX(`tblDocumentStatusLog`.`statusLogID`) AS `maxLogID` ". "MAX(`tblDocumentStatusLog`.`statusLogID`) AS `maxLogID` ".
"FROM `tblDocumentStatusLog` ". "FROM `tblDocumentStatusLog` ".
"GROUP BY `tblDocumentStatusLog`.`statusID` ". "GROUP BY `tblDocumentStatusLog`.`statusID` "; //.
"ORDER BY `maxLogID`"; // "ORDER BY `maxLogID`";
} }
if (!$this->_ttstatid) { if (!$this->_ttstatid) {
if (!$this->getResult($queryStr)) if (!$this->getResult($queryStr))

1
SeedDMS_Core/package.xml
View File

@ -1201,6 +1201,7 @@ SeedDMS_Core_DMS::getDuplicateDocumentContent() returns complete document
</stability> </stability>
<license uri="http://opensource.org/licenses/gpl-license">GPL License</license> <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
<notes> <notes>
do not sort some temporary tables anymore, because it causes an error in mysql if sql_mode=only_full_group_by is set
</notes> </notes>
</release> </release>
<release> <release>