feature/use-the-same-table-in-multiple-joins #14
@ -276,13 +276,12 @@ class Select
 | 
			
		||||
            return [(string) $table, $params];
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        if ($table instanceof Select)
 | 
			
		||||
        {
 | 
			
		||||
        if ($table instanceof Select) {
 | 
			
		||||
            return $table->generateQuery();
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        if (isset($this->tableAliases[$table])) {
 | 
			
		||||
            $queryString = ($defineAlias ? Utils::backtick($this->tableAliases[$table]) . ' ' . Utils::backtick($table) : Utils::backtick($table));
 | 
			
		||||
            $queryString = $defineAlias ? Utils::backtick($this->tableAliases[$table]) . ' ' . Utils::backtick($table) : Utils::backtick($table);
 | 
			
		||||
            return [$queryString, $params];
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
@ -295,24 +294,17 @@ class Select
 | 
			
		||||
            return (string) $column;
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        if (is_array($column)) {
 | 
			
		||||
            $out = '';
 | 
			
		||||
 | 
			
		||||
            if ($column[0]) {
 | 
			
		||||
                list($tableName, $params) = $this->generateTable($column[0]);
 | 
			
		||||
                $out .= $tableName . '.';
 | 
			
		||||
            }
 | 
			
		||||
 | 
			
		||||
            $out .= Utils::backtick($column[1]);
 | 
			
		||||
 | 
			
		||||
            if (!empty($column[2])) {
 | 
			
		||||
                $out .= ' ' . Utils::backtick($column[2]);
 | 
			
		||||
            }
 | 
			
		||||
 | 
			
		||||
            return $out;
 | 
			
		||||
        } else {
 | 
			
		||||
            return Utils::backtick($column);
 | 
			
		||||
        if (!is_array($column)) {
 | 
			
		||||
            $column = [$this->table, $column];
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        list($tableName, $params) = $this->generateTable($column[0]);
 | 
			
		||||
        $out = $tableName . '.' . Utils::backtick($column[1]);
 | 
			
		||||
        if (!empty($column[2])) {
 | 
			
		||||
            $out .= ' ' . Utils::backtick($column[2]);
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        return $out;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    private function generateColumns(): string
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user