aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--database/db.changelog-3.0.xml180
-rw-r--r--database/db.changelog-3.1.xml6
-rw-r--r--database/db.changelog-3.2.xml6
-rw-r--r--database/db.changelog-master.xml6
-rw-r--r--src/org/traccar/database/DataManager.java25
5 files changed, 199 insertions, 24 deletions
diff --git a/database/db.changelog-3.0.xml b/database/db.changelog-3.0.xml
index b05ec6a03..bbc52dfeb 100644
--- a/database/db.changelog-3.0.xml
+++ b/database/db.changelog-3.0.xml
@@ -5,11 +5,183 @@
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog/1.9
http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-1.9.xsd">
- <changeSet author="authorName" id="changelog-1.0">
- <createTable tableName="TablesAndTables">
- <column name="COLUMN1" type="TEXT">
- <constraints nullable="true" primaryKey="false" unique="false"/>
+ <changeSet author="author" id="changelog-3.0">
+
+ <preConditions onFail="MARK_RAN">
+ <not>
+ <tableExists tableName="traccar" />
+ </not>
+ </preConditions>
+
+ <createTable tableName="user">
+ <column name="id" type="INT" autoIncrement="true">
+ <constraints primaryKey="true" />
+ </column>
+ <column name="name" type="VARCHAR(1024)">
+ <constraints nullable="false" />
+ </column>
+ <column name="email" type="VARCHAR(256)">
+ <constraints nullable="false" unique="true" />
+ </column>
+ <column name="hashedPassword" type="VARCHAR(1024)">
+ <constraints nullable="false" />
+ </column>
+ <column name="salt" type="VARCHAR(1024)" defaultValue="">
+ <constraints nullable="false" />
+ </column>
+ <column name="readonly" type="BOOLEAN" defaultValueBoolean="false">
+ <constraints nullable="false" />
+ </column>
+ <column name="admin" type="BOOLEAN" defaultValueBoolean="false">
+ <constraints nullable="false" />
+ </column>
+ <column name="map" type="VARCHAR(1024)" defaultValue="osm">
+ <constraints nullable="false" />
+ </column>
+ <column name="language" type="VARCHAR(1024)" defaultValue="en">
+ <constraints nullable="false" />
+ </column>
+ <column name="distanceUnit" type="VARCHAR(1024)" defaultValue="km">
+ <constraints nullable="false" />
+ </column>
+ <column name="latitude" type="DOUBLE" defaultValueNumeric="0">
+ <constraints nullable="false" />
+ </column>
+ <column name="longitude" type="DOUBLE" defaultValueNumeric="0">
+ <constraints nullable="false" />
+ </column>
+ <column name="zoom" type="INT" defaultValueNumeric="0">
+ <constraints nullable="false" />
+ </column>
+ </createTable>
+
+ <createTable tableName="device">
+ <column name="id" type="INT" autoIncrement="true">
+ <constraints primaryKey="true" />
+ </column>
+ <column name="name" type="VARCHAR(1024)">
+ <constraints nullable="false" />
+ </column>
+ <column name="uniqueId" type="VARCHAR(256)">
+ <constraints nullable="false" unique="true" />
+ </column>
+ <column name="status" type="VARCHAR(1024)" />
+ <column name="positionId" type="INT" />
+ <column name="dataId" type="INT" />
+ </createTable>
+
+ <createTable tableName="user_device">
+ <column name="userId" type="INT">
+ <constraints nullable="false" />
+ </column>
+ <column name="deviceId" type="INT">
+ <constraints nullable="false" />
+ </column>
+ <column name="read" type="BOOLEAN" defaultValueBoolean="true">
+ <constraints nullable="false" />
+ </column>
+ <column name="write" type="BOOLEAN" defaultValueBoolean="true">
+ <constraints nullable="false" />
+ </column>
+ </createTable>
+
+ <addForeignKeyConstraint baseTableName="user_device" baseColumnNames="userId" constraintName="fk_user_device_userId" referencedTableName="user" referencedColumnNames="id" onDelete="CASCADE" />
+ <addForeignKeyConstraint baseTableName="user_device" baseColumnNames="deviceId" constraintName="fk_user_device_deviceId" referencedTableName="device" referencedColumnNames="id" onDelete="CASCADE" />
+
+ <createIndex tableName="user_device" indexName="user_device_user_id">
+ <column name="userId" />
+ </createIndex>
+
+ <createTable tableName="position">
+ <column name="id" type="INT" autoIncrement="true">
+ <constraints primaryKey="true" />
+ </column>
+ <column name="protocol" type="VARCHAR(1024)" />
+ <column name="deviceId" type="int">
+ <constraints nullable="false" />
+ </column>
+ <column name="serverTime" type="TIMESTAMP">
+ <constraints nullable="false" />
+ </column>
+ <column name="deviceTime" type="TIMESTAMP">
+ <constraints nullable="false" />
+ </column>
+ <column name="fixTime" type="TIMESTAMP">
+ <constraints nullable="false" />
+ </column>
+ <column name="valid" type="BOOLEAN">
+ <constraints nullable="false" />
+ </column>
+ <column name="latitude" type="DOUBLE">
+ <constraints nullable="false" />
+ </column>
+ <column name="longitude" type="DOUBLE">
+ <constraints nullable="false" />
+ </column>
+ <column name="altitude" type="DOUBLE">
+ <constraints nullable="false" />
+ </column>
+ <column name="speed" type="DOUBLE">
+ <constraints nullable="false" />
+ </column>
+ <column name="course" type="DOUBLE">
+ <constraints nullable="false" />
+ </column>
+ <column name="address" type="VARCHAR(1024)" />
+ <column name="other" type="VARCHAR(8192)">
+ <constraints nullable="false" />
</column>
</createTable>
+
+ <addForeignKeyConstraint baseTableName="position" baseColumnNames="deviceId" constraintName="fk_position_deviceId" referencedTableName="device" referencedColumnNames="id" onDelete="CASCADE" />
+
+ <createTable tableName="data">
+ <column name="id" type="INT" autoIncrement="true">
+ <constraints primaryKey="true" />
+ </column>
+ <column name="protocol" type="VARCHAR(1024)" />
+ <column name="deviceId" type="int">
+ <constraints nullable="false" />
+ </column>
+ <column name="serverTime" type="TIMESTAMP">
+ <constraints nullable="false" />
+ </column>
+ <column name="deviceTime" type="TIMESTAMP">
+ <constraints nullable="false" />
+ </column>
+ <column name="other" type="VARCHAR(8192)">
+ <constraints nullable="false" />
+ </column>
+ </createTable>
+
+ <addForeignKeyConstraint baseTableName="data" baseColumnNames="deviceId" constraintName="fk_data_deviceId" referencedTableName="device" referencedColumnNames="id" onDelete="CASCADE" />
+
+ <addForeignKeyConstraint baseTableName="device" baseColumnNames="positionId" constraintName="fk_device_positionId" referencedTableName="position" referencedColumnNames="id" />
+ <addForeignKeyConstraint baseTableName="device" baseColumnNames="dataId" constraintName="fk_device_dataId" referencedTableName="data" referencedColumnNames="id" />
+
+ <createTable tableName="server">
+ <column name="id" type="INT" autoIncrement="true">
+ <constraints primaryKey="true" />
+ </column>
+ <column name="registration" type="BOOLEAN">
+ <constraints nullable="false" />
+ </column>
+ <column name="latitude" type="DOUBLE">
+ <constraints nullable="false" />
+ </column>
+ <column name="longitude" type="DOUBLE">
+ <constraints nullable="false" />
+ </column>
+ <column name="zoom" type="INT">
+ <constraints nullable="false" />
+ </column>
+ </createTable>
+
+ <createTable tableName="traccar">
+ <column name="id" type="INT" autoIncrement="true">
+ <constraints primaryKey="true" />
+ </column>
+ </createTable>
+
</changeSet>
</databaseChangeLog>
diff --git a/database/db.changelog-3.1.xml b/database/db.changelog-3.1.xml
index b05ec6a03..b8c706806 100644
--- a/database/db.changelog-3.1.xml
+++ b/database/db.changelog-3.1.xml
@@ -3,13 +3,15 @@
xmlns="http://www.liquibase.org/xml/ns/dbchangelog/1.9"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog/1.9
- http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-1.9.xsd">
+ http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-1.9.xsd">
+
+ <changeSet author="author" id="changelog-3.1">
- <changeSet author="authorName" id="changelog-1.0">
<createTable tableName="TablesAndTables">
<column name="COLUMN1" type="TEXT">
<constraints nullable="true" primaryKey="false" unique="false"/>
</column>
</createTable>
+
</changeSet>
</databaseChangeLog>
diff --git a/database/db.changelog-3.2.xml b/database/db.changelog-3.2.xml
index b05ec6a03..a072c0703 100644
--- a/database/db.changelog-3.2.xml
+++ b/database/db.changelog-3.2.xml
@@ -3,13 +3,15 @@
xmlns="http://www.liquibase.org/xml/ns/dbchangelog/1.9"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog/1.9
- http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-1.9.xsd">
+ http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-1.9.xsd">
+
+ <changeSet author="author" id="changelog-3.2">
- <changeSet author="authorName" id="changelog-1.0">
<createTable tableName="TablesAndTables">
<column name="COLUMN1" type="TEXT">
<constraints nullable="true" primaryKey="false" unique="false"/>
</column>
</createTable>
+
</changeSet>
</databaseChangeLog>
diff --git a/database/db.changelog-master.xml b/database/db.changelog-master.xml
index 3dab44a15..151cb5d19 100644
--- a/database/db.changelog-master.xml
+++ b/database/db.changelog-master.xml
@@ -5,7 +5,7 @@
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
- <include file="db.changelog-3.0.xml"/>
- <include file="db.changelog-3.1.xml"/>
- <include file="db.changelog-3.2.xml"/>
+ <include file="db.changelog-3.0.xml" relativeToChangelogFile="true" />
+ <!--<include file="db.changelog-3.1.xml" relativeToChangelogFile="true" />
+ <include file="db.changelog-3.2.xml" relativeToChangelogFile="true" />-->
</databaseChangeLog>
diff --git a/src/org/traccar/database/DataManager.java b/src/org/traccar/database/DataManager.java
index caf6d9db3..f905b4ded 100644
--- a/src/org/traccar/database/DataManager.java
+++ b/src/org/traccar/database/DataManager.java
@@ -19,6 +19,8 @@ import com.mchange.v2.c3p0.ComboPooledDataSource;
import java.io.File;
import java.net.URL;
import java.net.URLClassLoader;
+import java.nio.file.Path;
+import java.nio.file.Paths;
import java.sql.Connection;
import java.sql.Driver;
import java.sql.DriverManager;
@@ -160,22 +162,19 @@ public class DataManager implements IdentityManager {
if (config.getString("web.type", "new").equals("new") || config.getString("web.type", "new").equals("api")) {
- /*try {
- ResourceAccessor resourceAccessor = new FileSystemResourceAccessor();
+ /*ResourceAccessor resourceAccessor = new FileSystemResourceAccessor();
- Database database = DatabaseFactory.getInstance().openDatabase(
- config.getString("database.url"),
- config.getString("database.user"),
- config.getString("database.password"),
- null, resourceAccessor);
+ Database database = DatabaseFactory.getInstance().openDatabase(
+ config.getString("database.url"),
+ config.getString("database.user"),
+ config.getString("database.password"),
+ null, resourceAccessor);
- Liquibase liquibase = new Liquibase(
- config.getString("database.changelog"), new FileSystemResourceAccessor(), database);
+ Liquibase liquibase = new Liquibase(
+ config.getString("database.changelog"), resourceAccessor, database);
+
+ liquibase.update(new Contexts());*/
- liquibase.update(new Contexts());
- } catch (Exception e) {
- Log.warning(e);
- }*/
boolean exist = false;
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-02 16:10:59 +0000