aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2015-12-19 10:04:10 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2015-12-19 10:04:10 +1300
commit3bb4c83e70e2898b20e3263c3700d15796caf4a6 (patch)
tree1028553914970261d5e4fd768e5ec45a003d20ce
parent0c9eaf0eb81f08d3769d399184480f960fe4fee0 (diff)
downloadtrackermap-server-3bb4c83e70e2898b20e3263c3700d15796caf4a6.tar.gz
trackermap-server-3bb4c83e70e2898b20e3263c3700d15796caf4a6.tar.bz2
trackermap-server-3bb4c83e70e2898b20e3263c3700d15796caf4a6.zip
Retain non-null constraints on columns
-rw-r--r--database/db.changelog-3.1.xml34
-rw-r--r--database/db.changelog-3.2.xml12
2 files changed, 46 insertions, 0 deletions
diff --git a/database/db.changelog-3.1.xml b/database/db.changelog-3.1.xml
index db171e6a8..9557f67e8 100644
--- a/database/db.changelog-3.1.xml
+++ b/database/db.changelog-3.1.xml
@@ -13,11 +13,19 @@
</not>
</preConditions>
+ <dropNotNullConstraint tableName="user" columnName="name" />
<modifyDataType tableName="user" columnName="name" newDataType="VARCHAR(128)" />
+ <addNotNullConstraint tableName="user" columnName="name" />
+ <dropNotNullConstraint tableName="user" columnName="email" />
<modifyDataType tableName="user" columnName="email" newDataType="VARCHAR(128)" />
+ <addNotNullConstraint tableName="user" columnName="email" />
+ <dropNotNullConstraint tableName="user" columnName="hashedPassword" />
<modifyDataType tableName="user" columnName="hashedPassword" newDataType="VARCHAR(128)" />
+ <addNotNullConstraint tableName="user" columnName="hashedPassword" />
+ <dropNotNullConstraint tableName="user" columnName="salt" />
<dropDefaultValue tableName="user" columnName="salt" />
<modifyDataType tableName="user" columnName="salt" newDataType="VARCHAR(128)" />
+ <addNotNullConstraint tableName="user" columnName="salt" />
<addDefaultValue tableName="user" columnName="salt" defaultValue="" />
<dropDefaultValue tableName="user" columnName="map" />
<dropNotNullConstraint tableName="user" columnName="map" columnDataType="VARCHAR(128)" />
@@ -31,25 +39,45 @@
<dropDefaultValue tableName="user" columnName="speedUnit" />
<dropNotNullConstraint tableName="user" columnName="speedUnit" columnDataType="VARCHAR(128)" />
<modifyDataType tableName="user" columnName="speedUnit" newDataType="VARCHAR(128)" />
+ <dropNotNullConstraint tableName="user" columnName="latitude" />
<dropDefaultValue tableName="user" columnName="latitude" />
<modifyDataType tableName="user" columnName="latitude" newDataType="FLOAT" />
+ <addNotNullConstraint tableName="user" columnName="latitude" />
<addDefaultValue tableName="user" columnName="latitude" defaultValueNumeric="0" />
+ <dropNotNullConstraint tableName="user" columnName="longitude" />
<dropDefaultValue tableName="user" columnName="longitude" />
<modifyDataType tableName="user" columnName="longitude" newDataType="FLOAT" />
+ <addNotNullConstraint tableName="user" columnName="longitude" />
<addDefaultValue tableName="user" columnName="longitude" defaultValueNumeric="0" />
+ <dropNotNullConstraint tableName="device" columnName="name" />
<modifyDataType tableName="device" columnName="name" newDataType="VARCHAR(128)" />
+ <addNotNullConstraint tableName="device" columnName="name" />
+ <dropNotNullConstraint tableName="device" columnName="uniqueId" />
<modifyDataType tableName="device" columnName="uniqueId" newDataType="VARCHAR(128)" />
+ <addNotNullConstraint tableName="device" columnName="uniqueId" />
<modifyDataType tableName="device" columnName="status" newDataType="VARCHAR(128)" />
<modifyDataType tableName="position" columnName="protocol" newDataType="VARCHAR(128)" />
+ <dropNotNullConstraint tableName="position" columnName="latitude" />
<modifyDataType tableName="position" columnName="latitude" newDataType="FLOAT" />
+ <addNotNullConstraint tableName="position" columnName="latitude" />
+ <dropNotNullConstraint tableName="position" columnName="longitude" />
<modifyDataType tableName="position" columnName="longitude" newDataType="FLOAT" />
+ <addNotNullConstraint tableName="position" columnName="longitude" />
+ <dropNotNullConstraint tableName="position" columnName="altitude" />
<modifyDataType tableName="position" columnName="altitude" newDataType="FLOAT" />
+ <addNotNullConstraint tableName="position" columnName="altitude" />
+ <dropNotNullConstraint tableName="position" columnName="speed" />
<modifyDataType tableName="position" columnName="speed" newDataType="FLOAT" />
+ <addNotNullConstraint tableName="position" columnName="speed" />
+ <dropNotNullConstraint tableName="position" columnName="course" />
<modifyDataType tableName="position" columnName="course" newDataType="FLOAT" />
+ <addNotNullConstraint tableName="position" columnName="course" />
<modifyDataType tableName="position" columnName="address" newDataType="VARCHAR(512)" />
+ <dropNotNullConstraint tableName="position" columnName="other" />
<modifyDataType tableName="position" columnName="other" newDataType="VARCHAR(4096)" />
+ <addNotNullConstraint tableName="position" columnName="other" />
<createIndex tableName="position" indexName="position_deviceId_fixTime">
<column name="deviceId" />
@@ -57,7 +85,9 @@
</createIndex>
<modifyDataType tableName="data" columnName="protocol" newDataType="VARCHAR(128)" />
+ <dropNotNullConstraint tableName="data" columnName="other" />
<modifyDataType tableName="data" columnName="other" newDataType="VARCHAR(4096)" />
+ <addNotNullConstraint tableName="data" columnName="other" />
<addColumn tableName="server">
<column name="map" type="VARCHAR(128)" />
@@ -71,9 +101,13 @@
<addColumn tableName="server">
<column name="speedUnit" type="VARCHAR(128)" />
</addColumn>
+ <dropNotNullConstraint tableName="server" columnName="latitude" />
<modifyDataType tableName="server" columnName="latitude" newDataType="FLOAT" />
+ <addNotNullConstraint tableName="server" columnName="latitude" />
<addDefaultValue tableName="server" columnName="latitude" defaultValueNumeric="0" />
+ <dropNotNullConstraint tableName="server" columnName="longitude" />
<modifyDataType tableName="server" columnName="longitude" newDataType="FLOAT" />
+ <addNotNullConstraint tableName="server" columnName="longitude" />
<addDefaultValue tableName="server" columnName="longitude" defaultValueNumeric="0" />
<dropTable tableName="traccar" />
diff --git a/database/db.changelog-3.2.xml b/database/db.changelog-3.2.xml
index bcf20c860..015c71588 100644
--- a/database/db.changelog-3.2.xml
+++ b/database/db.changelog-3.2.xml
@@ -13,17 +13,25 @@
</not>
</preConditions>
+ <dropNotNullConstraint tableName="user" columnName="latitude" />
<dropDefaultValue tableName="user" columnName="latitude" />
<modifyDataType tableName="user" columnName="latitude" newDataType="DOUBLE" />
+ <addNotNullConstraint tableName="user" columnName="latitude" />
<addDefaultValue tableName="user" columnName="latitude" defaultValueNumeric="0" />
+ <dropNotNullConstraint tableName="user" columnName="longitude" />
<dropDefaultValue tableName="user" columnName="longitude" />
<modifyDataType tableName="user" columnName="longitude" newDataType="DOUBLE" />
+ <addNotNullConstraint tableName="user" columnName="longitude" />
<addDefaultValue tableName="user" columnName="longitude" defaultValueNumeric="0" />
<dropColumn tableName="device" columnName="dataId" />
+ <dropNotNullConstraint tableName="position" columnName="latitude" />
<modifyDataType tableName="position" columnName="latitude" newDataType="DOUBLE" />
+ <addNotNullConstraint tableName="position" columnName="latitude" />
+ <dropNotNullConstraint tableName="position" columnName="longitude" />
<modifyDataType tableName="position" columnName="longitude" newDataType="DOUBLE" />
+ <addNotNullConstraint tableName="position" columnName="longitude" />
<renameColumn tableName="position" oldColumnName="other" newColumnName="attributes" columnDataType="VARCHAR(4096)" />
<dropTable tableName="data" />
@@ -34,8 +42,12 @@
<addColumn tableName="server">
<column name="mapUrl" type="VARCHAR(128)" />
</addColumn>
+ <dropNotNullConstraint tableName="server" columnName="latitude" />
<modifyDataType tableName="server" columnName="latitude" newDataType="DOUBLE" />
+ <addNotNullConstraint tableName="server" columnName="latitude" />
+ <dropNotNullConstraint tableName="server" columnName="longitude" />
<modifyDataType tableName="server" columnName="longitude" newDataType="DOUBLE" />
+ <addNotNullConstraint tableName="server" columnName="longitude" />
<update tableName="traccar">
<column name="version" valueNumeric="302" />