Wrong indentation for more conditions in JOIN

When JOIN uses more conditions, it gets formatted as:

```
FROM 
    data as d
    JOIN more as m ON d.id = m.id
    AND d.name = m.name
```

Better would be (more compressed)

```
FROM 
    data as d
    JOIN more as m ON d.id = m.id AND d.name = m.name
```

or (less compressed)

```
FROM 
    data as d
    JOIN more as m 
        ON d.id = m.id 
        AND d.name = m.name
```
