refactor(sql): works for upgrading from QB in addition to fresh installs

[Manason]

• Untested, will test this before merging.
• Moving the two new additions (new column & citizenid collation change) to its own statement. This makes the sql file work for those upgrading their db