Prettier SQL formatting

Author: phpfui

src/PHPFUI/ORM/Table.php

@@ -416,15 +416,15 @@ public function getGroupBy() : string
 			}
 
 		$comma = '';
-		$retVal = ' GROUP BY';
+		$retVal = "\nGROUP BY";
 		$addRollup = 0;
 
 		foreach ($this->groupBys as $field => $rollup)
 			{
 			$parts = \explode('.', $field);
 			$field = \implode('`.`', $parts);
 			$retVal .= "{$comma} `{$field}`";
-			$comma = ',';
+			$comma = ",\n";
 
 			$addRollup |= (int)$rollup;
 			}
@@ -453,7 +453,7 @@ public function getHaving(array &$input) : string
 
 		$input = \array_merge($input, $this->havingCondition->getInput());
 
-		return ' HAVING ' . $this->havingCondition;
+		return "\nHAVING " . $this->havingCondition;
 		}
 
 	public function getHavingCondition() : \PHPFUI\ORM\Condition
@@ -495,7 +495,7 @@ public function getLimitClause() : string
 		// could just be a string, return it
 		if ($this->limit && ! $this->offset && null === $this->page)
 			{
-			return ' LIMIT ' . $this->limit;
+			return "\nLIMIT {$this->limit}";
 			}
 
 		if (! $this->limit)
@@ -515,7 +515,7 @@ public function getLimitClause() : string
 			}
 		$this->offset = $offset;
 
-		return " LIMIT {$offset}, {$this->limit}";
+		return "\nLIMIT {$offset}, {$this->limit}";
 		}
 
 	public function getOffset() : ?int
@@ -534,7 +534,7 @@ public function getOrderBy() : string
 			}
 
 		$comma = '';
-		$retVal = ' ORDER BY';
+		$retVal = "\nORDER BY";
 
 		foreach ($this->orderBys as $field => $direction)
 			{
@@ -607,7 +607,7 @@ public function getSelect() : string
 
 			$columns = [];
 			// make explicit column names for joined tables since we don't have explicit selects
-			$sql = "`{$this->instance->getTableName()}`.*";
+			$sql = "\n`{$this->instance->getTableName()}`.*";
 			// set column names from explicit select
 			foreach ($this->getFields() as $field => $data)
 				{
@@ -625,11 +625,11 @@ public function getSelect() : string
 					{
 					if (isset($columns[$field]))
 						{
-						$sql .= ",`{$tableName}`.`{$field}` as `{$tableName}_{$field}`";
+						$sql .= ",\n`{$tableName}`.`{$field}` as `{$tableName}_{$field}`";
 						}
 					else
 						{
-						$sql .= ",`{$tableName}`.`{$field}`";
+						$sql .= ",\n`{$tableName}`.`{$field}`";
 						$columns[$field] = true;
 						}
 					}
@@ -639,7 +639,7 @@ public function getSelect() : string
 				{
 				return $sql;
 				}
-			$comma = ',';
+			$comma = ",\n";
 			}
 
 		foreach ($this->selects as $field => $as)
@@ -650,7 +650,7 @@ public function getSelect() : string
 				{
 				$sql .= ' as `' . $as . '`';
 				}
-			$comma = ',';
+			$comma = ",\n";
 			}
 		$sql = \str_replace('`*`', '*', $sql);
 
@@ -672,7 +672,7 @@ public function getSQL(array &$input, bool $limited = true) : string
 		$having = $this->getHaving($input);
 		$orderBy = $this->getOrderBy();
 		$limit = $this->getLimitClause();
-		$sql = "SELECT {$this->distinct} {$select} FROM `{$table}`" . $joins . $where . $groupBy . $having;
+		$sql = "SELECT {$this->distinct} {$select}\nFROM `{$table}`" . $joins . $where . $groupBy . $having;
 
 		if ($this->unions)
 			{
@@ -719,7 +719,7 @@ public function getWhere(array &$input) : string
 
 		$input = \array_merge($input, $this->whereCondition->getInput());
 
-		return ' WHERE ' . $this->whereCondition;
+		return "\nWHERE " . $this->whereCondition;
 		}
 
 	public function getWhereCondition() : \PHPFUI\ORM\Condition
@@ -752,7 +752,7 @@ public function insert(array $records, string $ignore = '') : bool
 		foreach ($fields as $fieldName)
 			{
 			$sql .= "{$comma}`{$fieldName}`";
-			$comma = ',';
+			$comma = ",\n";
 			}
 
 		$sql .= ') values ';
@@ -773,7 +773,7 @@ public function insert(array $records, string $ignore = '') : bool
 			foreach ($fields as $fieldName)
 				{
 				$sql .= $comma . '?';
-				$comma = ',';
+				$comma = ",\n";
 				$input[] = $record[$fieldName];
 				}
 			$comma = '),(';
@@ -965,7 +965,7 @@ public function update(array $variables) : static
 			{
 			$this->lastSql .= "{$comma} `{$field}`=?";
 			$this->lastInput[] = $value;
-			$comma = ',';
+			$comma = ",\n";
 			}
 
 		$where = $this->getWhere($this->lastInput);
@@ -1062,7 +1062,7 @@ private function getJoins(array &$input) : string
 			$onCondition = $joinInfo[1];
 			$joinType = $joinInfo[2];
 			$input = \array_merge($input, $onCondition->getInput());
-			$joins .= " {$joinType} JOIN `{$joinTableName}`{$as} ON {$onCondition}";
+			$joins .= "\n{$joinType} JOIN `{$joinTableName}`{$as} ON {$onCondition}";
 			}
 
 		return $joins;