Merge remote-tracking branch 'upstream/master'

3 files changed, 125 insertions, 0 deletions

diff --git a/schema/changelog-3.8.xml b/schema/changelog-3.8.xml
index 304ac21d4..120ddf5cc 100644
--- a/schema/changelog-3.8.xml
+++ b/schema/changelog-3.8.xml
@@ -39,5 +39,92 @@
       <where>speedunit = 'kmh'</where>
     </update>
 
+    <createTable tableName="statistics">
+      <column name="id" type="INT" autoIncrement="true">
+        <constraints primaryKey="true" />
+      </column>
+      <column name="capturetime" type="TIMESTAMP">
+        <constraints nullable="false" />
+      </column>
+      <column name="activeusers" type="INT" defaultValueNumeric="0">
+        <constraints nullable="false" />
+      </column>
+      <column name="activedevices" type="INT" defaultValueNumeric="0">
+        <constraints nullable="false" />
+      </column>
+      <column name="requests" type="INT" defaultValueNumeric="0">
+        <constraints nullable="false" />
+      </column>
+      <column name="messagesreceived" type="INT" defaultValueNumeric="0">
+        <constraints nullable="false" />
+      </column>
+      <column name="messagesstored" type="INT" defaultValueNumeric="0">
+        <constraints nullable="false" />
+      </column>
+      <column name="attributes" type="VARCHAR(4000)">
+        <constraints nullable="false" />
+      </column>
+    </createTable>
+
+    <modifyDataType tableName="server" columnName="mapurl" newDataType="VARCHAR(512)" />
+
+    <addColumn tableName="server">
+      <column name="forcesettings" type="BOOLEAN" defaultValueBoolean="false">
+        <constraints nullable="false" />
+      </column>
+    </addColumn>
+
+    <addColumn tableName="users">
+      <column name="coordinateformat" type="VARCHAR(128)" />
+    </addColumn>
+    <addColumn tableName="server">
+      <column name="coordinateformat" type="VARCHAR(128)" />
+    </addColumn>
+
+    <dropNotNullConstraint tableName="positions" columnName="attributes" columnDataType="VARCHAR(4096)" />
+    <modifyDataType tableName="positions" columnName="attributes" newDataType="VARCHAR(4000)" />
+    <dropNotNullConstraint tableName="events" columnName="attributes" columnDataType="VARCHAR(4096)" />
+    <modifyDataType tableName="events" columnName="attributes" newDataType="VARCHAR(4000)" />
+    <dropNotNullConstraint tableName="geofences" columnName="attributes" columnDataType="VARCHAR(4096)" />
+    <modifyDataType tableName="geofences" columnName="attributes" newDataType="VARCHAR(4000)" />
+    <dropNotNullConstraint tableName="notifications" columnName="attributes" columnDataType="VARCHAR(4096)" />
+    <modifyDataType tableName="notifications" columnName="attributes" newDataType="VARCHAR(4000)" />
+    <modifyDataType tableName="users" columnName="attributes" newDataType="VARCHAR(4000)" />
+    <modifyDataType tableName="devices" columnName="attributes" newDataType="VARCHAR(4000)" />
+    <modifyDataType tableName="groups" columnName="attributes" newDataType="VARCHAR(4000)" />
+    <modifyDataType tableName="server" columnName="attributes" newDataType="VARCHAR(4000)" />
+
+    <addColumn tableName="devices">
+      <column name="phone" type="VARCHAR(128)" />
+    </addColumn>
+    <addColumn tableName="devices">
+      <column name="model" type="VARCHAR(128)" />
+    </addColumn>
+    <addColumn tableName="devices">
+      <column name="contact" type="VARCHAR(512)" />
+    </addColumn>
+    <addColumn tableName="devices">
+      <column name="category" type="VARCHAR(128)" />
+    </addColumn>
+
+    <addColumn tableName="users">
+      <column name="disabled" type="BOOLEAN" defaultValueBoolean="false" />
+    </addColumn>
+    <addColumn tableName="users">
+      <column name="expirationtime" type="TIMESTAMP" />
+    </addColumn>
+    <addColumn tableName="users">
+      <column name="devicelimit" type="INT" defaultValueNumeric="0" />
+    </addColumn>
+    <addColumn tableName="users">
+      <column name="token" type="VARCHAR(128)" />
+    </addColumn>
+
+  </changeSet>
+
+  <changeSet author="author" id="changelog-3.8-dropuniquetoken" failOnError="false">
+
+    <dropUniqueConstraint tableName="users" uniqueColumns="token" constraintName="uk_user_token" />
+
   </changeSet>
 </databaseChangeLog>
diff --git a/schema/changelog-3.9.xml b/schema/changelog-3.9.xml
new file mode 100644
index 000000000..93fa6123b
--- /dev/null
+++ b/schema/changelog-3.9.xml
@@ -0,0 +1,37 @@
+<?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.9">
+
+  <changeSet author="author" id="changelog-3.9">
+
+    <addColumn tableName="notifications">
+      <column name="web" type="BOOLEAN" defaultValueBoolean="false" />
+      <column name="mail" type="BOOLEAN" defaultValueBoolean="false" />
+    </addColumn>
+
+    <update tableName="notifications">
+        <column name="web" valueBoolean="true" />
+        <where>attributes = '{"web":"true"}'</where>
+    </update>
+
+    <update tableName="notifications">
+        <column name="mail" valueBoolean="true" />
+        <where>attributes = '{"mail":"true"}'</where>
+    </update>
+
+    <update tableName="notifications">
+        <column name="web" valueBoolean="true" />
+        <column name="mail" valueBoolean="true" />
+        <where>attributes = '{"web":"true","mail":"true"}'</where>
+    </update>
+
+    <update tableName="notifications">
+        <column name="attributes" value="{}" />
+    </update>
+
+  </changeSet>
+</databaseChangeLog>
diff --git a/schema/changelog-master.xml b/schema/changelog-master.xml
index 341714ca8..448015568 100644
--- a/schema/changelog-master.xml
+++ b/schema/changelog-master.xml
@@ -10,4 +10,5 @@
   <include file="changelog-3.6.xml" relativeToChangelogFile="true" />
   <include file="changelog-3.7.xml" relativeToChangelogFile="true" />
   <include file="changelog-3.8.xml" relativeToChangelogFile="true" />
+  <include file="changelog-3.9.xml" relativeToChangelogFile="true" />
 </databaseChangeLog>