Resolve BUG in _fromTables()

pjsde · web-flow · commit 8ed37c1a02d1 · 2019-08-30T16:30:04.000+01:00
When there are JOINs and more than one table exists, the FROM clause must be enclosed in parentheses, otherwise an error occurs if a JOIN does not refer to the last table.
diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
@@ -1994,6 +1994,11 @@ protected function _replace(string $table, array $keys, array $values): string
 	 */
 	protected function _fromTables(): string
 	{
+		if ( ! empty($this->QBJoin) && count($this->QBFrom) > 1)
+		{
+			return '('.implode(', ', $this->QBFrom).')';
+		}
+		
 		return implode(', ', $this->QBFrom);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -1994,6 +1994,11 @@ protected function _replace(string $table, array $keys, array $values): string`
`1994`	`1994`	`*/`
`1995`	`1995`	`protected function _fromTables(): string`
`1996`	`1996`	`{`
	`1997`	`+ if ( ! empty($this->QBJoin) && count($this->QBFrom) > 1)`
	`1998`	`+ {`
	`1999`	`+ return '('.implode(', ', $this->QBFrom).')';`
	`2000`	`+ }`
	`2001`	`+`
`1997`	`2002`	`return implode(', ', $this->QBFrom);`
`1998`	`2003`	`}`
`1999`	`2004`