Skip to content

allow for property name to be escaped #171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 10, 2015
Merged

allow for property name to be escaped #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 64 additions & 14 deletions tests/Query/QOM/Sql2TestQueries.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,18 @@ public static function getQueries()
/*
* 6.7.8. EquiJoinCondition
*/
$queries['6.7.8.EquiJoin.Inner'] = 'SELECT * FROM [nt:file] AS file INNER JOIN [nt:folder] AS folder ON file.prop1=folder.prop2';
$queries['6.7.8.EquiJoin.Left'] = 'SELECT * FROM [nt:file] AS file LEFT OUTER JOIN [nt:folder] AS folder ON file.prop1=folder.prop2';
$queries['6.7.8.EquiJoin.Right'] = 'SELECT * FROM [nt:file] AS file RIGHT OUTER JOIN [nt:folder] AS folder ON file.prop1=folder.prop2';
$queries['6.7.8.EquiJoin.Inner'] = array(
'SELECT * FROM [nt:file] AS file INNER JOIN [nt:folder] AS folder ON file.prop1=folder.prop2',
'SELECT * FROM [nt:file] AS file INNER JOIN [nt:folder] AS folder ON file.[prop1]=folder.[prop2]',
);
$queries['6.7.8.EquiJoin.Left'] = array(
'SELECT * FROM [nt:file] AS file LEFT OUTER JOIN [nt:folder] AS folder ON file.prop1=folder.prop2',
'SELECT * FROM [nt:file] AS file LEFT OUTER JOIN [nt:folder] AS folder ON file.[prop1]=folder.[prop2]',
);
$queries['6.7.8.EquiJoin.Right'] = array(
'SELECT * FROM [nt:file] AS file RIGHT OUTER JOIN [nt:folder] AS folder ON file.prop1=folder.prop2',
'SELECT * FROM [nt:file] AS file RIGHT OUTER JOIN [nt:folder] AS folder ON file.[prop1]=folder.[prop2]',
);

/*
* 6.7.9. SameNodeJoinCondition
Expand Down Expand Up @@ -62,16 +71,19 @@ public static function getQueries()
$queries['6.7.12.Constraint.Precedence.1'] = array(
'SELECT * FROM [nt:file] AS file WHERE file.prop1 = \'1\' OR file.prop2 = \'2\' AND file.prop3 = \'3\'',
'SELECT * FROM [nt:file] AS file WHERE (file.prop1 = \'1\' OR (file.prop2 = \'2\' AND file.prop3 = \'3\'))',
'SELECT * FROM [nt:file] AS file WHERE (file.[prop1] = \'1\' OR (file.[prop2] = \'2\' AND file.[prop3] = \'3\'))',
);
$queries['6.7.12.Constraint.Precedence.2'] = array(
'SELECT * FROM [nt:file] AS file WHERE file.prop1 = \'1\' AND file.prop2 = \'2\' OR file.prop3 = \'3\'',
'SELECT * FROM [nt:file] AS file WHERE ((file.prop1 = \'1\' AND file.prop2 = \'2\') OR file.prop3 = \'3\')',
'SELECT * FROM [nt:file] AS file WHERE ((file.[prop1] = \'1\' AND file.[prop2] = \'2\') OR file.[prop3] = \'3\')',
);

$queries['6.7.12.Constraint.Precedence.3'] = array(
'SELECT * FROM [nt:file] AS file WHERE NOT file.prop1 = \'1\' OR file.prop2 = \'2\' AND NOT file.prop3 = \'3\'',
'SELECT * FROM [nt:file] AS file WHERE (NOT file.prop1 = \'1\' OR (file.prop2 = \'2\' AND NOT file.prop3 = \'3\'))',
'SELECT * FROM [nt:file] AS file WHERE ((NOT file.prop1 = \'1\') OR (file.prop2 = \'2\' AND (NOT file.prop3 = \'3\')))',
'SELECT * FROM [nt:file] AS file WHERE ((NOT file.[prop1] = \'1\') OR (file.[prop2] = \'2\' AND (NOT file.[prop3] = \'3\')))',
);

$queries['6.7.12.Constraint.Precedence.4'] = array(
Expand All @@ -82,6 +94,7 @@ public static function getQueries()
AND file.prop6 IS NOT NULL AND file.prop7 IS NOT NULL',

'SELECT * FROM [nt:file] AS file WHERE (((file.prop1 IS NOT NULL AND file.prop2 IS NOT NULL) AND file.prop3 IS NOT NULL) OR (((file.prop4 IS NOT NULL AND file.prop5 IS NOT NULL) AND file.prop6 IS NOT NULL) AND file.prop7 IS NOT NULL))',
'SELECT * FROM [nt:file] AS file WHERE (((file.[prop1] IS NOT NULL AND file.[prop2] IS NOT NULL) AND file.[prop3] IS NOT NULL) OR (((file.[prop4] IS NOT NULL AND file.[prop5] IS NOT NULL) AND file.[prop6] IS NOT NULL) AND file.[prop7] IS NOT NULL))',
);

$queries['6.7.12.Constraint.Precedence.5'] = array(
Expand All @@ -90,6 +103,7 @@ public static function getQueries()
OR NOT file.prop3 = \'hello\' AND file.prop4 <> \'hello\'',
'SELECT * FROM [nt:file] AS file WHERE ((NOT file.prop1 IS NOT NULL AND NOT NOT file.prop2 IS NOT NULL) OR (NOT file.prop3 = \'hello\' AND file.prop4 <> \'hello\'))',
'SELECT * FROM [nt:file] AS file WHERE (((NOT file.prop1 IS NOT NULL) AND (NOT (NOT file.prop2 IS NOT NULL))) OR ((NOT file.prop3 = \'hello\') AND file.prop4 <> \'hello\'))',
'SELECT * FROM [nt:file] AS file WHERE (((NOT file.[prop1] IS NOT NULL) AND (NOT (NOT file.[prop2] IS NOT NULL))) OR ((NOT file.[prop3] = \'hello\') AND file.[prop4] <> \'hello\'))',
);

/*
Expand All @@ -98,6 +112,7 @@ public static function getQueries()
$queries['6.7.13.And'] = array(
'SELECT * FROM [nt:file] AS file WHERE file.prop1 IS NOT NULL AND file.prop2 IS NOT NULL',
'SELECT * FROM [nt:file] AS file WHERE (file.prop1 IS NOT NULL AND file.prop2 IS NOT NULL)',
'SELECT * FROM [nt:file] AS file WHERE (file.[prop1] IS NOT NULL AND file.[prop2] IS NOT NULL)',
);

/*
Expand All @@ -106,6 +121,7 @@ public static function getQueries()
$queries['6.7.14.Or'] = array(
'SELECT * FROM [nt:file] AS file WHERE file.prop1 IS NOT NULL OR file.prop2 IS NOT NULL',
'SELECT * FROM [nt:file] AS file WHERE (file.prop1 IS NOT NULL OR file.prop2 IS NOT NULL)',
'SELECT * FROM [nt:file] AS file WHERE (file.[prop1] IS NOT NULL OR file.[prop2] IS NOT NULL)',
);

/*
Expand All @@ -114,6 +130,7 @@ public static function getQueries()
$queries['6.7.15.Not'] = array(
'SELECT * FROM [nt:file] AS file WHERE NOT file.prop1 IS NOT NULL',
'SELECT * FROM [nt:file] AS file WHERE (NOT file.prop1 IS NOT NULL)',
'SELECT * FROM [nt:file] AS file WHERE (NOT file.[prop1] IS NOT NULL)',
);

/*
Expand All @@ -124,13 +141,22 @@ public static function getQueries()
/*
* 6.7.18. PropertyExistence
*/
$queries['6.7.18.PropertyExistence'] = 'SELECT * FROM [nt:file] AS file WHERE file.prop1 IS NOT NULL';
$queries['6.7.18.PropertyExistence'] = array(
'SELECT * FROM [nt:file] AS file WHERE file.prop1 IS NOT NULL',
'SELECT * FROM [nt:file] AS file WHERE file.[prop1] IS NOT NULL',
);

/*
* 6.7.19. FullTextSearch
*/
$queries['6.7.19.FullTextSearch'] = 'SELECT * FROM [nt:file] AS file WHERE CONTAINS(file.prop, \'expr\')';
$queries['6.7.19.FullTextSearch_With_Single_Quote'] = "SELECT * FROM [nt:file] AS file WHERE CONTAINS(file.prop, 'expr''')";
$queries['6.7.19.FullTextSearch'] = array(
'SELECT * FROM [nt:file] AS file WHERE CONTAINS(file.prop, \'expr\')',
'SELECT * FROM [nt:file] AS file WHERE CONTAINS(file.[prop], \'expr\')',
);
$queries['6.7.19.FullTextSearch_With_Single_Quote'] = array(
"SELECT * FROM [nt:file] AS file WHERE CONTAINS(file.prop, 'expr''')",
"SELECT * FROM [nt:file] AS file WHERE CONTAINS(file.[prop], 'expr''')",
);

/*
* 6.7.20. SameNode
Expand Down Expand Up @@ -162,13 +188,22 @@ public static function getQueries()
/*
* 6.7.27. PropertyValue
*/
$queries['6.7.27.PropertyValue'] = 'SELECT * FROM [nt:file] AS file WHERE file.prop LIKE \'literal\'';
$queries['6.7.27.1.PropertyValue'] = 'SELECT * FROM [nt:unstructured] AS sel WHERE sel.prop > CAST(\'2013-04-15T00:00:00.000+02:00\' AS DATE)';
$queries['6.7.27.PropertyValue'] = array(
'SELECT * FROM [nt:file] AS file WHERE file.prop LIKE \'literal\'',
'SELECT * FROM [nt:file] AS file WHERE file.[prop] LIKE \'literal\'',
);
$queries['6.7.27.1.PropertyValue'] = array(
'SELECT * FROM [nt:unstructured] AS sel WHERE sel.prop > CAST(\'2013-04-15T00:00:00.000+02:00\' AS DATE)',
'SELECT * FROM [nt:unstructured] AS sel WHERE sel.[prop] > CAST(\'2013-04-15T00:00:00.000+02:00\' AS DATE)',
);

/*
* 6.7.28. Length
*/
$queries['6.7.28.Length'] = 'SELECT * FROM [nt:file] AS file WHERE LENGTH(file.prop) LIKE \'literal\'';
$queries['6.7.28.Length'] = array(
'SELECT * FROM [nt:file] AS file WHERE LENGTH(file.prop) LIKE \'literal\'',
'SELECT * FROM [nt:file] AS file WHERE LENGTH(file.[prop]) LIKE \'literal\'',
);

/*
* 6.7.29. NodeName
Expand Down Expand Up @@ -204,16 +239,31 @@ public static function getQueries()
* 6.7.38 Order
*/
$queries['6.7.38.Order.None'] = 'SELECT * FROM [nt:unstructured] AS u';
$queries['6.7.38.Order.Asc'] = 'SELECT * FROM [nt:unstructured] AS u ORDER BY u.prop1 ASC';
$queries['6.7.38.Order.Desc'] = 'SELECT * FROM [nt:unstructured] AS u ORDER BY u.prop1 DESC';
$queries['6.7.38.Order.Mixed'] = 'SELECT * FROM [nt:unstructured] AS u ORDER BY u.prop1 ASC, u.prop2 DESC';
$queries['6.7.38.Order.Asc'] = array(
'SELECT * FROM [nt:unstructured] AS u ORDER BY u.prop1 ASC',
'SELECT * FROM [nt:unstructured] AS u ORDER BY u.[prop1] ASC',
);
$queries['6.7.38.Order.Desc'] = array(
'SELECT * FROM [nt:unstructured] AS u ORDER BY u.prop1 DESC',
'SELECT * FROM [nt:unstructured] AS u ORDER BY u.[prop1] DESC',
);
$queries['6.7.38.Order.Mixed'] = array(
'SELECT * FROM [nt:unstructured] AS u ORDER BY u.prop1 ASC, u.prop2 DESC',
'SELECT * FROM [nt:unstructured] AS u ORDER BY u.[prop1] ASC, u.[prop2] DESC',
);

/*
* 6.7.39 Column
*/
$queries['6.7.39.Colum.Wildcard'] = 'SELECT * FROM [nt:unstructured] AS u';
$queries['6.7.39.Colum.Selector'] = 'SELECT u.prop1 AS col1 FROM [nt:unstructured] AS u';
$queries['6.7.39.Colum.Mixed'] = 'SELECT u.prop1 AS col1, u.prop2 FROM [nt:unstructured] AS u';
$queries['6.7.39.Colum.Selector'] = array(
'SELECT u.prop1 AS col1 FROM [nt:unstructured] AS u',
'SELECT u.[prop1] AS col1 FROM [nt:unstructured] AS u',
);
$queries['6.7.39.Colum.Mixed'] = array(
'SELECT u.prop1 AS col1, u.prop2 FROM [nt:unstructured] AS u',
'SELECT u.[prop1] AS col1, u.[prop2] FROM [nt:unstructured] AS u',
);

return $queries;
}
Expand Down
2 changes: 1 addition & 1 deletion tests/Query/QOM/Sql2ToQomConverterTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public function setUp()

public function testColumnsAndSelector()
{
$sql2 = $this->sql2Queries['6.7.39.Colum.Mixed'];
$sql2 = reset($this->sql2Queries['6.7.39.Colum.Mixed']);
$query = $this->parser->parse($sql2);

$this->assertInstanceOf('\PHPCR\Query\QOM\QueryObjectModelInterface', $query);
Expand Down