From: Tom Hughes <tom@compton.nu>
Date: Sun, 24 Apr 2016 17:42:47 +0000 (+0100)
Subject: Merge remote-tracking branch 'openstreetmap/pull/1208'
X-Git-Tag: live~3886
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/8c23f36a099780daac2eb84935b9e054448550d6?hp=c3c6cfd6e6280dc604a11c987fcc7b2278e21140

Merge remote-tracking branch 'openstreetmap/pull/1208'
---

diff --git a/db/MAKE_MIGRATIONS_AND_TEST_THEM_DONT_PUT_SQL_HERE_ANY_MORE b/db/MAKE_MIGRATIONS_AND_TEST_THEM_DONT_PUT_SQL_HERE_ANY_MORE
deleted file mode 100644
index e69de29bb..000000000
diff --git a/db/README b/db/README
deleted file mode 100644
index 814dcb96c..000000000
--- a/db/README
+++ /dev/null
@@ -1,44 +0,0 @@
-Creating database
-===================
-
-OSM server uses a Postgres database with the following name:
-
-openstreetmap
-
-You may create it with your preferable client or run next (linux) command:
-
-$ createdb openstreetmap
-
-Creating functions for PgSQL
-==============================
-
-Run this command in the db/functions directory:
-
-$ 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:
-
-$ 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 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/example.database.yml config/database.yml