Merge pull request #26 from mdekrijger/patch-1

lsmith77 · lsmith77 · commit a7cb98feed74 · 2012-12-14T01:30:43.000-08:00
Dot not escaped in path eval in Sql2Generator.php
diff --git a/src/PHPCR/Util/QOM/Sql2Generator.php b/src/PHPCR/Util/QOM/Sql2Generator.php
@@ -325,7 +325,7 @@ public function evalPath($path)
             $sql2 = $path;
             // only ensure proper quoting if the user did not quote himself, we trust him to get it right if he did.
             if (substr($path, 0,1) !== '[' && substr($path, -1) !== ']') {
-                if (false !== strpos($sql2, ' ')) {
+                if (false !== strpos($sql2, ' ') || false !== strpos($sql2, '.')) {
                     $sql2 = '"' . $sql2 . '"';
                 }
                 $sql2 = '[' . $sql2 . ']';

Original file line number	Diff line number	Diff line change
`@@ -325,7 +325,7 @@ public function evalPath($path)`
`325`	`325`	`$sql2 = $path;`
`326`	`326`	`// only ensure proper quoting if the user did not quote himself, we trust him to get it right if he did.`
`327`	`327`	`if (substr($path, 0,1) !== '[' && substr($path, -1) !== ']') {`
`328`		`- if (false !== strpos($sql2, ' ')) {`
	`328`	`+ if (false !== strpos($sql2, ' ') \|\| false !== strpos($sql2, '.')) {`
`329`	`329`	`$sql2 = '"' . $sql2 . '"';`
`330`	`330`	`}`
`331`	`331`	`$sql2 = '[' . $sql2 . ']';`