diff options
| -rw-r--r-- | schema/changelog-3.6.xml | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/schema/changelog-3.6.xml b/schema/changelog-3.6.xml index 8fe48fca6..3de7e2c0f 100644 --- a/schema/changelog-3.6.xml +++ b/schema/changelog-3.6.xml @@ -30,9 +30,6 @@ <addColumn tableName="devices"> <column name="motion" type="VARCHAR(128)" /> </addColumn> - <addColumn tableName="devices"> - <column name="geofenceId" type="INT" /> - </addColumn> <createTable tableName="geofences"> <column name="id" type="INT" autoIncrement="true"> @@ -74,10 +71,7 @@ <addForeignKeyConstraint baseTableName="group_geofence" baseColumnNames="groupid" constraintName="fk_group_geofence_groupid" referencedTableName="groups" referencedColumnNames="id" onDelete="CASCADE" /> <addForeignKeyConstraint baseTableName="group_geofence" baseColumnNames="geofenceid" constraintName="fk_group_geofence_geofenceid" referencedTableName="geofences" referencedColumnNames="id" onDelete="CASCADE" /> - <createTable tableName="user_device_geofence"> - <column name="userid" type="INT"> - <constraints nullable="false" /> - </column> + <createTable tableName="device_geofence"> <column name="deviceid" type="INT"> <constraints nullable="false" /> </column> @@ -86,9 +80,8 @@ </column> </createTable> - <addForeignKeyConstraint baseTableName="user_device_geofence" baseColumnNames="userid" constraintName="fk_user_device_geofence_userid" referencedTableName="users" referencedColumnNames="id" onDelete="CASCADE" /> - <addForeignKeyConstraint baseTableName="user_device_geofence" baseColumnNames="deviceid" constraintName="fk_user_device_geofence_deviceid" referencedTableName="devices" referencedColumnNames="id" onDelete="CASCADE" /> - <addForeignKeyConstraint baseTableName="user_device_geofence" baseColumnNames="geofenceid" constraintName="fk_user_device_geofence_geofenceid" referencedTableName="geofences" referencedColumnNames="id" onDelete="CASCADE" /> + <addForeignKeyConstraint baseTableName="device_geofence" baseColumnNames="deviceid" constraintName="fk_user_device_geofence_deviceid" referencedTableName="devices" referencedColumnNames="id" onDelete="CASCADE" /> + <addForeignKeyConstraint baseTableName="device_geofence" baseColumnNames="geofenceid" constraintName="fk_user_device_geofence_geofenceid" referencedTableName="geofences" referencedColumnNames="id" onDelete="CASCADE" /> </changeSet> </databaseChangeLog> |