From 9e2ef178118d776f4bbbe8a30e27ff6134dacacd Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Tue, 21 Apr 2015 22:36:40 +1200 Subject: Change database init code --- src/org/traccar/database/DataManager.java | 119 +++++++++++++++++++++--------- src/org/traccar/http/MainServlet.java | 3 +- 2 files changed, 84 insertions(+), 38 deletions(-) (limited to 'src/org') diff --git a/src/org/traccar/database/DataManager.java b/src/org/traccar/database/DataManager.java index 2c78a53c4..b84b7ae49 100644 --- a/src/org/traccar/database/DataManager.java +++ b/src/org/traccar/database/DataManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 - 2014 Anton Tananaev (anton.tananaev@gmail.com) + * Copyright 2012 - 2015 Anton Tananaev (anton.tananaev@gmail.com) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -223,41 +223,88 @@ public class DataManager { try { Statement statement = connection.createStatement(); try { - - statement.execute( - "CREATE TABLE IF NOT EXISTS users (" + - "id INT PRIMARY KEY AUTO_INCREMENT," + - "name VARCHAR(1024) NOT NULL UNIQUE," + - "password VARCHAR(1024) NOT NULL," + - "admin BOOLEAN NOT NULL);"); - - statement.execute( - "CREATE TABLE IF NOT EXISTS devices (" + - "id INT PRIMARY KEY AUTO_INCREMENT," + - "name VARCHAR(1024) NOT NULL," + - "uniqueId VARCHAR(1024) NOT NULL UNIQUE);"); - - statement.execute( - "CREATE TABLE IF NOT EXISTS users_devices (" + - "userId INT NOT NULL," + - "deviceId INT NOT NULL," + - "FOREIGN KEY (userId) REFERENCES users(id)," + - "FOREIGN KEY (deviceId) REFERENCES devices(id));"); - - statement.execute( - "CREATE TABLE IF NOT EXISTS positions (" + - "id INT PRIMARY KEY AUTO_INCREMENT," + - "deviceId INT NOT NULL," + - "time TIMESTAMP NOT NULL," + - "valid BOOLEAN NOT NULL," + - "latitude DOUBLE NOT NULL," + - "longitude DOUBLE NOT NULL," + - "altitude DOUBLE NOT NULL," + - "speed DOUBLE NOT NULL," + - "course DOUBLE NOT NULL," + - "address VARCHAR(1024) NOT NULL," + - "other VARCHAR(8192) NOT NULL," + - "FOREIGN KEY (deviceId) REFERENCES devices(id));"); + + ResultSet result = connection.getMetaData().getTables( + connection.getCatalog(), null, null, null); + + boolean exist = false; + while (result.next()) { + if (result.getString("TABLE_NAME").equalsIgnoreCase("traccar1")) { + exist = true; + break; + } + } + + if (!exist) { + + statement.execute( + "CREATE TABLE user (" + + "id INT PRIMARY KEY AUTO_INCREMENT," + + "name VARCHAR(1024) NOT NULL UNIQUE," + + "password VARCHAR(1024) NOT NULL," + + "salt VARCHAR(1024) NOT NULL," + + "readonly BOOLEAN NOT NULL," + + "admin BOOLEAN NOT NULL," + + "language VARCHAR(1024) NOT NULL," + + "latitude DOUBLE NOT NULL," + + "longitude DOUBLE NOT NULL," + + "zoom INT NOT NULL);" + + + "CREATE TABLE device (" + + "id INT PRIMARY KEY AUTO_INCREMENT," + + "name VARCHAR(1024) NOT NULL," + + "unique_id VARCHAR(1024) NOT NULL UNIQUE," + + "position_id INT NOT NULL," + + "data_id INT NOT NULL);" + + + "CREATE TABLE user_device (" + + "user_id INT NOT NULL," + + "device_id INT NOT NULL," + + "read BOOLEAN NOT NULL," + + "write BOOLEAN NOT NULL," + + "FOREIGN KEY (user_id) REFERENCES user(id)," + + "FOREIGN KEY (device_id) REFERENCES device(id));" + + + "CREATE TABLE position (" + + "id INT PRIMARY KEY AUTO_INCREMENT," + + "device_id INT NOT NULL," + + "server_time TIMESTAMP NOT NULL," + + "device_time TIMESTAMP NOT NULL," + + "fix_time TIMESTAMP NOT NULL," + + "valid BOOLEAN NOT NULL," + + "latitude DOUBLE NOT NULL," + + "longitude DOUBLE NOT NULL," + + "altitude DOUBLE NOT NULL," + + "speed DOUBLE NOT NULL," + + "course DOUBLE NOT NULL," + + "address VARCHAR(1024)," + + "other VARCHAR(8192) NOT NULL," + + "FOREIGN KEY (device_id) REFERENCES device(id));" + + + "CREATE TABLE data (" + + "id INT PRIMARY KEY AUTO_INCREMENT," + + "device_id INT NOT NULL," + + "server_time TIMESTAMP NOT NULL," + + "device_time TIMESTAMP NOT NULL," + + "other VARCHAR(8192) NOT NULL," + + "FOREIGN KEY (device_id) REFERENCES device(id));" + + + "ALTER TABLE device ADD " + + "FOREIGN KEY (position_id) REFERENCES position(id);" + + + "ALTER TABLE device ADD " + + "FOREIGN KEY (data_id) REFERENCES data(id);" + + + "CREATE TABLE server (" + + "id INT PRIMARY KEY AUTO_INCREMENT," + + "registration BOOLEAN NOT NULL," + + "latitude DOUBLE NOT NULL," + + "longitude DOUBLE NOT NULL," + + "zoom INT NOT NULL);" + + + "CREATE TABLE traccar1 (" + + "id INT PRIMARY KEY AUTO_INCREMENT);"); + } } finally { statement.close(); diff --git a/src/org/traccar/http/MainServlet.java b/src/org/traccar/http/MainServlet.java index ca5bcfc17..720e75df4 100644 --- a/src/org/traccar/http/MainServlet.java +++ b/src/org/traccar/http/MainServlet.java @@ -22,14 +22,13 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.io.PrintWriter; import java.sql.SQLException; public class MainServlet extends HttpServlet { private static final String USER_ID = "userId"; - private DataManager dataManager; + private final DataManager dataManager; public MainServlet(DataManager dataManager) { this.dataManager = dataManager; -- cgit v1.2.3