diff options
author | duke2906 <philipp.prangenberg@gmail.com> | 2016-09-26 15:09:20 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-09-26 15:09:20 +0200 |
commit | 960bf899414d89221e92138fdb98777c3f4f73ec (patch) | |
tree | 87f5fd96185aa5f2fff0f84e2e2fa8be379ee837 /schema | |
parent | 0d3c05a24992eeeba02032e474d3a9bbb3239f10 (diff) | |
parent | aaec58aec04256845dc37afd713b488071b1406b (diff) | |
download | trackermap-server-960bf899414d89221e92138fdb98777c3f4f73ec.tar.gz trackermap-server-960bf899414d89221e92138fdb98777c3f4f73ec.tar.bz2 trackermap-server-960bf899414d89221e92138fdb98777c3f4f73ec.zip |
Merge pull request #1 from tananaev/master
Update Changes, including version 3.7
Diffstat (limited to 'schema')
-rw-r--r-- | schema/changelog-3.7.xml | 2 | ||||
-rw-r--r-- | schema/changelog-3.8.xml | 43 | ||||
-rw-r--r-- | schema/changelog-master.xml | 1 |
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> |