Can't deploy: ERROR: column "id" of relation "setting" already exists

[pdurbin]

Caused by: org.flywaydb.core.internal.sqlscript.FlywaySqlScriptException:
Migration V4.16.0.1__5303-addColumn-to-settingTable.sql failed

SQL State : 42701
Error Code : 0
Message : ERROR: column "id" of relation "setting" already exists
Location : db/migration/V4.16.0.1__5303-addColumn-to-settingTable.sql (/usr/local/glassfish4/glassfish/domains/domain1/applications/da
taverse/WEB-INF/classes/db/migration/V4.16.0.1__5303-addColumn-to-settingTable.sql)
Line : 3
Statement : ALTER TABLE setting ADD COLUMN ID SERIAL PRIMARY KEY

[pdurbin]

I'm on 6dd0cfc but I suspect others might be affected (on "develop" for example) if they drop their database like I just did.

I believe the fix is our (new) usual "IF NOT EXISTS" fix. Does that sound right @scolapasta @landreev ?

[pdurbin]

This one too:

Caused by: org.flywaydb.core.internal.sqlscript.FlywaySqlScriptException:
Migration V4.16.0.1__5303-addColumn-to-settingTable.sql failed

SQL State : 42701
Error Code : 0
Message : ERROR: column "lang" of relation "setting" already exists
Location : db/migration/V4.16.0.1__5303-addColumn-to-settingTable.sql (/usr/local/glassfish4/glassfish/domains/domain1/applications/dataverse/WEB-INF/classes/db/migration/V4.16.0.1__5303-addColumn-to-settingTable.sql)
Line : 5
Statement : ALTER TABLE setting ADD COLUMN lang text

[pdurbin]

Same trouble on phoenix on "develop". Can't deploy. It's on 9f41601. Here's a screenshot:

[pdurbin]

I just made pull request #6166 and I think new installations won't work without a fix like this.

[pdurbin]

Oh, and API tests on phoenix are down because the war file can't be deployed: