SqlsrvDriver::applyLimit(): supports keywords DISTINCT and ALL after SELECT

JosefDohnal · dg · commit b3b6e9bb7370 · 2015-09-14T13:25:45.000+02:00
diff --git a/src/Database/Drivers/MsSqlDriver.php b/src/Database/Drivers/MsSqlDriver.php
@@ -78,7 +78,7 @@ public function formatLike($value, $pos)
 	public function applyLimit(& $sql, $limit, $offset)
 	{
 		if ($limit >= 0) {
-			$sql = preg_replace('#^\s*(SELECT|UPDATE|DELETE)#i', '$0 TOP ' . (int) $limit, $sql, 1, $count);
+			$sql = preg_replace('#^\s*(SELECT(\s+DISTINCT|\s+ALL)?|UPDATE|DELETE)#i', '$0 TOP ' . (int) $limit, $sql, 1, $count);
 			if (!$count) {
 				throw new Nette\InvalidArgumentException('SQL query must begin with SELECT, UPDATE or DELETE command.');
 			}
diff --git a/src/Database/Drivers/OdbcDriver.php b/src/Database/Drivers/OdbcDriver.php
@@ -77,7 +77,7 @@ public function formatLike($value, $pos)
 	public function applyLimit(& $sql, $limit, $offset)
 	{
 		if ($limit >= 0) {
-			$sql = preg_replace('#^\s*(SELECT|UPDATE|DELETE)#i', '$0 TOP ' . (int) $limit, $sql, 1, $count);
+			$sql = preg_replace('#^\s*(SELECT(\s+DISTINCT|\s+ALL)?|UPDATE|DELETE)#i', '$0 TOP ' . (int) $limit, $sql, 1, $count);
 			if (!$count) {
 				throw new Nette\InvalidArgumentException('SQL query must begin with SELECT, UPDATE or DELETE command.');
 			}
diff --git a/src/Database/Drivers/SqlsrvDriver.php b/src/Database/Drivers/SqlsrvDriver.php
@@ -89,7 +89,7 @@ public function formatLike($value, $pos)
 	public function applyLimit(& $sql, $limit, $offset)
 	{
 		if ($limit >= 0) {
-			$sql = preg_replace('#^\s*(SELECT|UPDATE|DELETE)#i', '$0 TOP ' . (int) $limit, $sql, 1, $count);
+			$sql = preg_replace('#^\s*(SELECT(\s+DISTINCT|\s+ALL)?|UPDATE|DELETE)#i', '$0 TOP ' . (int) $limit, $sql, 1, $count);
 			if (!$count) {
 				throw new Nette\InvalidArgumentException('SQL query must begin with SELECT, UPDATE or DELETE command.');
 			}

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ public function formatLike($value, $pos)`
`78`	`78`	`public function applyLimit(& $sql, $limit, $offset)`
`79`	`79`	`{`
`80`	`80`	`if ($limit >= 0) {`
`81`		`- $sql = preg_replace('#^\s*(SELECT\|UPDATE\|DELETE)#i', '$0 TOP ' . (int) $limit, $sql, 1, $count);`
	`81`	`+ $sql = preg_replace('#^\s*(SELECT(\s+DISTINCT\|\s+ALL)?\|UPDATE\|DELETE)#i', '$0 TOP ' . (int) $limit, $sql, 1, $count);`
`82`	`82`	`if (!$count) {`
`83`	`83`	`throw new Nette\InvalidArgumentException('SQL query must begin with SELECT, UPDATE or DELETE command.');`
`84`	`84`	`}`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ public function formatLike($value, $pos)`
`77`	`77`	`public function applyLimit(& $sql, $limit, $offset)`
`78`	`78`	`{`
`79`	`79`	`if ($limit >= 0) {`
`80`		`- $sql = preg_replace('#^\s*(SELECT\|UPDATE\|DELETE)#i', '$0 TOP ' . (int) $limit, $sql, 1, $count);`
	`80`	`+ $sql = preg_replace('#^\s*(SELECT(\s+DISTINCT\|\s+ALL)?\|UPDATE\|DELETE)#i', '$0 TOP ' . (int) $limit, $sql, 1, $count);`
`81`	`81`	`if (!$count) {`
`82`	`82`	`throw new Nette\InvalidArgumentException('SQL query must begin with SELECT, UPDATE or DELETE command.');`
`83`	`83`	`}`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ public function formatLike($value, $pos)`
`89`	`89`	`public function applyLimit(& $sql, $limit, $offset)`
`90`	`90`	`{`
`91`	`91`	`if ($limit >= 0) {`
`92`		`- $sql = preg_replace('#^\s*(SELECT\|UPDATE\|DELETE)#i', '$0 TOP ' . (int) $limit, $sql, 1, $count);`
	`92`	`+ $sql = preg_replace('#^\s*(SELECT(\s+DISTINCT\|\s+ALL)?\|UPDATE\|DELETE)#i', '$0 TOP ' . (int) $limit, $sql, 1, $count);`
`93`	`93`	`if (!$count) {`
`94`	`94`	`throw new Nette\InvalidArgumentException('SQL query must begin with SELECT, UPDATE or DELETE command.');`
`95`	`95`	`}`