Merged new translations from en.yml and translated them

[rails.git] / db / README

diff --git a/db/README b/db/README
index 73d39194873827851dcfc3a3fb672d776651aee2..39ce18023b2d1daa8638598e6e656dd7ec37931f 100644 (file)
--- a/db/README
+++ b/db/README
@@ -7,10 +7,13 @@ openstreetmap
 
 You may create it with your preferable client or run next (linux) command:
 
 
 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 )
 
 
 (change <uid> with appropriate username of administrative user eg. root )
 

+> create database openstreetmap default character set utf8;
+> exit
+

 Creating user, password, and access rights
 ============================================
 
 Creating user, password, and access rights
 ============================================
 


@@ -22,15 +25,51 @@ $ mysql -u <uid> -p
 > flush privileges;
 > exit
 
 > flush privileges;
 > exit
 

-Creating database skeleton tables
-===================================
+Creating functions For MySQL
+==============================
+
+Run this command in the db/functions directory:

 
 

-$ mysql openstreetmap -u openstreetmap -p < db/create_database.sql
+$ make libmyosm.so

 
 

-New server patch (RAILS)
-==========================
+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 functions for PgSQL
+==============================
+
+Run this command in the db/functions directory:
+
+$ make libpgosm.so
+
+Now create the function as follows:
+
+$ psql openstreetmap
+(This may need authentication or a -u <dbowneruid>)
+
+> CREATE FUNCTION maptile_for_point(int8, int8, int4) RETURNS int4 
+  AS '/path/to/rails-port/db/functions/libpgosm.so', 'maptile_for_point'
+  LANGUAGE C STRICT;
+
+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