X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/1f8bf07464804e456d58e6c30238e79d6191b17d..962573431e55f928abb0bb27ec8c5225c94eaed9:/db/README?ds=sidebyside

diff --git a/db/README b/db/README
index 73d391948..447c63651 100644
--- a/db/README
+++ b/db/README
@@ -7,10 +7,13 @@ openstreetmap
 
 You may create it with your preferable client or run next (linux) command:
 
-$ mysqladmin -u <uid> -p create openstreetmap
+$ 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
 ============================================
 
@@ -22,15 +25,35 @@ $ mysql -u <uid> -p
 > flush privileges;
 > exit
 
-Creating database skeleton tables
-===================================
+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.
 
-$ mysql openstreetmap -u openstreetmap -p < db/create_database.sql
+On OS X: sudo ln -s /path_to_your_osm_install/sites/rails_port/db/functions/libmyosm.so /usr/local/lib/libmyosm.so
 
-New server patch (RAILS)
-==========================
+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 following command to prepare tables to be OSM RAILS distribution compatible:
+Run this command from the root of your rails directory:
 
-$ mysql openstreetmap -u openstreetmap -p < db/migrate.sql
+$ rake db:migrate
 
+This will create the db for you