making it clearer when a test case fails, as to which test case it is that is failing...

[rails.git] / db / README

diff --git a/db/README b/db/README
index 1b50ccd9b9000e2bfa8d10ae1efe4a79fb4a5658..447c63651f538952278eb69e10afb7dcbce6ffc3 100644 (file)
--- a/db/README
+++ b/db/README
@@ -1,16 +1,59 @@
-you want to do something like this
+Creating database
+===================
+
+OSM server uses a database with the following name:
+
+openstreetmap
+
+You may create it with your preferable client or run next (linux) command:
+
+$ mysql -u <uid> -p
+
+(change <uid> with appropriate username of administrative user eg. root )
+
+> create database openstreetmap default character set utf8;
+> exit
+
+Creating user, password, and access rights
+============================================
+
+$ mysql -u <uid> -p
+
+(change <uid> with appropriate username of administrative user eg. root )
 
-$ su
-# mysqladmin create openstreetmap
-# mysql
 > grant all privileges on openstreetmap.* to 'openstreetmap'@'localhost' identified by 'openstreetmap';
 > flush privileges;
 > exit
-# exit
-$ mysql openstreetmap -u openstreetmap -p < db/create_database.sql
 
-(the last line above gets you to what the server has right now)
+Creating functions
+====================
+
+Run this command in the db/functions directory:
+
+$ make
+
+Make sure the db/functions directory is on the MySQL server's library
+path and restart the MySQL server. 
+
+On Linux the easiest way to do this is to create /etc/ld.so.conf.d/osm.conf, and place the path to the db/functions directory in it and then run the ldconfig command as root.
+
+On OS X: sudo ln -s /path_to_your_osm_install/sites/rails_port/db/functions/libmyosm.so /usr/local/lib/libmyosm.so
+
+Now create the functions as follows:
+
+$ mysql -u <uid> -p openstreetmap
+
+(change <uid> with appropriate username of administrative user eg. root )
+
+> create function tile_for_point returns integer soname 'libmyosm.so';
+> create function maptile_for_point returns integer soname 'libmyosm.so';
+> exit
+
+Creating database skeleton tables
+===================================
+
+Run this command from the root of your rails directory:
 
-$ mysql openstreetmap -u openstreetmap -p < db/migrate.sql
+$ rake db:migrate
 
-(this line gets you to where its going to be when we go live with rails)
+This will create the db for you