Changeset 879 for trunk/Modules/Export

Timestamp:

Apr 7, 2020, 9:53:00 PM (5 years ago)

Author:

chronos

Message:

• Fixed: Wrong Setup tables initialization.
• Fixed: Export SQL query compatible with newer SQL server.

File:

• trunk/Modules/Export/Export.php (modified) (2 diffs)

trunk/Modules/Export/Export.php

@@ -94 +94 @@
 
 
-    $Query = 'SELECT * FROM (SELECT '.$Columns.' T.`ID`,T.`Language`,T.`User`,T.`Entry`,T.`VersionEnd`,T.`VersionStart`, `User`.`Name` AS `UserName` FROM `'.$Group['TablePrefix'].'` AS `T`'.
+    $Query = 'SELECT * FROM (SELECT ANY_VALUE(`TT`.`ID`) AS `TTID` FROM (SELECT '.$Columns.' T.`ID`,T.`Language`,T.`User`,T.`Entry`,T.`VersionEnd`,T.`VersionStart`, `User`.`Name` AS `UserName` FROM `'.$Group['TablePrefix'].'` AS `T`'.
     ' JOIN `ExportUser` ON (`ExportUser`.`User`=`T`.`User`) AND (`ExportUser`.`Export`='.$this->Id.') '.
     ' JOIN `User` ON `User`.`ID`=`T`.`User`'.
     ' JOIN `ExportLanguage` ON (`ExportLanguage`.`Export`='.$this->Id.')'.
     ' WHERE (`Complete` = 1) AND (`VersionStart` <= '.$ExportVersion.') AND (`VersionEnd` >= '.$ExportVersion.')'.
-    ' ORDER BY `ExportLanguage`.`Sequence`, `ExportUser`.`Sequence`) AS `TT` GROUP BY `TT`.`Entry`';
+    ' ORDER BY `ExportLanguage`.`Sequence`, `ExportUser`.`Sequence`) AS `TT` GROUP BY `TT`.`Entry`) AS `TK`'.
+    ' LEFT JOIN `'.$Group['TablePrefix'].'` AS `TJ` ON `TJ`.`ID` = `TK`.`TTID` ';
 
     // Build columns for english texts
@@ -279 +280 @@
   }
 
+  // Export only if translate have same varible %
   function HaveVarible($String1, $String2, $StartChar = '$')
   {
-          //Export only if translate have same varible %
-
     if (strpos($String1,$StartChar) !== false) {