Merge pull request #89 from phpcr/fix_ampersand_handling

lsmith77 · lsmith77 · commit 0e829ce8dd0b · 2013-10-08T07:42:19.000-07:00
deal with ampersand when parsing queries
diff --git a/src/PHPCR/Util/QOM/Sql2Scanner.php b/src/PHPCR/Util/QOM/Sql2Scanner.php
@@ -75,7 +75,8 @@ public function lookupNextToken($offset = 0)
      */
     public function getPreviousDelimiter()
     {
-        return $this->delimiters[$this->curpos - 1];
+
+        return isset($this->delimiters[$this->curpos - 1]) ? $this->delimiters[$this->curpos - 1] : ' ';
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,8 @@ public function lookupNextToken($offset = 0)`
`75`	`75`	`*/`
`76`	`76`	`public function getPreviousDelimiter()`
`77`	`77`	`{`
`78`		`- return $this->delimiters[$this->curpos - 1];`
	`78`	`+`
	`79`	`+ return isset($this->delimiters[$this->curpos - 1]) ? $this->delimiters[$this->curpos - 1] : ' ';`
`79`	`80`	`}`
`80`	`81`
`81`	`82`	`/**`