Better formatting of BETWEEN clause

[jdorn]

Right now, I add a line break before AND which works great most of the time. However it looks bad when using BETWEEN clauses.

WHERE
  1
  AND column BETWEEN "value1"
  AND "value2"
  AND column2 = "3"

Ideally, the first AND following a BETWEEN clause would not have a line break:

WHERE
  1
  AND column BETWEEN "value1" AND "value2"
  AND column2 = "3"