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

This commit is contained in:
Uwe Steinmann 2017-07-17 17:59:56 +02:00
commit a8a939cb3d
3 changed files with 8 additions and 2 deletions

View File

@ -116,6 +116,11 @@
- add .xml to online file types by default - add .xml to online file types by default
- add home folder for users - add home folder for users
--------------------------------------------------------------------------------
Changes in version 4.3.36
--------------------------------------------------------------------------------
- fix sql statement for creating temp. tables (sqlite)
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
Changes in version 4.3.35 Changes in version 4.3.35
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------

View File

@ -370,7 +370,7 @@ class SeedDMS_Core_DatabaseAccess {
switch($this->_driver) { switch($this->_driver) {
case 'sqlite': case 'sqlite':
$queryStr = "CREATE TEMPORARY TABLE IF NOT EXISTS `ttreviewid` AS ". $queryStr = "CREATE TEMPORARY TABLE IF NOT EXISTS `ttreviewid` AS ".
"SELECT `tblDocumentReviewLog`.`reviewID`, ". "SELECT `tblDocumentReviewLog`.`reviewID` AS `reviewID`, ".
"MAX(`tblDocumentReviewLog`.`reviewLogID`) AS `maxLogID` ". "MAX(`tblDocumentReviewLog`.`reviewLogID`) AS `maxLogID` ".
"FROM `tblDocumentReviewLog` ". "FROM `tblDocumentReviewLog` ".
"GROUP BY `tblDocumentReviewLog`.`reviewID` "; //. "GROUP BY `tblDocumentReviewLog`.`reviewID` "; //.
@ -411,7 +411,7 @@ class SeedDMS_Core_DatabaseAccess {
switch($this->_driver) { switch($this->_driver) {
case 'sqlite': case 'sqlite':
$queryStr = "CREATE TEMPORARY TABLE IF NOT EXISTS `ttapproveid` AS ". $queryStr = "CREATE TEMPORARY TABLE IF NOT EXISTS `ttapproveid` AS ".
"SELECT `tblDocumentApproveLog`.`approveID`, ". "SELECT `tblDocumentApproveLog`.`approveID` AS `approveID`, ".
"MAX(`tblDocumentApproveLog`.`approveLogID`) AS `maxLogID` ". "MAX(`tblDocumentApproveLog`.`approveLogID`) AS `maxLogID` ".
"FROM `tblDocumentApproveLog` ". "FROM `tblDocumentApproveLog` ".
"GROUP BY `tblDocumentApproveLog`.`approveID` "; //. "GROUP BY `tblDocumentApproveLog`.`approveID` "; //.

View File

@ -1210,6 +1210,7 @@ do not sort some temporary tables anymore, because it causes an error in mysql i
</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>
- fix sql statement for creating temp. tables (sqlite)
</notes> </notes>
</release> </release>
<release> <release>