Update to iD v1.3.6

[rails.git] / db / README

diff --git a/db/README b/db/README
index 73d39194873827851dcfc3a3fb672d776651aee2..814dcb96cf8421f2912898d8b4582176b0910e0e 100644 (file)
--- a/db/README
+++ b/db/README
@@ -1,36 +1,44 @@
 Creating database
 ===================
 
-OSM server uses a database with the following name:
+OSM server uses a Postgres database with the following name:
 
 openstreetmap
 
 You may create it with your preferable client or run next (linux) command:
 
-$ mysqladmin -u <uid> -p create openstreetmap
+$ createdb openstreetmap
 
-(change <uid> with appropriate username of administrative user eg. root )
+Creating functions for PgSQL
+==============================
 
-Creating user, password, and access rights
-============================================
+Run this command in the db/functions directory:
 
-$ mysql -u <uid> -p
+$ make libpgosm.so
 
-(change <uid> with appropriate username of administrative user eg. root )
+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.
 
-> grant all privileges on openstreetmap.* to 'openstreetmap'@'localhost' identified by 'openstreetmap';
-> flush privileges;
-> exit
+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
 ===================================
 
-$ mysql openstreetmap -u openstreetmap -p < db/create_database.sql
-
-New server patch (RAILS)
-==========================
+Run this command from the root of your rails directory:
 
-Run following command to prepare tables to be OSM RAILS distribution compatible:
+$ rake db:migrate
 
-$ mysql openstreetmap -u openstreetmap -p < db/migrate.sql
+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/example.database.yml config/database.yml