Compare commits
	
		
			No commits in common. "8bf495c89b4ce1456da1133adc285003e544dd48" and "4283bc9bb15d17914393b4ba3463d83717487c53" have entirely different histories.
		
	
	
		
			8bf495c89b
			...
			4283bc9bb1
		
	
		
@ -97,28 +97,28 @@ class Select
 | 
				
			|||||||
        return $this;
 | 
					        return $this;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    public function where($column, ?string $relation = null, $value = null): Select
 | 
					    public function where($column, string $relation = null, $value = null): Select
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
        $this->addWhereCondition('AND', $column, $relation, $value);
 | 
					        $this->addWhereCondition('AND', $column, $relation, $value);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        return $this;
 | 
					        return $this;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    public function orWhere($column, ?string $relation = null, $value = null): Select
 | 
					    public function orWhere($column, string $relation = null, $value = null): Select
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
        $this->addWhereCondition('OR', $column, $relation, $value);
 | 
					        $this->addWhereCondition('OR', $column, $relation, $value);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        return $this;
 | 
					        return $this;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    public function having($column, ?string $relation = null, $value = null): Select
 | 
					    public function having($column, string $relation = null, $value = null): Select
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
        $this->addHavingCondition('AND', $column, $relation, $value);
 | 
					        $this->addHavingCondition('AND', $column, $relation, $value);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        return $this;
 | 
					        return $this;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    public function orHaving($column, ?string $relation = null, $value = null): Select
 | 
					    public function orHaving($column, string $relation = null, $value = null): Select
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
        $this->addHavingCondition('OR', $column, $relation, $value);
 | 
					        $this->addHavingCondition('OR', $column, $relation, $value);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -211,12 +211,12 @@ class Select
 | 
				
			|||||||
        $this->joins[] = [$type, $table, $column1, $relation, $column2];
 | 
					        $this->joins[] = [$type, $table, $column1, $relation, $column2];
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    private function addWhereCondition(string $logic, $column, ?string $relation, $value): void
 | 
					    private function addWhereCondition(string $logic, $column, string $relation, $value): void
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
        $this->conditions[self::CONDITION_WHERE][] = [$logic, $column, $relation, $value];
 | 
					        $this->conditions[self::CONDITION_WHERE][] = [$logic, $column, $relation, $value];
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    private function addHavingCondition(string $logic, $column, ?string $relation, $value): void
 | 
					    private function addHavingCondition(string $logic, $column, string $relation, $value): void
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
        $this->conditions[self::CONDITION_HAVING][] = [$logic, $column, $relation, $value];
 | 
					        $this->conditions[self::CONDITION_HAVING][] = [$logic, $column, $relation, $value];
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user