countAllResults(true, false)

nowackipawel · web-flow · commit 178fb178fb28 · 2018-09-13T18:07:48.000+02:00
Additional bug fix: ErrorException Undefined variable: orderby
in call: $builder-&gt;countAllResults(true,   true|false) when  $this-&gt;QBOrderBy is empty.
diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
@@ -1451,6 +1451,7 @@ public function countAllResults($reset = true, $test = false)
 		// ORDER BY usage is often problematic here (most notably
 		// on Microsoft SQL Server) and ultimately unnecessary
 		// for selecting COUNT(*) ...
+		$orderby = [];
 		if ( ! empty($this->QBOrderBy))
 		{
 			$orderby = $this->QBOrderBy;
@@ -1474,7 +1475,7 @@ public function countAllResults($reset = true, $test = false)
 		// If we've previously reset the QBOrderBy values, get them back
 		elseif ( ! isset($this->QBOrderBy))
 		{
-			$this->QBOrderBy = $orderby;
+			$this->QBOrderBy = $orderby??[];
 		}
 
 		$row = (! $result instanceof ResultInterface)

Original file line number	Diff line number	Diff line change
`@@ -1451,6 +1451,7 @@ public function countAllResults($reset = true, $test = false)`
`1451`	`1451`	`// ORDER BY usage is often problematic here (most notably`
`1452`	`1452`	`// on Microsoft SQL Server) and ultimately unnecessary`
`1453`	`1453`	`// for selecting COUNT(*) ...`
	`1454`	`+ $orderby = [];`
`1454`	`1455`	`if ( ! empty($this->QBOrderBy))`
`1455`	`1456`	`{`
`1456`	`1457`	`$orderby = $this->QBOrderBy;`
`@@ -1474,7 +1475,7 @@ public function countAllResults($reset = true, $test = false)`
`1474`	`1475`	`// If we've previously reset the QBOrderBy values, get them back`
`1475`	`1476`	`elseif ( ! isset($this->QBOrderBy))`
`1476`	`1477`	`{`
`1477`		`- $this->QBOrderBy = $orderby;`
	`1478`	`+ $this->QBOrderBy = $orderby??[];`
`1478`	`1479`	`}`
`1479`	`1480`
`1480`	`1481`	`$row = (! $result instanceof ResultInterface)`