From 4aea55186a2374350f825cf2008847ce4c5ae87c Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Fri, 27 Apr 2018 17:06:27 +1200
Subject: Rename admin to administrator (fix #3858)

---
 schema/changelog-3.17.xml | 12 ++++++++++++
 schema/changelog-3.3.xml  |  4 ++--
 2 files changed, 14 insertions(+), 2 deletions(-)

(limited to 'schema')

diff --git a/schema/changelog-3.17.xml b/schema/changelog-3.17.xml
index ef296fe25..54c3db531 100644
--- a/schema/changelog-3.17.xml
+++ b/schema/changelog-3.17.xml
@@ -6,6 +6,18 @@
                       http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd"
   logicalFilePath="changelog-3.17">
 
+  <changeSet author="author" id="changelog-3.3-admin">
+
+    <preConditions onFail="MARK_RAN">
+      <not>
+        <columnExists tableName="administrator" columnName="admin" />
+      </not>
+    </preConditions>
+
+    <renameColumn tableName="users" columnDataType="BOOLEAN" oldColumnName="admin" newColumnName="administrator" />
+
+  </changeSet>
+
   <changeSet author="author" id="changelog-3.17">
 
     <addColumn tableName="events">
diff --git a/schema/changelog-3.3.xml b/schema/changelog-3.3.xml
index 6ed8cecaa..e5f29c661 100644
--- a/schema/changelog-3.3.xml
+++ b/schema/changelog-3.3.xml
@@ -33,7 +33,7 @@
       <column name="readonly" type="BOOLEAN" defaultValueBoolean="false">
         <constraints nullable="false" />
       </column>
-      <column name="admin" type="BOOLEAN" defaultValueBoolean="false">
+      <column name="administrator" type="BOOLEAN" defaultValueBoolean="false">
         <constraints nullable="false" />
       </column>
       <column name="map" type="VARCHAR(128)" defaultValue="osm">
@@ -181,7 +181,7 @@
       <column name="email" value="admin" />
       <column name="hashedpassword" value="D33DCA55ABD4CC5BC76F2BC0B4E603FE2C6F61F4C1EF2D47" />
       <column name="salt" value="000000000000000000000000000000000000000000000000" />
-      <column name="admin" valueBoolean="true" />
+      <column name="administrator" valueBoolean="true" />
     </insert>
 
   </changeSet>
-- 
cgit v1.2.3