3 files changed, 45 insertions, 1 deletions
diff --git a/schema/changelog-3.7.xml b/schema/changelog-3.7.xml
index d82dbe91b..1bae2aaff 100644
--- a/schema/changelog-3.7.xml
+++ b/schema/changelog-3.7.xml
@@ -17,7 +17,7 @@
 
     <update tableName="groups">
       <column name="groupid"/>
-      <where>groupid NOT IN (SELECT id FROM (SELECT id FROM groups) AS groups_ids)</where>
+      <where>groupid NOT IN (SELECT id FROM (SELECT DISTINCT id FROM groups) AS groups_ids)</where>
     </update>
 
     <addColumn tableName="devices">
diff --git a/schema/changelog-3.8.xml b/schema/changelog-3.8.xml
new file mode 100644
index 000000000..304ac21d4
--- /dev/null
+++ b/schema/changelog-3.8.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<databaseChangeLog
+  xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
+                      http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd"
+  logicalFilePath="changelog-3.8">
+
+  <changeSet author="author" id="changelog-3.8">
+
+    <createTable tableName="attribute_aliases">
+      <column name="id" type="INT" autoIncrement="true">
+        <constraints primaryKey="true" />
+      </column>
+      <column name="deviceid" type="INT">
+        <constraints nullable="false" />
+      </column>
+      <column name="attribute" type="VARCHAR(128)">
+        <constraints nullable="false" />
+      </column>
+      <column name="alias" type="VARCHAR(128)">
+        <constraints nullable="false" />
+      </column>
+    </createTable>
+    
+    <addForeignKeyConstraint baseTableName="attribute_aliases" baseColumnNames="deviceid" constraintName="fk_attribute_aliases_deviceid" referencedTableName="devices" referencedColumnNames="id" onDelete="CASCADE" />
+    <addUniqueConstraint tableName="attribute_aliases" columnNames="deviceid, attribute" constraintName="uk_deviceid_attribute" />
+
+    <update tableName="users">
+      <column name="map" type="VARCHAR(128)"/>
+      <where>map = 'osm'</where>
+    </update>
+    <update tableName="users">
+      <column name="distanceunit" type="VARCHAR(128)"/>
+      <where>distanceunit = 'km'</where>
+    </update>
+    <update tableName="users">
+      <column name="speedunit" type="VARCHAR(128)"/>
+      <where>speedunit = 'kmh'</where>
+    </update>
+
+  </changeSet>
+</databaseChangeLog>
diff --git a/schema/changelog-master.xml b/schema/changelog-master.xml
index 3b62537d0..341714ca8 100644
--- a/schema/changelog-master.xml
+++ b/schema/changelog-master.xml
@@ -9,4 +9,5 @@
   <include file="changelog-3.5.xml" relativeToChangelogFile="true" />
   <include file="changelog-3.6.xml" relativeToChangelogFile="true" />
   <include file="changelog-3.7.xml" relativeToChangelogFile="true" />
+  <include file="changelog-3.8.xml" relativeToChangelogFile="true" />
 </databaseChangeLog>