cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

- Add missing null constraints.

Browse source 
- Drop pointless index on current_node_tags and order primary key correctly.
- Make version column of node history table auto increment.
This commit is contained in:
Tom Hughes 2008-01-23 19:25:37 +00:00
parent 6f6e827702
commit 602b7b6d3f
4 changed files with 22 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

13
db/migrate/011_create_node_tags.rb
View file

@ -1,18 +1,15 @@
class CreateNodeTags < ActiveRecord::Migration class CreateNodeTags < ActiveRecord::Migration
def self.up def self.up
create_table "current_node_tags", myisam_table do |t| create_table "current_node_tags", myisam_table do |t|
t.column "id", :bigint, :limit => 64 t.column "id", :bigint, :limit => 64 :null => false
t.column "sequence_id", :bigint, :limit => 11 t.column "sequence_id", :bigint, :limit => 11 :null => false
t.column "k", :string, :default => "", :null => false t.column "k", :string, :default => "", :null => false
t.column "v", :string, :default => "", :null => false t.column "v", :string, :default => "", :null => false
end end
add_index "current_node_tags", ["id"], :name => "current_node_tags_id_idx" add_primary_key "current_node_tags", ["id", "sequence_id"]
add_primary_key "current_node_tags", ["sequence_id", "id"]
execute "CREATE FULLTEXT INDEX `current_node_tags_v_idx` ON `current_node_tags` (`v`)" execute "CREATE FULLTEXT INDEX `current_node_tags_v_idx` ON `current_node_tags` (`v`)"
end end
def self.down def self.down

12
db/migrate/012_create_old_node_tags.rb
View file

@ -1,16 +1,14 @@
class CreateOldNodeTags < ActiveRecord::Migration class CreateOldNodeTags < ActiveRecord::Migration
def self.up def self.up
create_table "node_tags", myisam_table do |t| create_table "node_tags", myisam_table do |t|
t.column "id", :bigint, :limit => 64, :default => 0, :null => false t.column "id", :bigint, :limit => 64, :default => 0, :null => false
t.column "sequence_id", :bigint, :limit => 11 t.column "version", :bigint, :limit => 20, :null => false
t.column "k", :string t.column "sequence_id", :bigint, :limit => 11, :null => false
t.column "v", :string t.column "k", :string, :null => false
t.column "version", :bigint, :limit => 20 t.column "v", :string, :null => false
end end
add_index "node_tags", ["version"], :name => "node_tags_id_version_idx"
add_primary_key "node_tags", ["id", "version", "sequence_id"] add_primary_key "node_tags", ["id", "version", "sequence_id"]
end end
def self.down def self.down

1
db/migrate/013_populate_node_tags_and_remove.rb
View file

@ -1,6 +1,5 @@
class PopulateNodeTagsAndRemove < ActiveRecord::Migration class PopulateNodeTagsAndRemove < ActiveRecord::Migration
def self.up def self.up
#rake import #rake import
remove_column :nodes, :tags remove_column :nodes, :tags
remove_column :current_nodes, :tags remove_column :current_nodes, :tags

24
db/migrate/014_create_temp_old_nodes.rb
View file

@ -1,21 +1,21 @@
class CreateTempOldNodes < ActiveRecord::Migration class CreateTempOldNodes < ActiveRecord::Migration
def self.up def self.up
create_table "temp_nodes", myisam_table do |t| create_table "temp_nodes", myisam_table do |t|
t.column "id", :bigint, :limit => 64 t.column "id", :bigint, :limit => 64, :null => false
t.column "version", :bigint, :limit => 20, :default => 0, :null => false t.column "version", :bigint, :limit => 20, :null => false
t.column "latitude", :double t.column "latitude", :double, :null => false
t.column "longitude", :double t.column "longitude", :double, :null => false
t.column "user_id", :bigint, :limit => 20 t.column "user_id", :bigint, :limit => 20, :null => false
t.column "visible", :boolean t.column "visible", :boolean, :null => false
t.column "timestamp", :datetime t.column "timestamp", :datetime, :null => false
t.column "tile", :integer, :null => false t.column "tile", :integer, :null => false
end end
add_primary_key "temp_nodes", ["id", "version"] add_primary_key "temp_nodes", ["id", "version"]
add_index "temp_nodes", ["timestamp"], :name => "temp_nodes_timestamp_idx" add_index "temp_nodes", ["timestamp"], :name => "temp_nodes_timestamp_idx"
add_index "temp_nodes", ["tile"], :name => "temp_nodes_tile_idx" add_index "temp_nodes", ["tile"], :name => "temp_nodes_tile_idx"
change_column "temp_nodes", "version", :bigint, :limit => 20, :null => false, :options => "AUTO_INCREMENT"
end end
def self.down def self.down