diff --git a/test/core/OQLTest.php b/test/core/OQLTest.php
index 51cd5dd2a..6d1861967 100644
--- a/test/core/OQLTest.php
+++ b/test/core/OQLTest.php
@@ -19,122 +19,251 @@ use Combodo\iTop\Test\UnitTest\ItopDataTestCase;
*/
class OQLTest extends ItopDataTestCase
{
- /**
- * @dataProvider GoodQueryProvider
- *
- * @param $sQuery
- *
- * @throws \OQLException
- */
- public function testGoodQuery($sQuery)
- {
- $this->debug($sQuery);
- $oOql = new \OqlInterpreter($sQuery);
- $oQuery = $oOql->ParseQuery();
- static::assertInstanceOf('OqlQuery', $oQuery);
- }
+ /**
+ * @dataProvider GoodQueryProvider
+ *
+ * @param $sQuery
+ *
+ * @throws \OQLException
+ */
+ public function testGoodQueryParser($sQuery)
+ {
+ $this->debug($sQuery);
+ $oOql = new \OqlInterpreter($sQuery);
+ $oQuery = $oOql->ParseQuery();
+ static::assertInstanceOf('OqlQuery', $oQuery);
+ }
- public function GoodQueryProvider()
- {
- return array(
- array('SELECT toto'),
- array('SELECT toto WHERE toto.a = 1'),
- array('SELECT toto WHERE toto.a = -1'),
- array('SELECT toto WHERE toto.a = (1-1)'),
- array('SELECT toto WHERE toto.a = (-1+3)'),
- array('SELECT toto WHERE toto.a = (3+-1)'),
- array('SELECT toto WHERE toto.a = (3--1)'),
- array('SELECT toto WHERE toto.a = 0xC'),
- array('SELECT toto WHERE toto.a = \'AXDVFS0xCZ32\''),
- array('SELECT toto WHERE toto.a = :myparameter'),
- array('SELECT toto WHERE toto.a IN (:param1)'),
- array('SELECT toto WHERE toto.a IN (:param1, :param2)'),
- array('SELECT toto WHERE toto.a=1'),
- array('SELECT toto WHERE toto.a = "1"'),
- array('SELECT toto WHERE toto.a & 1'),
- array('SELECT toto WHERE toto.a | 1'),
- array('SELECT toto WHERE toto.a ^ 1'),
- array('SELECT toto WHERE toto.a << 1'),
- array('SELECT toto WHERE toto.a >> 1'),
- array('SELECT toto WHERE toto.a NOT LIKE "That\'s it"'),
- array('SELECT toto WHERE toto.a NOT LIKE "That\'s \\"it\\""'),
- array('SELECT toto WHERE toto.a NOT LIKE \'That"s it\''),
- array('SELECT toto WHERE toto.a NOT LIKE \'That\\\'s it\''),
- array('SELECT toto WHERE toto.a NOT LIKE "blah \\\\ truc"'),
- array('SELECT toto WHERE toto.a NOT LIKE \'blah \\\\ truc\''),
- array('SELECT toto WHERE toto.a NOT LIKE "\\\\"'),
- array('SELECT toto WHERE toto.a NOT LIKE "\\""'),
- array('SELECT toto WHERE toto.a NOT LIKE "\\"\\\\"'),
- array('SELECT toto WHERE toto.a NOT LIKE "\\\\\\""'),
- array('SELECT toto WHERE toto.a NOT LIKE ""'),
- array('SELECT toto WHERE toto.a NOT LIKE "blah" AND toto.b LIKE "foo"'),
- array('SELECT toto WHERE toto.a = 1 AND toto.b LIKE "x" AND toto.f >= 12345'),
- array('SELECT Device JOIN Site ON Device.site = Site.id'),
- array('SELECT Device JOIN Site ON Device.site = Site.id JOIN Country ON Site.location = Country.id'),
- array('SELECT UserRightsMatrixClassGrant WHERE UserRightsMatrixClassGrant.class = \'lnkContactRealObject\' AND UserRightsMatrixClassGrant.action = \'modify\' AND UserRightsMatrixClassGrant.login = \'Denis\''),
- array('SELECT A WHERE A.col1 = \'lit1\' AND A.col2 = \'lit2\' AND A.col3 = \'lit3\''),
- array('SELECT A JOIN B ON A.myB = B.id WHERE (A.col1 = 123 AND B.col1 = \'aa\') OR (A.col3 = \'zzz\' AND B.col4 > 100)'),
- array('SELECT A JOIN B ON A.myB = B.id WHERE (A.col1 = B.col2 AND B.col1 = A.col2) OR (A.col3 = \'\' AND B.col4 > 100)'),
- array('SELECT A JOIN B ON A.myB = B.id WHERE A.col1 + B.col2 * B.col1 = A.col2'),
- array('SELECT A JOIN B ON A.myB = B.id WHERE A.col1 + (B.col2 * B.col1) = A.col2'),
- array('SELECT A JOIN B ON A.myB = B.id WHERE (A.col1 + B.col2) * B.col1 = A.col2'),
- array('SELECT A JOIN B ON A.myB = B.id WHERE (A.col1 & B.col2) = A.col2'),
- array('SELECT Device AS D_ JOIN Site AS S_ ON D_.site = S_.id WHERE S_.country = "Francia"'),
- array('SELECT A FROM A'),
- array('SELECT A JOIN B ON A.myB = B.id WHERE A.col1 = 2'),
- array('SELECT A FROM A JOIN B ON A.myB = B.id WHERE A.col1 = 2'),
- array('SELECT B FROM A JOIN B ON A.myB = B.id WHERE A.col1 = 2'),
- array('SELECT A,B FROM A JOIN B ON A.myB = B.id WHERE A.col1 = 2'),
- array('SELECT A, B FROM A JOIN B ON A.myB = B.id WHERE A.col1 = 2'),
- array('SELECT B,A FROM A JOIN B ON A.myB = B.id WHERE A.col1 = 2'),
- array('SELECT A, B,C FROM A JOIN B ON A.myB = B.id'),
- array('SELECT C FROM A JOIN B ON A.myB = B.id WHERE A.col1 = 2'),
- array('SELECT A JOIN B ON A.myB BELOW B.id WHERE A.col1 = 2'),
- array('SELECT A JOIN B ON B.myA BELOW A.id WHERE A.col1 = 2'),
- array('SELECT A JOIN B ON A.myB = B.id JOIN C ON C.parent_id BELOW B.id WHERE A.col1 = 2 AND B.id = 3'),
- array('SELECT A JOIN B ON A.myB = B.id JOIN C ON C.parent_id BELOW STRICT B.id WHERE A.col1 = 2 AND B.id = 3'),
- array('SELECT A JOIN B ON A.myB = B.id JOIN C ON C.parent_id NOT BELOW B.id WHERE A.col1 = 2 AND B.id = 3'),
- array('SELECT A JOIN B ON A.myB = B.id JOIN C ON C.parent_id NOT BELOW STRICT B.id WHERE A.col1 = 2 AND B.id = 3'),
- array('SELECT A UNION SELECT B'),
- array('SELECT A WHERE A.b = "sdf" UNION SELECT B WHERE B.a = "sfde"'),
- array('SELECT A UNION SELECT B UNION SELECT C'),
- array('SELECT A UNION SELECT B UNION SELECT C UNION SELECT D'),
- array('SELECT A JOIN B ON A.myB = B.id JOIN C ON C.parent_id NOT BELOW B.id WHERE A.col1 = 2 AND B.id = 3 UNION SELECT Device JOIN Site ON Device.site = Site.id JOIN Country ON Site.location = Country.id'),
- array('SELECT Ticket WHERE tagfield MATCHES \'salad\''),
- );
- }
+ public function GoodQueryProvider()
+ {
+ return array(
+ array('SELECT toto'),
+ array('SELECT toto WHERE toto.a = 1'),
+ array('SELECT toto WHERE toto.a = -1'),
+ array('SELECT toto WHERE toto.a = (1-1)'),
+ array('SELECT toto WHERE toto.a = (-1+3)'),
+ array('SELECT toto WHERE toto.a = (3+-1)'),
+ array('SELECT toto WHERE toto.a = (3--1)'),
+ array('SELECT toto WHERE toto.a = 0xC'),
+ array('SELECT toto WHERE toto.a = \'AXDVFS0xCZ32\''),
+ array('SELECT toto WHERE toto.a = :myparameter'),
+ array('SELECT toto WHERE toto.a IN (:param1)'),
+ array('SELECT toto WHERE toto.a IN (:param1, :param2)'),
+ array('SELECT toto WHERE toto.a=1'),
+ array('SELECT toto WHERE toto.a = "1"'),
+ array('SELECT toto WHERE toto.a & 1'),
+ array('SELECT toto WHERE toto.a | 1'),
+ array('SELECT toto WHERE toto.a ^ 1'),
+ array('SELECT toto WHERE toto.a << 1'),
+ array('SELECT toto WHERE toto.a >> 1'),
+ array('SELECT toto WHERE toto.a NOT LIKE "That\'s it"'),
+ array('SELECT toto WHERE toto.a NOT LIKE "That\'s \\"it\\""'),
+ array('SELECT toto WHERE toto.a NOT LIKE \'That"s it\''),
+ array('SELECT toto WHERE toto.a NOT LIKE \'That\\\'s it\''),
+ array('SELECT toto WHERE toto.a NOT LIKE "blah \\\\ truc"'),
+ array('SELECT toto WHERE toto.a NOT LIKE \'blah \\\\ truc\''),
+ array('SELECT toto WHERE toto.a NOT LIKE "\\\\"'),
+ array('SELECT toto WHERE toto.a NOT LIKE "\\""'),
+ array('SELECT toto WHERE toto.a NOT LIKE "\\"\\\\"'),
+ array('SELECT toto WHERE toto.a NOT LIKE "\\\\\\""'),
+ array('SELECT toto WHERE toto.a NOT LIKE ""'),
+ array('SELECT toto WHERE toto.a NOT LIKE "blah" AND toto.b LIKE "foo"'),
+ array('SELECT toto WHERE toto.a = 1 AND toto.b LIKE "x" AND toto.f >= 12345'),
+ array('SELECT Device JOIN Site ON Device.site = Site.id'),
+ array('SELECT Device JOIN Site ON Device.site = Site.id JOIN Country ON Site.location = Country.id'),
+ array('SELECT UserRightsMatrixClassGrant WHERE UserRightsMatrixClassGrant.class = \'lnkContactRealObject\' AND UserRightsMatrixClassGrant.action = \'modify\' AND UserRightsMatrixClassGrant.login = \'Denis\''),
+ array('SELECT A WHERE A.col1 = \'lit1\' AND A.col2 = \'lit2\' AND A.col3 = \'lit3\''),
+ array('SELECT A JOIN B ON A.myB = B.id WHERE (A.col1 = 123 AND B.col1 = \'aa\') OR (A.col3 = \'zzz\' AND B.col4 > 100)'),
+ array('SELECT A JOIN B ON A.myB = B.id WHERE (A.col1 = B.col2 AND B.col1 = A.col2) OR (A.col3 = \'\' AND B.col4 > 100)'),
+ array('SELECT A JOIN B ON A.myB = B.id WHERE A.col1 + B.col2 * B.col1 = A.col2'),
+ array('SELECT A JOIN B ON A.myB = B.id WHERE A.col1 + (B.col2 * B.col1) = A.col2'),
+ array('SELECT A JOIN B ON A.myB = B.id WHERE (A.col1 + B.col2) * B.col1 = A.col2'),
+ array('SELECT A JOIN B ON A.myB = B.id WHERE (A.col1 & B.col2) = A.col2'),
+ array('SELECT Device AS D_ JOIN Site AS S_ ON D_.site = S_.id WHERE S_.country = "Francia"'),
+ array('SELECT A FROM A'),
+ array('SELECT A JOIN B ON A.myB = B.id WHERE A.col1 = 2'),
+ array('SELECT A FROM A JOIN B ON A.myB = B.id WHERE A.col1 = 2'),
+ array('SELECT B FROM A JOIN B ON A.myB = B.id WHERE A.col1 = 2'),
+ array('SELECT A,B FROM A JOIN B ON A.myB = B.id WHERE A.col1 = 2'),
+ array('SELECT A, B FROM A JOIN B ON A.myB = B.id WHERE A.col1 = 2'),
+ array('SELECT B,A FROM A JOIN B ON A.myB = B.id WHERE A.col1 = 2'),
+ array('SELECT A, B,C FROM A JOIN B ON A.myB = B.id'),
+ array('SELECT C FROM A JOIN B ON A.myB = B.id WHERE A.col1 = 2'),
+ array('SELECT A JOIN B ON A.myB BELOW B.id WHERE A.col1 = 2'),
+ array('SELECT A JOIN B ON B.myA BELOW A.id WHERE A.col1 = 2'),
+ array('SELECT A JOIN B ON A.myB = B.id JOIN C ON C.parent_id BELOW B.id WHERE A.col1 = 2 AND B.id = 3'),
+ array('SELECT A JOIN B ON A.myB = B.id JOIN C ON C.parent_id BELOW STRICT B.id WHERE A.col1 = 2 AND B.id = 3'),
+ array('SELECT A JOIN B ON A.myB = B.id JOIN C ON C.parent_id NOT BELOW B.id WHERE A.col1 = 2 AND B.id = 3'),
+ array('SELECT A JOIN B ON A.myB = B.id JOIN C ON C.parent_id NOT BELOW STRICT B.id WHERE A.col1 = 2 AND B.id = 3'),
+ array('SELECT A UNION SELECT B'),
+ array('SELECT A WHERE A.b = "sdf" UNION SELECT B WHERE B.a = "sfde"'),
+ array('SELECT A UNION SELECT B UNION SELECT C'),
+ array('SELECT A UNION SELECT B UNION SELECT C UNION SELECT D'),
+ array('SELECT A JOIN B ON A.myB = B.id JOIN C ON C.parent_id NOT BELOW B.id WHERE A.col1 = 2 AND B.id = 3 UNION SELECT Device JOIN Site ON Device.site = Site.id JOIN Country ON Site.location = Country.id'),
+ array('SELECT Person AS B WHERE B.name LIKE \'%A%\''),
+ array('SELECT Server WHERE name REGEXP \'dbserver[0-9]+\''),
+ array('SELECT Server WHERE name REGEXP \'^dbserver[0-9]+\\\\..+\\\\.[a-z]{2,3}$\''),
+ array('SELECT Change AS ch WHERE ch.start_date >= \'2009-12-31\' AND ch.end_date <= \'2010-01-01\''),
+ array('SELECT DatacenterDevice AS dev WHERE INET_ATON(dev.managementip) > INET_ATON(\'10.22.32.224\') AND INET_ATON(dev.managementip) < INET_ATON(\'10.22.32.255\')'),
+ array('SELECT Person AS P JOIN Organization AS Node ON P.org_id = Node.id JOIN Organization AS Root ON Node.parent_id BELOW Root.id WHERE Root.id=1'),
+ array('SELECT PhysicalInterface AS if JOIN DatacenterDevice AS dev ON if.connectableci_id = dev.id WHERE dev.status = \'production\' AND dev.organization_name = \'Demo\''),
+ array('SELECT Ticket AS t WHERE t.agent_id = :current_contact_id'),
+ array('SELECT Person AS p JOIN UserRequest AS u ON u.agent_id = p.id WHERE u.status != \'closed\''),
+ array('SELECT Contract AS c WHERE c.end_date > NOW() AND c.end_date < DATE_ADD(NOW(), INTERVAL 30 DAY)'),
+ array('SELECT UserRequest AS u WHERE u.start_date < DATE_SUB(NOW(), INTERVAL 60 MINUTE) AND u.status = \'new\''),
+ array('SELECT UserRequest AS u WHERE u.close_date > DATE_ADD(u.start_date, INTERVAL 8 HOUR)'),
+ array('SELECT Ticket WHERE tagfield MATCHES \'salad\''),
+ );
+ }
- /**
- * @dataProvider BadQueryProvider
- *
- * @param $sQuery
- *
- * @throws \OQLException
- *
- * @expectedException \Exception
- */
- public function testBadQuery($sQuery)
- {
- $this->debug($sQuery);
- $oOql = new \OqlInterpreter($sQuery);
- $oOql->ParseQuery();
- static::fail();
- }
+ /**
+ * @dataProvider BadQueryProvider
+ *
+ * @param $sQuery
+ * @param $sExpectedExceptionClass
+ *
+ */
+ public function testBadQueryParser($sQuery, $sExpectedExceptionClass)
+ {
+ $this->debug($sQuery);
+ $oOql = new \OqlInterpreter($sQuery);
+ $sExceptionClass = '';
+ try
+ {
+ $oOql->ParseQuery();
+ }
+ catch (\Exception $e)
+ {
+ $sExceptionClass = get_class($e);
+ }
- public function BadQueryProvider()
- {
- return array(
- array('SELECT toto WHERE toto.a = (3++1)'),
- array('SELECT toto WHHHERE toto.a = "1"'),
- array('SELECT toto WHERE toto.a == "1"'),
- array('SELECT toto WHERE toto.a % 1'),
- array('SELECT toto WHERE toto.a like \'arg\''),
- array('SELECT toto WHERE toto.a NOT LIKE "That\'s "it""'),
- array('SELECT toto WHERE toto.a NOT LIKE \'That\'s it\''),
- array('SELECT toto WHERE toto.a NOT LIKE "blah \\ truc"'),
- array('SELECT toto WHERE toto.a NOT LIKE \'blah \\ truc\''),
- array('SELECT A JOIN B ON A.myB = B.id JOIN C ON C.parent_id = B.id WHERE A.col1 BELOW 2 AND B.id = 3'),
- //array('SELECT A WHERE A.a MATCHES toto'),
- );
- }
+ static::assertEquals($sExpectedExceptionClass, $sExceptionClass);
+ }
+
+ public function BadQueryProvider()
+ {
+ return array(
+ array('SELECT toto WHERE toto.a = (3++1)', 'OQLParserException'),
+ array('SELECT toto WHHHERE toto.a = "1"', 'OQLParserException'),
+ array('SELECT toto WHERE toto.a == "1"', 'OQLParserException'),
+ array('SELECT toto WHERE toto.a % 1', 'Exception'),
+ array('SELECT toto WHERE toto.a like \'arg\'', 'OQLParserException'),
+ array('SELECT toto WHERE toto.a NOT LIKE "That\'s "it""', 'OQLParserException'),
+ array('SELECT toto WHERE toto.a NOT LIKE \'That\'s it\'', 'OQLParserException'),
+ array('SELECT toto WHERE toto.a NOT LIKE "blah \\ truc"', 'Exception'),
+ array('SELECT toto WHERE toto.a NOT LIKE \'blah \\ truc\'', 'Exception'),
+ array('SELECT A JOIN B ON A.myB = B.id JOIN C ON C.parent_id = B.id WHERE A.col1 BELOW 2 AND B.id = 3', 'OQLParserException'),
+ );
+ }
+
+ /**
+ * @dataProvider TypeErrorQueryProvider
+ *
+ * @param $sQuery
+ *
+ * @expectedException \TypeError
+ *
+ * @throws \OQLException
+ */
+ public function testTypeErrorQueryParser($sQuery)
+ {
+ $this->debug($sQuery);
+ $oOql = new \OqlInterpreter($sQuery);
+ $oOql->ParseQuery();
+ }
+
+ public function TypeErrorQueryProvider()
+ {
+ return array(
+ array('SELECT A WHERE A.a MATCHES toto'),
+ );
+ }
+
+
+ /**
+ * Needs actual datamodel
+ *
+ * @dataProvider QueryNormalizationProvider
+ *
+ * @param $sQuery
+ * @param $sExpectedExceptionClass
+ *
+ */
+ public function testQueryNormalization($sQuery, $sExpectedExceptionClass)
+ {
+ $this->debug($sQuery);
+ $sExceptionClass = '';
+ try
+ {
+ $oSearch = \DBObjectSearch::FromOQL($sQuery);
+ static::assertInstanceOf('DBObjectSearch', $oSearch);
+ }
+ catch (\Exception $e)
+ {
+ $sExceptionClass = get_class($e);
+ }
+
+ static::assertEquals($sExpectedExceptionClass, $sExceptionClass);
+ }
+
+
+ public function QueryNormalizationProvider()
+ {
+ return array(
+ array('SELECT Contact', ''),
+ array('SELECT Contact WHERE nom_de_famille = "foo"', 'OqlNormalizeException'),
+ array('SELECT Contact AS c WHERE name = "foo"', ''),
+ array('SELECT Contact AS c WHERE nom_de_famille = "foo"', 'OqlNormalizeException'),
+ array('SELECT Contact AS c WHERE c.name = "foo"', ''),
+ array('SELECT Contact AS c WHERE Contact.name = "foo"', 'OqlNormalizeException'),
+ array('SELECT Contact AS c WHERE x.name = "foo"', 'OqlNormalizeException'),
+
+ array('SELECT Organization AS child JOIN Organization AS root ON child.parent_id BELOW root.id', ''),
+ array('SELECT Organization AS root JOIN Organization AS child ON child.parent_id BELOW root.id', ''),
+
+ array('SELECT RelationProfessionnelle', 'UnknownClassOqlException'),
+ array('SELECT RelationProfessionnelle AS c WHERE name = "foo"', 'UnknownClassOqlException'),
+
+ // The first query is the base query altered only in one place in the subsequent queries
+ array('SELECT Person AS p JOIN lnkPersonToTeam AS lnk ON lnk.person_id = p.id WHERE p.name LIKE "foo"', ''),
+ array('SELECT Person AS p JOIN lnkXXXXXXXXXXXX AS lnk ON lnk.person_id = p.id WHERE p.name LIKE "foo"', 'UnknownClassOqlException'),
+ array('SELECT Person AS p JOIN lnkPersonToTeam AS lnk ON p.person_id = p.id WHERE p.name LIKE "foo"', 'OqlNormalizeException'),
+ array('SELECT Person AS p JOIN lnkPersonToTeam AS lnk ON person_id = p.id WHERE p.name LIKE "foo"', 'OqlNormalizeException'),
+ array('SELECT Person AS p JOIN lnkPersonToTeam AS lnk ON lnk.person_id = id WHERE p.name LIKE "foo"', 'OqlNormalizeException'),
+ array('SELECT Person AS p JOIN lnkPersonToTeam AS lnk ON lnk.role = p.id WHERE p.name LIKE "foo"', 'OqlNormalizeException'),
+ array('SELECT Person AS p JOIN lnkPersonToTeam AS lnk ON lnk.team_id = p.id WHERE p.name LIKE "foo"', 'OqlNormalizeException'),
+ array('SELECT Person AS p JOIN lnkPersonToTeam AS lnk ON lnk.person_id BELOW p.id WHERE p.name LIKE "bar"', ''),
+ array('SELECT Person AS p JOIN lnkPersonToTeam AS lnk ON lnk.person_id = p.org_id WHERE p.name LIKE "foo"', 'OqlNormalizeException'),
+ array('SELECT Person AS p JOIN lnkPersonToTeam AS lnk ON p.id = lnk.person_id WHERE p.name LIKE "foo"', 'OqlNormalizeException'), // inverted the JOIN spec
+ array('SELECT Person AS p JOIN lnkPersonToTeam AS lnk ON lnk.person_id = p.id WHERE name LIKE "foo"', ''),
+ array('SELECT Person AS p JOIN lnkPersonToTeam AS lnk ON lnk.person_id = p.id WHERE x.name LIKE "foo"', 'OqlNormalizeException'),
+ array('SELECT Person AS p JOIN lnkPersonToTeam AS lnk ON lnk.person_id = p.id WHERE p.eman LIKE "foo"', 'OqlNormalizeException'),
+ array('SELECT Person AS p JOIN lnkPersonToTeam AS lnk ON lnk.person_id = p.id WHERE eman LIKE "foo"', 'OqlNormalizeException'),
+ array('SELECT Person AS p JOIN lnkPersonToTeam AS lnk ON lnk.person_id = p.id WHERE id = 1', 'OqlNormalizeException'),
+ array('SELECT Person AS p JOIN lnkPersonToTeam AS lnk ON p.id = lnk.person_id WHERE p.name LIKE "foo"', 'OqlNormalizeException'),
+
+ array('SELECT Person AS p JOIN Organization AS o ON p.org_id = o.id WHERE p.name LIKE "foo" AND o.name LIKE "land"', ''),
+ array('SELECT Person AS p JOIN Organization AS o ON p.location_id = o.id WHERE p.name LIKE "foo" AND o.name LIKE "land"', 'OqlNormalizeException'),
+ array('SELECT Person AS p JOIN Organization AS o ON p.name = o.id WHERE p.name LIKE "foo" AND o.name LIKE "land"', 'OqlNormalizeException'),
+
+ array('SELECT Person AS p JOIN Organization AS o ON p.org_id = o.id JOIN Person AS p ON p.org_id = o.id', 'OqlNormalizeException'),
+ array('SELECT Person JOIN Organization AS o ON Person.org_id = o.id JOIN Person ON Person.org_id = o.id', 'OqlNormalizeException'),
+
+ array('SELECT Person AS p JOIN Location AS l ON p.location_id = l.id', ''),
+ array('SELECT Person AS p JOIN Location AS l ON p.location_id BELOW l.id', 'OqlNormalizeException'),
+
+ array('SELECT Person FROM Person JOIN Location ON Person.location_id = Location.id', ''),
+ array('SELECT p FROM Person AS p JOIN Location AS l ON p.location_id = l.id', ''),
+ array('SELECT l FROM Person AS p JOIN Location AS l ON p.location_id = l.id', ''),
+ array('SELECT l, p FROM Person AS p JOIN Location AS l ON p.location_id = l.id', ''),
+ array('SELECT p, l FROM Person AS p JOIN Location AS l ON p.location_id = l.id', ''),
+ array('SELECT foo FROM Person AS p JOIN Location AS l ON p.location_id = l.id', 'OqlNormalizeException'),
+ array('SELECT p, foo FROM Person AS p JOIN Location AS l ON p.location_id = l.id', 'OqlNormalizeException'),
+
+ // Joins based on AttributeObjectKey
+ //
+ array('SELECT Attachment AS a JOIN UserRequest AS r ON a.item_id = r.id', ''),
+ array('SELECT UserRequest AS r JOIN Attachment AS a ON a.item_id = r.id', ''),
+ );
+ }
}
diff --git a/test/testlist.inc.php b/test/testlist.inc.php
index a3bb15d2f..88519843a 100644
--- a/test/testlist.inc.php
+++ b/test/testlist.inc.php
@@ -123,328 +123,6 @@ class TestSQLQuery extends TestScenarioOnDB
}
}
-class TestOQLParser extends TestFunction
-{
- static public function GetName() {return 'Check OQL parsing';}
- static public function GetDescription() {return 'Attempts a series of queries, and in particular those with a bad syntax';}
-
- protected function CheckQuery($sQuery, $bIsCorrectQuery)
- {
- $oOql = new OqlInterpreter($sQuery);
- try
- {
- $oTrash = $oOql->Parse(); // Not expecting a given format, otherwise use ParseExpression/ParseObjectQuery/ParseValueSetQuery
- self::DumpVariable($oTrash);
- }
- catch (OQLException $OqlException)
- {
- if ($bIsCorrectQuery)
- {
- echo "More info on this unexpected failure:
".$OqlException->getHtmlDesc()."
\n";
- throw $OqlException;
- return false;
- }
- else
- {
- // Everything is fine :-)
- echo "More info on this expected failure:
".$OqlException->getHtmlDesc()."
\n";
- return true;
- }
- }
- catch (Exception $e)
- {
- if ($bIsCorrectQuery)
- {
- echo "More info on this unexpected failure:
".htmlentities($e->getMessage(), ENT_QUOTES, 'UTF-8')."
\n";
- throw $OqlException;
- return false;
- }
- else
- {
- // Everything is fine :-)
- echo "More info on this expected failure:
".htmlentities($e->getMessage(), ENT_QUOTES, 'UTF-8')."
\n";
- return true;
- }
- }
- // The query was correctly parsed, was it expected to be correct ?
- if ($bIsCorrectQuery)
- {
- return true;
- }
- else
- {
- throw new UnitTestException("The query '$sQuery' was parsed with success, while it shouldn't (?)");
- return false;
- }
- }
-
- protected function TestQuery($sQuery, $bIsCorrectQuery)
- {
- if (!$this->CheckQuery($sQuery, $bIsCorrectQuery))
- {
- return false;
- }
- return true;
- }
-
- public function DoExecute()
- {
- $aQueries = array(
- 'SELECT toto' => true,
- 'SELECT toto WHERE toto.a = 1' => true,
- 'SELECT toto WHERE toto.a = -1' => true,
- 'SELECT toto WHERE toto.a = (1-1)' => true,
- 'SELECT toto WHERE toto.a = (-1+3)' => true,
- 'SELECT toto WHERE toto.a = (3+-1)' => true,
- 'SELECT toto WHERE toto.a = (3--1)' => true,
- 'SELECT toto WHERE toto.a = (3++1)' => false,
- 'SELECT toto WHERE toto.a = 0xC' => true,
- 'SELECT toto WHERE toto.a = \'AXDVFS0xCZ32\'' => true,
- 'SELECT toto WHERE toto.a = :myparameter' => true,
- 'SELECT toto WHERE toto.a IN (:param1)' => true,
- 'SELECT toto WHERE toto.a IN (:param1, :param2)' => true,
- 'SELECT toto WHERE toto.a=1' => true,
- 'SELECT toto WHERE toto.a = "1"' => true,
- 'SELECT toto WHHHERE toto.a = "1"' => false,
- 'SELECT toto WHERE toto.a == "1"' => false,
- 'SELECT toto WHERE toto.a % 1' => false,
- 'SELECT toto WHERE toto.a & 1' => true, // bitwise and
- 'SELECT toto WHERE toto.a | 1' => true, // bitwise or
- 'SELECT toto WHERE toto.a ^ 1' => true, // bitwise xor
- 'SELECT toto WHERE toto.a << 1' => true, // bitwise left shift
- 'SELECT toto WHERE toto.a >> 1' => true, // bitwise right shift
- //'SELECT toto WHERE toto.a LIKE 1' => false,
- 'SELECT toto WHERE toto.a like \'arg\'' => false,
- 'SELECT toto WHERE toto.a NOT LIKE "That\'s it"' => true,
- 'SELECT toto WHERE toto.a NOT LIKE "That\'s "it""' => false,
- 'SELECT toto WHERE toto.a NOT LIKE "That\'s \\"it\\""' => true,
- 'SELECT toto WHERE toto.a NOT LIKE \'That"s it\'' => true,
- 'SELECT toto WHERE toto.a NOT LIKE \'That\'s it\'' => false,
- 'SELECT toto WHERE toto.a NOT LIKE \'That\\\'s it\'' => true,
- 'SELECT toto WHERE toto.a NOT LIKE "blah \\ truc"' => false,
- 'SELECT toto WHERE toto.a NOT LIKE "blah \\\\ truc"' => true,
- 'SELECT toto WHERE toto.a NOT LIKE \'blah \\ truc\'' => false,
- 'SELECT toto WHERE toto.a NOT LIKE \'blah \\\\ truc\'' => true,
-
- 'SELECT toto WHERE toto.a NOT LIKE "\\\\"' => true,
- 'SELECT toto WHERE toto.a NOT LIKE "\\""' => true,
- 'SELECT toto WHERE toto.a NOT LIKE "\\"\\\\"' => true,
- 'SELECT toto WHERE toto.a NOT LIKE "\\\\\\""' => true,
- 'SELECT toto WHERE toto.a NOT LIKE ""' => true,
- 'SELECT toto WHERE toto.a NOT LIKE "\\\\"' => true,
- "SELECT UserRightsMatrixClassGrant WHERE UserRightsMatrixClassGrant.class = 'lnkContactRealObject' AND UserRightsMatrixClassGrant.action = 'modify' AND UserRightsMatrixClassGrant.login = 'Denis'" => true,
- "SELECT A WHERE A.col1 = 'lit1' AND A.col2 = 'lit2' AND A.col3 = 'lit3'" => true,
-
- 'SELECT toto WHERE toto.a NOT LIKE "blah" AND toto.b LIKE "foo"' => true,
-
- //'SELECT toto WHERE toto.a > \'asd\'' => false,
- 'SELECT toto WHERE toto.a = 1 AND toto.b LIKE "x" AND toto.f >= 12345' => true,
- 'SELECT Device JOIN Site ON Device.site = Site.id' => true,
- 'SELECT Device JOIN Site ON Device.site = Site.id JOIN Country ON Site.location = Country.id' => true,
-
- "SELECT A JOIN B ON A.myB = B.id WHERE (A.col1 = 123 AND B.col1 = 'aa') OR (A.col3 = 'zzz' AND B.col4 > 100)" => true,
- "SELECT A JOIN B ON A.myB = B.id WHERE (A.col1 = B.col2 AND B.col1 = A.col2) OR (A.col3 = '' AND B.col4 > 100)" => true,
- "SELECT A JOIN B ON A.myB = B.id WHERE A.col1 + B.col2 * B.col1 = A.col2" => true,
- "SELECT A JOIN B ON A.myB = B.id WHERE A.col1 + (B.col2 * B.col1) = A.col2" => true,
- "SELECT A JOIN B ON A.myB = B.id WHERE (A.col1 + B.col2) * B.col1 = A.col2" => true,
- "SELECT A JOIN B ON A.myB = B.id WHERE (A.col1 & B.col2) = A.col2" => true,
-
- 'SELECT Device AS D_ JOIN Site AS S_ ON D_.site = S_.id WHERE S_.country = "Francia"' => true,
-
- // Several objects in a row...
- //
- 'SELECT A FROM A' => true,
- 'SELECT A JOIN B ON A.myB = B.id WHERE A.col1 = 2' => true,
- 'SELECT A FROM A JOIN B ON A.myB = B.id WHERE A.col1 = 2' => true,
- 'SELECT B FROM A JOIN B ON A.myB = B.id WHERE A.col1 = 2' => true,
- 'SELECT A,B FROM A JOIN B ON A.myB = B.id WHERE A.col1 = 2' => true,
- 'SELECT A, B FROM A JOIN B ON A.myB = B.id WHERE A.col1 = 2' => true,
- 'SELECT B,A FROM A JOIN B ON A.myB = B.id WHERE A.col1 = 2' => true,
- 'SELECT A, B,C FROM A JOIN B ON A.myB = B.id' => true,
- 'SELECT C FROM A JOIN B ON A.myB = B.id WHERE A.col1 = 2' => true,
- 'SELECT A JOIN B ON A.myB BELOW B.id WHERE A.col1 = 2' => true,
- 'SELECT A JOIN B ON B.myA BELOW A.id WHERE A.col1 = 2' => true,
- 'SELECT A JOIN B ON A.myB = B.id JOIN C ON C.parent_id BELOW B.id WHERE A.col1 = 2 AND B.id = 3' => true,
- 'SELECT A JOIN B ON A.myB = B.id JOIN C ON C.parent_id BELOW STRICT B.id WHERE A.col1 = 2 AND B.id = 3' => true,
- 'SELECT A JOIN B ON A.myB = B.id JOIN C ON C.parent_id NOT BELOW B.id WHERE A.col1 = 2 AND B.id = 3' => true,
- 'SELECT A JOIN B ON A.myB = B.id JOIN C ON C.parent_id NOT BELOW STRICT B.id WHERE A.col1 = 2 AND B.id = 3' => true,
- 'SELECT A JOIN B ON A.myB = B.id JOIN C ON C.parent_id = B.id WHERE A.col1 BELOW 2 AND B.id = 3' => false,
-
- // Unions
- //
- 'SELECT A UNION SELECT B' => true,
- 'SELECT A WHERE A.b = "sdf" UNION SELECT B WHERE B.a = "sfde"' => true,
- 'SELECT A UNION SELECT B UNION SELECT C' => true,
- 'SELECT A UNION SELECT B UNION SELECT C UNION SELECT D' => true,
- 'SELECT A JOIN B ON A.myB = B.id JOIN C ON C.parent_id NOT BELOW B.id WHERE A.col1 = 2 AND B.id = 3 UNION SELECT Device JOIN Site ON Device.site = Site.id JOIN Country ON Site.location = Country.id' => true,
- );
-
- $iErrors = 0;
-
- foreach($aQueries as $sQuery => $bIsCorrectQuery)
- {
- $sIsOk = $bIsCorrectQuery ? 'good' : 'bad';
- echo "Testing query: $sQuery ($sIsOk)
\n";
- try
- {
- $bRet = $this->TestQuery($sQuery, $bIsCorrectQuery);
- }
- catch(Exception $e)
- {
- $this->m_aErrors[] = $e->getMessage();
- $bRet = false;
- }
- if (!$bRet) $iErrors++;
- }
-
- return ($iErrors == 0);
- }
-}
-
-class TestOQLNormalization extends TestBizModel
-{
- static public function GetName() {return 'Check OQL normalization';}
- static public function GetDescription() {return 'Attempts a series of queries, and in particular those with unknown or inconsistent class/attributes. Assumes a very standard installation!';}
-
- protected function CheckQuery($sQuery, $bIsCorrectQuery)
- {
- try
- {
- $oSearch = DBObjectSearch::FromOQL($sQuery);
- self::DumpVariable($sQuery);
- }
- catch (OQLNormalizeException $OqlException)
- {
- if ($bIsCorrectQuery)
- {
- echo "More info on this unexpected failure:
".$OqlException->getHtmlDesc()."
\n";
- throw $OqlException;
- return false;
- }
- else
- {
- // Everything is fine :-)
- echo "More info on this expected failure:
".$OqlException->getHtmlDesc()."
\n";
- return true;
- }
- }
- catch (Exception $e)
- {
- if ($bIsCorrectQuery)
- {
- echo "More info on this unexpected failure:
".htmlentities($e->getMessage(), ENT_QUOTES, 'UTF-8')."
\n";
- throw $e;
- return false;
- }
- else
- {
- // Everything is fine :-)
- echo "More info on this expected failure:
".htmlentities($e->getMessage(), ENT_QUOTES, 'UTF-8')."
\n";
- return true;
- }
- }
- // The query was correctly parsed, was it expected to be correct ?
- if ($bIsCorrectQuery)
- {
- return true;
- }
- else
- {
- throw new UnitTestException("The query '$sQuery' was parsed with success, while it shouldn't (?)");
- return false;
- }
- }
-
- protected function TestQuery($sQuery, $bIsCorrectQuery)
- {
- if (!$this->CheckQuery($sQuery, $bIsCorrectQuery))
- {
- return false;
- }
- return true;
- }
-
- public function DoExecute()
- {
- $aQueries = array(
- 'SELECT Contact' => true,
- 'SELECT Contact WHERE nom_de_famille = "foo"' => false,
- 'SELECT Contact AS c WHERE name = "foo"' => true,
- 'SELECT Contact AS c WHERE nom_de_famille = "foo"' => false,
- 'SELECT Contact AS c WHERE c.name = "foo"' => true,
- 'SELECT Contact AS c WHERE Contact.name = "foo"' => false,
- 'SELECT Contact AS c WHERE x.name = "foo"' => false,
-
- 'SELECT Organization AS child JOIN Organization AS root ON child.parent_id BELOW root.id' => true,
- 'SELECT Organization AS root JOIN Organization AS child ON child.parent_id BELOW root.id' => true,
-
- 'SELECT RelationProfessionnelle' => false,
- 'SELECT RelationProfessionnelle AS c WHERE name = "foo"' => false,
-
- // The first query is the base query altered only in one place in the subsequent queries
- 'SELECT Person AS p JOIN lnkPersonToTeam AS lnk ON lnk.person_id = p.id WHERE p.name LIKE "foo"' => true,
- 'SELECT Person AS p JOIN lnkXXXXXXXXXXXX AS lnk ON lnk.person_id = p.id WHERE p.name LIKE "foo"' => false,
- 'SELECT Person AS p JOIN lnkPersonToTeam AS lnk ON p.person_id = p.id WHERE p.name LIKE "foo"' => false,
- 'SELECT Person AS p JOIN lnkPersonToTeam AS lnk ON person_id = p.id WHERE p.name LIKE "foo"' => false,
- 'SELECT Person AS p JOIN lnkPersonToTeam AS lnk ON lnk.person_id = id WHERE p.name LIKE "foo"' => false,
- 'SELECT Person AS p JOIN lnkPersonToTeam AS lnk ON lnk.role = p.id WHERE p.name LIKE "foo"' => false,
- 'SELECT Person AS p JOIN lnkPersonToTeam AS lnk ON lnk.team_id = p.id WHERE p.name LIKE "foo"' => false,
- 'SELECT Person AS p JOIN lnkPersonToTeam AS lnk ON lnk.person_id BELOW p.id WHERE p.name LIKE "foo"' => false,
- 'SELECT Person AS p JOIN lnkPersonToTeam AS lnk ON lnk.person_id = p.org_id WHERE p.name LIKE "foo"' => false,
- 'SELECT Person AS p JOIN lnkPersonToTeam AS lnk ON p.id = lnk.person_id WHERE p.name LIKE "foo"' => false, // inverted the JOIN spec
- 'SELECT Person AS p JOIN lnkPersonToTeam AS lnk ON lnk.person_id = p.id WHERE name LIKE "foo"' => true,
- 'SELECT Person AS p JOIN lnkPersonToTeam AS lnk ON lnk.person_id = p.id WHERE x.name LIKE "foo"' => false,
- 'SELECT Person AS p JOIN lnkPersonToTeam AS lnk ON lnk.person_id = p.id WHERE p.eman LIKE "foo"' => false,
- 'SELECT Person AS p JOIN lnkPersonToTeam AS lnk ON lnk.person_id = p.id WHERE eman LIKE "foo"' => false,
- 'SELECT Person AS p JOIN lnkPersonToTeam AS lnk ON lnk.person_id = p.id WHERE id = 1' => false,
- 'SELECT Person AS p JOIN lnkPersonToTeam AS lnk ON p.id = lnk.person_id WHERE p.name LIKE "foo"' => false,
-
- 'SELECT Person AS p JOIN Organization AS o ON p.org_id = o.id WHERE p.name LIKE "foo" AND o.name LIKE "land"' => true,
- 'SELECT Person AS p JOIN Organization AS o ON p.location_id = o.id WHERE p.name LIKE "foo" AND o.name LIKE "land"' => false,
- 'SELECT Person AS p JOIN Organization AS o ON p.name = o.id WHERE p.name LIKE "foo" AND o.name LIKE "land"' => false,
-
- 'SELECT Person AS p JOIN Organization AS o ON p.org_id = o.id JOIN Person AS p ON p.org_id = o.id' => false,
- 'SELECT Person JOIN Organization AS o ON Person.org_id = o.id JOIN Person ON Person.org_id = o.id' => false,
-
- 'SELECT Person AS p JOIN Location AS l ON p.location_id = l.id' => true,
- 'SELECT Person AS p JOIN Location AS l ON p.location_id BELOW l.id' => false,
-
- 'SELECT Person FROM Person JOIN Location ON Person.location_id = Location.id' => true,
- 'SELECT p FROM Person AS p JOIN Location AS l ON p.location_id = l.id' => true,
- 'SELECT l FROM Person AS p JOIN Location AS l ON p.location_id = l.id' => true,
- 'SELECT l, p FROM Person AS p JOIN Location AS l ON p.location_id = l.id' => true,
- 'SELECT p, l FROM Person AS p JOIN Location AS l ON p.location_id = l.id' => true,
- 'SELECT foo FROM Person AS p JOIN Location AS l ON p.location_id = l.id' => false,
- 'SELECT p, foo FROM Person AS p JOIN Location AS l ON p.location_id = l.id' => false,
-
- // Joins based on AttributeObjectKey
- //
- 'SELECT Attachment AS a JOIN UserRequest AS r ON a.item_id = r.id' => true,
- 'SELECT UserRequest AS r JOIN Attachment AS a ON a.item_id = r.id' => true,
- );
-
- $iErrors = 0;
-
- foreach($aQueries as $sQuery => $bIsCorrectQuery)
- {
- $sIsOk = $bIsCorrectQuery ? 'good' : 'bad';
- echo "Testing query: $sQuery ($sIsOk)
\n";
- try
- {
- $bRet = $this->TestQuery($sQuery, $bIsCorrectQuery);
- }
- catch(Exception $e)
- {
- $this->m_aErrors[] = $e->getMessage();
- $bRet = false;
- }
- if (!$bRet) $iErrors++;
- }
-
- return ($iErrors == 0);
- }
-}
-
class TestCSVParser extends TestFunction
{
static public function GetName() {return 'Check CSV parsing';}