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

Merge rails_port as of r4613 & fix tests.

Browse source
This commit is contained in:
Gabriel Ebner 2007-09-20 14:37:29 +00:00
commit cfbdd3f7e1
52 changed files with 696 additions and 256 deletions
Download patch file Download diff file Expand all files Collapse all files

15
db/migrate/005_tile_tracepoints.rb Normal file
View file

@ -0,0 +1,15 @@
class TileTracepoints < ActiveRecord::Migration
def self.up
add_column "gps_points", "tile", :integer, :null => false, :unsigned => true
add_index "gps_points", ["tile"], :name => "points_tile_idx"
remove_index "gps_points", :name => "points_idx"
Tracepoint.update_all("latitude = latitude * 10, longitude = longitude * 10, tile = tile_for_point(latitude * 10, longitude * 10)")
end
def self.down
add_index "gps_points", ["latitude", "longitude"], :name => "points_idx"
remove_index "gps_points", :name => "points_tile_idx"
remove_column "gps_points", "tile"
end
end

0
db/migrate/005_add_relations.rb → db/migrate/006_add_relations.rb
View file

4
db/migrate/006_remove_segments.rb → db/migrate/007_remove_segments.rb
View file

@ -5,9 +5,9 @@ class RemoveSegments < ActiveRecord::Migration
have_segs = select_value("SELECT count(*) FROM current_segments").to_i != 0
if have_segs
prefix = File.join Dir.tmpdir, "006_remove_segments.#{$$}."
prefix = File.join Dir.tmpdir, "007_remove_segments.#{$$}."
cmd = "db/migrate/006_remove_segments_helper"
cmd = "db/migrate/007_remove_segments_helper"
src = "#{cmd}.cc"
if not File.exists? cmd or File.mtime(cmd) < File.mtime(src) then
system 'c++ -O3 -Wall `mysql_config --cflags --libs` ' +

10
db/migrate/006_remove_segments_helper.cc → db/migrate/007_remove_segments_helper.cc
View file

@ -32,9 +32,9 @@ static T parse(const char *str) {
static void exit_mysql_err(MYSQL *mysql) {
const char *err = mysql_error(mysql);
if (err) {
fprintf(stderr, "005_remove_segments_helper: MySQL error: %s\n", err);
fprintf(stderr, "007_remove_segments_helper: MySQL error: %s\n", err);
} else {
fprintf(stderr, "005_remove_segments_helper: MySQL error\n");
fprintf(stderr, "007_remove_segments_helper: MySQL error\n");
}
abort();
exit(EXIT_FAILURE);
@ -43,9 +43,9 @@ static void exit_mysql_err(MYSQL *mysql) {
static void exit_stmt_err(MYSQL_STMT *stmt) {
const char *err = mysql_stmt_error(stmt);
if (err) {
fprintf(stderr, "005_remove_segments_helper: MySQL stmt error: %s\n", err);
fprintf(stderr, "007_remove_segments_helper: MySQL stmt error: %s\n", err);
} else {
fprintf(stderr, "005_remove_segments_helper: MySQL stmt error\n");
fprintf(stderr, "007_remove_segments_helper: MySQL stmt error\n");
}
abort();
exit(EXIT_FAILURE);
@ -536,7 +536,7 @@ int main(int argc, char **argv) {
char *tempfn;
if (argc != 8) {
printf("Usage: 006_remove_segments_helper host user passwd database port socket prefix\n");
printf("Usage: 007_remove_segments_helper host user passwd database port socket prefix\n");
exit(EXIT_FAILURE);
}