diff options
| author | drecchia <danilo@deltatecnologia.com> | 2016-06-01 21:08:05 -0300 |
|---|---|---|
| committer | drecchia <danilo@deltatecnologia.com> | 2016-06-01 21:08:05 -0300 |
| commit | e4ba1ebf54838041fae352d95e399b1fb3483458 (patch) | |
| tree | 334626820ff4efa4583bb5257d19a18cd0ebf631 /database | |
| parent | 5df7c128af15e9d1021b7570f081185f14467f09 (diff) | |
| parent | d2c85b59bde4729d027ef1bb6e874d1fd1a02c68 (diff) | |
| download | traccar-server-e4ba1ebf54838041fae352d95e399b1fb3483458.tar.gz traccar-server-e4ba1ebf54838041fae352d95e399b1fb3483458.tar.bz2 traccar-server-e4ba1ebf54838041fae352d95e399b1fb3483458.zip | |
Merge branch 'master' of https://github.com/tananaev/traccar
Conflicts:
src/org/traccar/database/DataManager.java
Diffstat (limited to 'database')
| -rw-r--r-- | database/changelog-3.6.xml | 34 | ||||
| -rw-r--r-- | database/changelog-master.xml | 1 |
2 files changed, 35 insertions, 0 deletions
diff --git a/database/changelog-3.6.xml b/database/changelog-3.6.xml new file mode 100644 index 000000000..378ec741f --- /dev/null +++ b/database/changelog-3.6.xml @@ -0,0 +1,34 @@ +<?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"> + + <changeSet author="author" id="changelog-3.6"> + + <createTable tableName="events"> + <column name="id" type="INT" autoIncrement="true"> + <constraints primaryKey="true" /> + </column> + <column name="type" type="VARCHAR(128)"> + <constraints nullable="false" /> + </column> + <column name="servertime" type="TIMESTAMP"> + <constraints nullable="false" /> + </column> + <column name="deviceid" type="INT" /> + <column name="positionid" type="INT" /> + <column name="attributes" type="VARCHAR(4096)"> + <constraints nullable="false" /> + </column> + </createTable> + + <addForeignKeyConstraint baseTableName="events" baseColumnNames="deviceid" constraintName="fk_event_deviceid" referencedTableName="devices" referencedColumnNames="id" onDelete="CASCADE" /> + + <addColumn tableName="devices"> + <column name="motion" type="VARCHAR(128)" /> + </addColumn> + + </changeSet> +</databaseChangeLog> diff --git a/database/changelog-master.xml b/database/changelog-master.xml index 269a0da1a..399cd3c8d 100644 --- a/database/changelog-master.xml +++ b/database/changelog-master.xml @@ -7,4 +7,5 @@ <include file="changelog-3.3.xml" relativeToChangelogFile="true" /> <include file="changelog-3.5.xml" relativeToChangelogFile="true" /> + <include file="changelog-3.6.xml" relativeToChangelogFile="true" /> </databaseChangeLog> |