update current schema

diff --git a/db/create_database.sql b/db/create_database.sql
index 2de6295ecc22176b1d2d04de06772f8f6d5a5a07..a6b7dedef8de73606e9acf89de52009fade682b2 100644 (file)
--- a/db/create_database.sql
+++ b/db/create_database.sql
@@ -1,345 +1,329 @@
--- MySQL dump 10.9\r
---\r
--- Host: localhost    Database: openstreetmap\r
--- ------------------------------------------------------\r
--- Server version        4.1.11-Debian_4sarge2-log\r
-\r
-/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;\r
-/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;\r
-/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;\r
-/*!40101 SET NAMES utf8 */;\r
-/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;\r
-/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;\r
-/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;\r
-/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;\r
-\r
---\r
--- Table structure for table `area_segments`\r
---\r
-\r
-DROP TABLE IF EXISTS `area_segments`;\r
-CREATE TABLE `area_segments` (\r
-  `id` bigint(64) NOT NULL default '0',\r
-  `segment_id` int(11) default NULL,\r
-  `version` bigint(20) NOT NULL default '0',\r
-  `sequence_id` int(11) NOT NULL auto_increment,\r
-  PRIMARY KEY  (`id`,`version`,`sequence_id`),\r
-  KEY `area_segments_id_idx` (`id`),\r
-  KEY `area_segments_segment_id_idx` (`segment_id`),\r
-  KEY `area_segments_id_version_idx` (`id`,`version`)\r
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;\r
-\r
---\r
--- Table structure for table `area_tags`\r
---\r
-\r
-DROP TABLE IF EXISTS `area_tags`;\r
-CREATE TABLE `area_tags` (\r
-  `id` bigint(64) NOT NULL default '0',\r
-  `k` varchar(255) default NULL,\r
-  `v` varchar(255) default NULL,\r
-  `version` bigint(20) NOT NULL default '0',\r
-  `sequence_id` int(11) NOT NULL auto_increment,\r
-  PRIMARY KEY  (`id`,`version`,`sequence_id`)\r
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;\r
-\r
---\r
--- Table structure for table `areas`\r
---\r
-\r
-DROP TABLE IF EXISTS `areas`;\r
-CREATE TABLE `areas` (\r
-  `id` bigint(64) NOT NULL default '0',\r
-  `user_id` bigint(20) default NULL,\r
-  `timestamp` datetime default NULL,\r
-  `version` bigint(20) NOT NULL auto_increment,\r
-  `visible` tinyint(1) default '1',\r
-  PRIMARY KEY  (`id`,`version`)\r
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;\r
-\r
---\r
--- Table structure for table `current_nodes`\r
---\r
-\r
-DROP TABLE IF EXISTS `current_nodes`;\r
-CREATE TABLE `current_nodes` (\r
-  `id` bigint(64) default NULL,\r
-  `latitude` double default NULL,\r
-  `longitude` double default NULL,\r
-  `user_id` bigint(20) default NULL,\r
-  `visible` tinyint(1) default NULL,\r
-  `tags` text,\r
-  `timestamp` datetime default NULL,\r
-  KEY `current_nodes_id_idx` (`id`),\r
-  KEY `current_nodes_lat_lon_idx` (`latitude`,`longitude`)\r
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;\r
-\r
---\r
--- Table structure for table `current_segments`\r
---\r
-\r
-DROP TABLE IF EXISTS `current_segments`;\r
-CREATE TABLE `current_segments` (\r
-  `id` bigint(64) default NULL,\r
-  `node_a` bigint(64) default NULL,\r
-  `node_b` bigint(64) default NULL,\r
-  `user_id` bigint(20) default NULL,\r
-  `visible` tinyint(1) default NULL,\r
-  `tags` text,\r
-  `timestamp` datetime default NULL,\r
-  KEY `current_segments_id_visible_idx` (`id`,`visible`),\r
-  KEY `current_segments_a_idx` (`node_a`),\r
-  KEY `current_segments_b_idx` (`node_b`)\r
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;\r
-\r
---\r
--- Table structure for table `current_way_segments`\r
---\r
-\r
-DROP TABLE IF EXISTS `current_way_segments`;\r
-CREATE TABLE `current_way_segments` (\r
-  `id` bigint(64) default NULL,\r
-  `segment_id` bigint(11) default NULL,\r
-  `sequence_id` bigint(11) default NULL,\r
-  KEY `current_way_segments_seg_idx` (`segment_id`),\r
-  KEY `current_way_segments_id_idx` (`id`)\r
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;\r
-\r
---\r
--- Table structure for table `current_way_tags`\r
---\r
-\r
-DROP TABLE IF EXISTS `current_way_tags`;\r
-CREATE TABLE `current_way_tags` (\r
-  `id` bigint(64) default NULL,\r
-  `k` varchar(255) default NULL,\r
-  `v` varchar(255) default NULL,\r
-  KEY `current_way_tags_id_idx` (`id`),\r
-  FULLTEXT KEY `current_way_tags_v_idx` (`v`)\r
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;\r
-\r
---\r
--- Table structure for table `current_ways`\r
---\r
-\r
-DROP TABLE IF EXISTS `current_ways`;\r
-CREATE TABLE `current_ways` (\r
-  `id` bigint(64) default NULL,\r
-  `user_id` bigint(20) default NULL,\r
-  `timestamp` datetime default NULL,\r
-  `visible` tinyint(1) default NULL,\r
-  KEY `current_ways_id_visible_idx` (`id`,`visible`)\r
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;\r
-\r
---\r
--- Table structure for table `gps_points`\r
---\r
-\r
-DROP TABLE IF EXISTS `gps_points`;\r
-CREATE TABLE `gps_points` (\r
-  `altitude` float default NULL,\r
-  `user_id` bigint(20) default NULL,\r
-  `trackid` int(11) default NULL,\r
-  `latitude` double default NULL,\r
-  `longitude` double default NULL,\r
-  `gpx_id` bigint(20) default NULL,\r
-  `timestamp` datetime default NULL,\r
-  KEY `points_idx` (`latitude`,`longitude`,`user_id`),\r
-  KEY `points_uid_idx` (`user_id`),\r
-  KEY `points_gpxid_idx` (`gpx_id`),\r
-  KEY `gps_points_timestamp_idx` (`timestamp`)\r
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;\r
-\r
---\r
--- Table structure for table `gpx_file_tags`\r
---\r
-\r
-DROP TABLE IF EXISTS `gpx_file_tags`;\r
-CREATE TABLE `gpx_file_tags` (\r
-  `gpx_id` bigint(64) NOT NULL default '0',\r
-  `tag` varchar(255) default NULL,\r
-  `sequence_id` int(11) NOT NULL auto_increment,\r
-  PRIMARY KEY  (`gpx_id`,`sequence_id`)\r
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;\r
-\r
---\r
--- Table structure for table `gpx_files`\r
---\r
-\r
-DROP TABLE IF EXISTS `gpx_files`;\r
-CREATE TABLE `gpx_files` (\r
-  `id` bigint(64) NOT NULL auto_increment,\r
-  `user_id` bigint(20) default NULL,\r
-  `visible` tinyint(1) NOT NULL default '1',\r
-  `name` varchar(255) NOT NULL default '',\r
-  `size` bigint(20) default NULL,\r
-  `latitude` double default NULL,\r
-  `longitude` double default NULL,\r
-  `timestamp` datetime default NULL,\r
-  `private` tinyint(1) default '1',\r
-  `description` varchar(255) default '',\r
-  `tmpname` varchar(255) default NULL,\r
-  `inserted` tinyint(1) default NULL,\r
-  PRIMARY KEY  (`id`)\r
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;\r
-\r
---\r
--- Table structure for table `gpx_pending_files`\r
---\r
-\r
-DROP TABLE IF EXISTS `gpx_pending_files`;\r
-CREATE TABLE `gpx_pending_files` (\r
-  `originalname` varchar(255) default NULL,\r
-  `tmpname` varchar(255) default NULL,\r
-  `user_id` bigint(20) default NULL\r
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;\r
-\r
---\r
--- Table structure for table `meta_areas`\r
---\r
-\r
-DROP TABLE IF EXISTS `meta_areas`;\r
-CREATE TABLE `meta_areas` (\r
-  `id` bigint(64) NOT NULL auto_increment,\r
-  `user_id` bigint(20) default NULL,\r
-  `timestamp` datetime default NULL,\r
-  PRIMARY KEY  (`id`)\r
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;\r
-\r
---\r
--- Table structure for table `meta_nodes`\r
---\r
-\r
-DROP TABLE IF EXISTS `meta_nodes`;\r
-CREATE TABLE `meta_nodes` (\r
-  `id` bigint(64) NOT NULL auto_increment,\r
-  `user_id` bigint(20) default NULL,\r
-  `timestamp` datetime default NULL,\r
-  PRIMARY KEY  (`id`)\r
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;\r
-\r
---\r
--- Table structure for table `meta_segments`\r
---\r
-\r
-DROP TABLE IF EXISTS `meta_segments`;\r
-CREATE TABLE `meta_segments` (\r
-  `id` bigint(64) NOT NULL auto_increment,\r
-  `user_id` bigint(20) default NULL,\r
-  `timestamp` datetime default NULL,\r
-  PRIMARY KEY  (`id`)\r
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;\r
-\r
---\r
--- Table structure for table `meta_ways`\r
---\r
-\r
-DROP TABLE IF EXISTS `meta_ways`;\r
-CREATE TABLE `meta_ways` (\r
-  `id` bigint(64) NOT NULL auto_increment,\r
-  `user_id` bigint(20) default NULL,\r
-  `timestamp` datetime default NULL,\r
-  PRIMARY KEY  (`id`)\r
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;\r
-\r
---\r
--- Table structure for table `nodes`\r
---\r
-\r
-DROP TABLE IF EXISTS `nodes`;\r
-CREATE TABLE `nodes` (\r
-  `id` bigint(64) default NULL,\r
-  `latitude` double default NULL,\r
-  `longitude` double default NULL,\r
-  `user_id` bigint(20) default NULL,\r
-  `visible` tinyint(1) default NULL,\r
-  `tags` text NOT NULL,\r
-  `timestamp` datetime default NULL,\r
-  KEY `nodes_uid_idx` (`id`),\r
-  KEY `nodes_latlon_idx` (`latitude`,`longitude`)\r
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;\r
-\r
---\r
--- Table structure for table `segments`\r
---\r
-\r
-DROP TABLE IF EXISTS `segments`;\r
-CREATE TABLE `segments` (\r
-  `id` bigint(64) default NULL,\r
-  `node_a` bigint(64) default NULL,\r
-  `node_b` bigint(64) default NULL,\r
-  `user_id` bigint(20) default NULL,\r
-  `visible` tinyint(1) default NULL,\r
-  `tags` text NOT NULL,\r
-  `timestamp` datetime default NULL,\r
-  KEY `street_segments_nodea_idx` (`node_a`),\r
-  KEY `street_segments_nodeb_idx` (`node_b`),\r
-  KEY `street_segment_uid_idx` (`id`)\r
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;\r
-\r
---\r
--- Table structure for table `users`\r
---\r
-\r
-DROP TABLE IF EXISTS `users`;\r
-CREATE TABLE `users` (\r
-  `email` varchar(255) default NULL,\r
-  `id` bigint(20) NOT NULL auto_increment,\r
-  `token` varchar(255) default NULL,\r
-  `active` int(11) NOT NULL default '0',\r
-  `pass_crypt` varchar(255) default NULL,\r
-  `creation_time` datetime default NULL,\r
-  `timeout` datetime default NULL,\r
-  `display_name` varchar(255) default '',\r
-  PRIMARY KEY  (`id`),\r
-  KEY `users_email_idx` (`email`)\r
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;\r
-\r
---\r
--- Table structure for table `way_segments`\r
---\r
-\r
-DROP TABLE IF EXISTS `way_segments`;\r
-CREATE TABLE `way_segments` (\r
-  `id` bigint(64) NOT NULL default '0',\r
-  `segment_id` int(11) default NULL,\r
-  `version` bigint(20) NOT NULL default '0',\r
-  `sequence_id` bigint(11) NOT NULL auto_increment,\r
-  PRIMARY KEY  (`id`,`version`,`sequence_id`)\r
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;\r
-\r
---\r
--- Table structure for table `way_tags`\r
---\r
-\r
-DROP TABLE IF EXISTS `way_tags`;\r
-CREATE TABLE `way_tags` (\r
-  `id` bigint(64) NOT NULL default '0',\r
-  `k` varchar(255) default NULL,\r
-  `v` varchar(255) default NULL,\r
-  `version` bigint(20) default NULL,\r
-  KEY `way_tags_id_version_idx` (`id`,`version`)\r
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;\r
-\r
---\r
--- Table structure for table `ways`\r
---\r
-\r
-DROP TABLE IF EXISTS `ways`;\r
-CREATE TABLE `ways` (\r
-  `id` bigint(64) NOT NULL default '0',\r
-  `user_id` bigint(20) default NULL,\r
-  `timestamp` datetime default NULL,\r
-  `version` bigint(20) unsigned NOT NULL auto_increment,\r
-  `visible` tinyint(1) default '1',\r
-  PRIMARY KEY  (`id`,`version`),\r
-  KEY `ways_id_version_idx` (`id`)\r
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;\r
-\r
-/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;\r
-/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;\r
-/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;\r
-/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;\r
-/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;\r
-/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;\r
-/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
\ No newline at end of file
+-- MySQL dump 9.11
+--
+-- Host: 128.40.58.203    Database: openstreetmap
+-- ------------------------------------------------------
+-- Server version      5.0.38-Ubuntu_0ubuntu1-log
+
+--
+-- Table structure for table `area_segments`
+--
+
+CREATE TABLE `area_segments` (
+  `id` bigint(64) NOT NULL default '0',
+  `segment_id` int(11) default NULL,
+  `version` bigint(20) NOT NULL default '0',
+  `sequence_id` int(11) NOT NULL auto_increment,
+  PRIMARY KEY  (`id`,`version`,`sequence_id`),
+  KEY `area_segments_id_idx` (`id`),
+  KEY `area_segments_segment_id_idx` (`segment_id`),
+  KEY `area_segments_id_version_idx` (`id`,`version`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+--
+-- Table structure for table `area_tags`
+--
+
+CREATE TABLE `area_tags` (
+  `id` bigint(64) NOT NULL default '0',
+  `k` varchar(255) default NULL,
+  `v` varchar(255) default NULL,
+  `version` bigint(20) NOT NULL default '0',
+  `sequence_id` int(11) NOT NULL auto_increment,
+  PRIMARY KEY  (`id`,`version`,`sequence_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+--
+-- Table structure for table `areas`
+--
+
+CREATE TABLE `areas` (
+  `id` bigint(64) NOT NULL default '0',
+  `user_id` bigint(20) default NULL,
+  `timestamp` datetime default NULL,
+  `version` bigint(20) NOT NULL auto_increment,
+  `visible` tinyint(1) default '1',
+  PRIMARY KEY  (`id`,`version`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+--
+-- Table structure for table `current_nodes`
+--
+
+CREATE TABLE `current_nodes` (
+  `id` bigint(64) NOT NULL auto_increment,
+  `latitude` double default NULL,
+  `longitude` double default NULL,
+  `user_id` bigint(20) default NULL,
+  `visible` tinyint(1) default NULL,
+  `tags` text NOT NULL,
+  `timestamp` datetime default NULL,
+  KEY `current_nodes_id_idx` (`id`),
+  KEY `current_nodes_lat_lon_idx` (`latitude`,`longitude`),
+  KEY `current_nodes_timestamp_idx` (`timestamp`)
+) ENGINE=MyISAM AUTO_INCREMENT=28831962 DEFAULT CHARSET=utf8;
+
+--
+-- Table structure for table `current_segments`
+--
+
+CREATE TABLE `current_segments` (
+  `id` bigint(64) NOT NULL auto_increment,
+  `node_a` bigint(64) default NULL,
+  `node_b` bigint(64) default NULL,
+  `user_id` bigint(20) default NULL,
+  `visible` tinyint(1) default NULL,
+  `tags` text NOT NULL,
+  `timestamp` datetime default NULL,
+  KEY `current_segments_id_visible_idx` (`id`,`visible`),
+  KEY `current_segments_a_idx` (`node_a`),
+  KEY `current_segments_b_idx` (`node_b`)
+) ENGINE=MyISAM AUTO_INCREMENT=24826942 DEFAULT CHARSET=utf8;
+
+--
+-- Table structure for table `current_way_segments`
+--
+
+CREATE TABLE `current_way_segments` (
+  `id` bigint(64) default NULL,
+  `segment_id` bigint(11) default NULL,
+  `sequence_id` bigint(11) default NULL,
+  KEY `current_way_segments_seg_idx` (`segment_id`),
+  KEY `current_way_segments_id_idx` (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+--
+-- Table structure for table `current_way_tags`
+--
+
+CREATE TABLE `current_way_tags` (
+  `id` bigint(64) default NULL,
+  `k` varchar(255) NOT NULL default '',
+  `v` varchar(255) NOT NULL default '',
+  KEY `current_way_tags_id_idx` (`id`),
+  FULLTEXT KEY `current_way_tags_v_idx` (`v`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+--
+-- Table structure for table `current_ways`
+--
+
+CREATE TABLE `current_ways` (
+  `id` bigint(64) NOT NULL auto_increment,
+  `user_id` bigint(20) default NULL,
+  `timestamp` datetime default NULL,
+  `visible` tinyint(1) default NULL,
+  PRIMARY KEY  (`id`)
+) ENGINE=MyISAM AUTO_INCREMENT=4570119 DEFAULT CHARSET=utf8;
+
+--
+-- Table structure for table `diary_entries`
+--
+
+CREATE TABLE `diary_entries` (
+  `id` bigint(20) NOT NULL auto_increment,
+  `user_id` bigint(20) NOT NULL,
+  `title` varchar(255) default NULL,
+  `body` text,
+  `created_at` datetime default NULL,
+  `updated_at` datetime default NULL,
+  PRIMARY KEY  (`id`)
+) ENGINE=MyISAM AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
+
+--
+-- Table structure for table `friends`
+--
+
+CREATE TABLE `friends` (
+  `id` bigint(20) NOT NULL auto_increment,
+  `user_id` bigint(20) NOT NULL,
+  `friend_user_id` bigint(20) NOT NULL,
+  PRIMARY KEY  (`id`),
+  KEY `user_id_idx` (`friend_user_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+--
+-- Table structure for table `gps_points`
+--
+
+CREATE TABLE `gps_points` (
+  `altitude` float default NULL,
+  `user_id` int(20) unsigned default NULL,
+  `trackid` int(11) default NULL,
+  `latitude` int(11) default NULL,
+  `longitude` int(11) default NULL,
+  `gpx_id` int(20) unsigned default NULL,
+  `timestamp` datetime default NULL,
+  KEY `points_idx` (`latitude`,`longitude`,`user_id`),
+  KEY `points_uid_idx` (`user_id`),
+  KEY `points_gpxid_idx` (`gpx_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+--
+-- Table structure for table `gpx_file_tags`
+--
+
+CREATE TABLE `gpx_file_tags` (
+  `gpx_id` bigint(64) NOT NULL default '0',
+  `tag` varchar(255) default NULL,
+  `id` int(20) NOT NULL auto_increment,
+  PRIMARY KEY  (`id`),
+  KEY `gpx_file_tags_gpxid_idx` (`gpx_id`)
+) ENGINE=MyISAM AUTO_INCREMENT=31675 DEFAULT CHARSET=utf8;
+
+--
+-- Table structure for table `gpx_files`
+--
+
+CREATE TABLE `gpx_files` (
+  `id` bigint(64) NOT NULL auto_increment,
+  `user_id` bigint(20) default NULL,
+  `visible` tinyint(1) NOT NULL default '1',
+  `name` varchar(255) NOT NULL default '',
+  `size` bigint(20) default NULL,
+  `latitude` double default NULL,
+  `longitude` double default NULL,
+  `timestamp` datetime default NULL,
+  `public` tinyint(1) NOT NULL default '1',
+  `description` varchar(255) default '',
+  `inserted` tinyint(1) default NULL,
+  PRIMARY KEY  (`id`),
+  KEY `gpx_files_timestamp_idx` (`timestamp`),
+  KEY `gpx_files_visible_public_idx` (`visible`,`public`)
+) ENGINE=MyISAM AUTO_INCREMENT=22864 DEFAULT CHARSET=utf8;
+
+--
+-- Table structure for table `gpx_pending_files`
+--
+
+CREATE TABLE `gpx_pending_files` (
+  `originalname` varchar(255) default NULL,
+  `tmpname` varchar(255) default NULL,
+  `user_id` bigint(20) default NULL
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+--
+-- Table structure for table `messages`
+--
+
+CREATE TABLE `messages` (
+  `id` bigint(20) NOT NULL auto_increment,
+  `user_id` bigint(20) NOT NULL,
+  `from_user_id` bigint(20) NOT NULL,
+  `from_display_name` varchar(255) default '',
+  `title` varchar(255) default NULL,
+  `body` text,
+  `sent_on` datetime default NULL,
+  `message_read` tinyint(1) default '0',
+  `to_user_id` bigint(20) NOT NULL,
+  PRIMARY KEY  (`id`),
+  KEY `from_name_idx` (`from_display_name`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+--
+-- Table structure for table `meta_areas`
+--
+
+CREATE TABLE `meta_areas` (
+  `id` bigint(64) NOT NULL auto_increment,
+  `user_id` bigint(20) default NULL,
+  `timestamp` datetime default NULL,
+  PRIMARY KEY  (`id`)
+) ENGINE=MyISAM AUTO_INCREMENT=10 DEFAULT CHARSET=utf8;
+
+--
+-- Table structure for table `nodes`
+--
+
+CREATE TABLE `nodes` (
+  `id` bigint(64) default NULL,
+  `latitude` double default NULL,
+  `longitude` double default NULL,
+  `user_id` bigint(20) default NULL,
+  `visible` tinyint(1) default NULL,
+  `tags` text NOT NULL,
+  `timestamp` datetime default NULL,
+  KEY `nodes_uid_idx` (`id`),
+  KEY `nodes_latlon_idx` (`latitude`,`longitude`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+--
+-- Table structure for table `segments`
+--
+
+CREATE TABLE `segments` (
+  `id` bigint(64) default NULL,
+  `node_a` bigint(64) default NULL,
+  `node_b` bigint(64) default NULL,
+  `user_id` bigint(20) default NULL,
+  `visible` tinyint(1) default NULL,
+  `tags` text NOT NULL,
+  `timestamp` datetime default NULL,
+  KEY `street_segments_nodea_idx` (`node_a`),
+  KEY `street_segments_nodeb_idx` (`node_b`),
+  KEY `street_segment_uid_idx` (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+--
+-- Table structure for table `users`
+--
+
+CREATE TABLE `users` (
+  `email` varchar(255) default NULL,
+  `id` bigint(20) NOT NULL auto_increment,
+  `token` varchar(255) default NULL,
+  `active` int(11) NOT NULL default '0',
+  `pass_crypt` varchar(255) default NULL,
+  `creation_time` datetime default NULL,
+  `timeout` datetime default NULL,
+  `display_name` varchar(255) default '',
+  `preferences` text,
+  `data_public` tinyint(1) default '0',
+  `description` text NOT NULL,
+  `home_lat` double default '1',
+  `home_lon` double default '1',
+  `within_lon` double default NULL,
+  `within_lat` double default NULL,
+  `home_zoom` int(2) default '3',
+  PRIMARY KEY  (`id`),
+  KEY `users_email_idx` (`email`),
+  KEY `users_display_name_idx` (`display_name`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+--
+-- Table structure for table `way_segments`
+--
+
+CREATE TABLE `way_segments` (
+  `id` bigint(64) NOT NULL default '0',
+  `segment_id` int(11) default NULL,
+  `version` bigint(20) NOT NULL default '0',
+  `sequence_id` bigint(11) NOT NULL auto_increment,
+  PRIMARY KEY  (`id`,`version`,`sequence_id`)
+) ENGINE=MyISAM AUTO_INCREMENT=8459472 DEFAULT CHARSET=utf8;
+
+--
+-- Table structure for table `way_tags`
+--
+
+CREATE TABLE `way_tags` (
+  `id` bigint(64) NOT NULL default '0',
+  `k` varchar(255) default NULL,
+  `v` varchar(255) default NULL,
+  `version` bigint(20) default NULL,
+  KEY `way_tags_id_version_idx` (`id`,`version`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+--
+-- Table structure for table `ways`
+--
+
+CREATE TABLE `ways` (
+  `id` bigint(64) NOT NULL default '0',
+  `user_id` bigint(20) default NULL,
+  `timestamp` datetime default NULL,
+  `version` bigint(20) unsigned NOT NULL auto_increment,
+  `visible` tinyint(1) default '1',
+  PRIMARY KEY  (`id`,`version`),
+  KEY `ways_id_version_idx` (`id`)
+) ENGINE=MyISAM AUTO_INCREMENT=3414768 DEFAULT CHARSET=utf8;
+

diff --git a/db/migrate.sql b/db/migrate.sql
deleted file mode 100644 (file)
index 233ddd4..0000000
--- a/db/migrate.sql
+++ /dev/null
@@ -1,52 +0,0 @@
-/* this script when run on the current db migrates it to rails */
-
-drop table meta_nodes;
-alter table current_nodes modify tags text not null;
-alter table current_nodes modify id bigint(64) not null auto_increment;
-alter table nodes modify tags text not null;
-
-drop table meta_segments;
-alter table current_segments modify tags text not null;
-alter table current_segments modify id bigint(64) not null auto_increment;
-alter table segments modify tags text not null;
-
-drop table meta_ways;
-alter table current_ways drop index current_ways_id_visible_idx;
-alter table current_ways modify id bigint(64) not null auto_increment, add primary key(id);
-
-alter table current_way_tags change k k varchar(255) not null default '';
-alter table current_way_tags change v v varchar(255) not null default '';
-
-alter table gpx_files change private public boolean default 1 not null;
-update gpx_files set public = !public;
-create index gpx_files_visible_public_idx on gpx_files(visible, public);
-
-alter table gpx_file_tags change sequence_id sequence_id int(11);
-alter table gpx_file_tags drop primary key;
-alter table gpx_file_tags drop column sequence_id;
-create index gpx_file_tags_gpxid_idx on gpx_file_tags(gpx_id);
-alter table gpx_file_tags add id int(20) auto_increment not null, add primary key(id);
-
-alter table users add preferences text;
-create index users_display_name_idx on users(display_name);
-
-alter table users add data_public boolean default false;
-
-alter table gpx_files drop column tmpname;
-
-alter table users add column description text not null;
-create table diary_entries(id bigint not null auto_increment, user_id bigint not null, title varchar(255), body text, primary key(id));
-alter table diary_entries add created_at datetime;
-alter table diary_entries add updated_at datetime;
-
-alter table users add column (home_lat double default 0);
-alter table users add column (home_lon double default 0);
-alter table users add column home_zoom int(2) default 3);
-alter table users add column within_lon double default 2;
-alter table users add column within_lat double default 2;
-
-create table messages (id bigint not null auto_increment, user_id bigint(20) not null,  from_user_id bigint(20) not null, from_display_name varchar(255) default "", to_user_id bigint(20) not null, title varchar(255), body text, sent_on datetime, message_read boolean default 0, primary key(id));
-create index from_name_idx on messages(from_display_name);
-
-create table friends (id bigint not null auto_increment, user_id bigint(20) not null, friend_user_id bigint(20) not null, primary key(id));
-create index user_id_idx on friends(friend_user_id);