composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-24 02:58:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/support/2.7.0' into support/2.7

Browse Source 
# Conflicts:
#	datamodels/2.x/itop-attachments/renderers.itop-attachments.php
This commit is contained in:
Pierre Goiffon
2020-04-29 09:00:10 +02:00
parent a182a37139 96d888fcf3
commit 9b065ffb0a
7 changed files with 63 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
test/OQL/OQLToSQLTest.php
View File

@@ -341,6 +341,7 @@ class OQLToSQLTest extends ItopDataTestCase
);
$aData = array(
"SELECT UNION 5.6" => array("SELECT `Organization` AS `Organization` WHERE ((`Organization`.`status` != 'inactive') AND (`Organization`.`id` = '1')) UNION SELECT `Organization` AS `Organization` WHERE ((`Organization`.`id` = '1') AND (`Organization`.`id` = '1'))", array(), array(), array(), null, null, 3, 0),
"SELECT WebServer 150" => array("SELECT `WebServer` FROM WebServer AS `WebServer` WHERE 1", array(), array(), $aAttToLoad150, null, null, 3, 0),
"SELECT WebServer 151" => array("SELECT `WebServer` FROM WebServer AS `WebServer` WHERE 1", array(), array(), array(), null, null, 3, 0),
"SELECT L JOIN 176" => array("SELECT `L` FROM Location AS `L` JOIN Person AS `P` ON `P`.location_id = `L`.id WHERE 1", unserialize('a:1:{s:14:"L.friendlyname";b:1;}'), array(), null, null, 3, 0),