Merge branch 'master' into terms

[rails.git] / db / README

diff --git a/db/README b/db/README
index f0002933938d842abfa0edf4aa09ac48551d6e03..db4f5c20ea23b4e6afa25259087e1556d83bd73b 100644 (file)
--- a/db/README
+++ b/db/README
@@ -32,6 +32,11 @@ Run this command in the db/functions directory:
 
 $ make libmyosm.so
 
+You might also need to install:
+- mysql client development libraries:  $ sudo apt-get install libmysqlclient16-dev 
+- ruby development libraries:          $ sudo apt-get install ruby1.8-dev
+for build to succeed.
+
 Make sure the db/functions directory is on the MySQL server's library
 path and restart the MySQL server. 
 
@@ -54,7 +59,12 @@ Creating functions for PgSQL
 
 Run this command in the db/functions directory:
 
-$ make libmyosm.so
+$ make libpgosm.so
+
+You might also need to install:
+- postgresql development libraries:    $ sudo apt-get install postgresql-server-dev-8.3
+- ruby development libraries:          $ sudo apt-get install ruby1.8-dev
+for build to succeed.
 
 Now create the function as follows:
 
@@ -62,7 +72,7 @@ $ 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', 'maptile_for_point'
+  AS '/path/to/rails-port/db/functions/libpgosm.so', 'maptile_for_point'
   LANGUAGE C STRICT;
 
 Creating database skeleton tables
@@ -73,3 +83,7 @@ Run this command from the root of your rails directory:
 $ rake db:migrate
 
 This will create the db for you
+
+You will need to make sure the database connection is configured in database.yml in config directory
+You might start with example configuration provided: 
+$ cp config/mysql.example.database.yml config/database.yml