hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-16 15:47:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

replace database abstraction DB with PDO

Browse Source
This commit is contained in:
marc tobias
2019-02-24 16:14:36 +01:00
parent b20a534e0c
commit d4b633bfc5
42 changed files with 499 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
vagrant/Install-on-Centos-7.sh
View File

@@ -23,7 +23,7 @@
sudo yum install -y postgresql-server postgresql-contrib postgresql-devel \
postgis postgis-utils \
wget git cmake make gcc gcc-c++ libtool policycoreutils-python \
php-pgsql php php-pear php-pear-DB php-intl libpqxx-devel \
php-pgsql php php-intl libpqxx-devel \
proj-epsg bzip2-devel proj-devel libxml2-devel boost-devel \
expat-devel zlib-devel
@@ -34,7 +34,9 @@
sudo yum install -y python34-pip python34-setuptools python34-devel \
php-phpunit-PHPUnit
pip3 install --user behave nose pytidylib psycopg2
sudo pear install PHP_CodeSniffer
composer global require "squizlabs/php_codesniffer=*"
sudo ln -s ~/.config/composer/vendor/bin/phpcs /usr/bin/
#
# System Configuration

6
vagrant/Install-on-Ubuntu-16.sh
View File

@@ -29,7 +29,7 @@ export DEBIAN_FRONTEND=noninteractive #DOCS:
libbz2-dev libpq-dev libproj-dev \
postgresql-server-dev-9.5 postgresql-9.5-postgis-2.2 \
postgresql-contrib-9.5 \
apache2 php php-pgsql libapache2-mod-php php-pear php-db \
apache2 php php-pgsql libapache2-mod-php \
php-intl git
# If you want to run the test suite, you need to install the following
@@ -39,7 +39,9 @@ export DEBIAN_FRONTEND=noninteractive #DOCS:
python3-psycopg2 python3-tidylib phpunit php-cgi
pip3 install --user behave nose
sudo pear install PHP_CodeSniffer
composer global require "squizlabs/php_codesniffer=*"
sudo ln -s ~/.config/composer/vendor/bin/phpcs /usr/bin/
#
# System Configuration

2
vagrant/Install-on-Ubuntu-18-nginx.sh
View File

@@ -22,7 +22,7 @@ export DEBIAN_FRONTEND=noninteractive
libbz2-dev libpq-dev libproj-dev \
postgresql-server-dev-10 postgresql-10-postgis-2.4 \
postgresql-contrib-10 \
nginx php-fpm php php-pgsql php-pear php-db \
nginx php-fpm php php-pgsql \
php-intl git
export USERNAME=vagrant

6
vagrant/Install-on-Ubuntu-18.sh
View File

@@ -29,7 +29,7 @@ export DEBIAN_FRONTEND=noninteractive #DOCS:
libbz2-dev libpq-dev libproj-dev \
postgresql-server-dev-10 postgresql-10-postgis-2.4 \
postgresql-contrib-10 postgresql-10-postgis-scripts \
apache2 php php-pgsql libapache2-mod-php php-pear php-db \
apache2 php php-pgsql libapache2-mod-php \
php-intl git
# If you want to run the test suite, you need to install the following
@@ -39,7 +39,9 @@ export DEBIAN_FRONTEND=noninteractive #DOCS:
python3-psycopg2 python3-tidylib phpunit php-cgi
pip3 install --user behave nose
sudo pear install PHP_CodeSniffer
composer global require "squizlabs/php_codesniffer=*"
sudo ln -s ~/.config/composer/vendor/bin/phpcs /usr/bin/
#
# System Configuration

22
vagrant/install-on-travis-ci.sh
View File

@@ -16,34 +16,16 @@ sudo apt-get install -y -qq libboost-dev libboost-system-dev \
libboost-filesystem-dev libexpat1-dev zlib1g-dev libxml2-dev\
libbz2-dev libpq-dev libproj-dev \
postgresql-server-dev-9.6 postgresql-9.6-postgis-2.4 postgresql-contrib-9.6 \
apache2 php php-pgsql php-intl php-pear
apache2 php php-pgsql php-intl
sudo apt-get install -y -qq python3-dev python3-pip python3-psycopg2 php-cgi
pip3 install --quiet behave nose pytidylib psycopg2-binary
# Travis uses phpenv to support multiple PHP versions. We need to make sure
# these packages get installed to the phpenv-set PHP (inside /home/travis/.phpenv/),
# not the system PHP (/usr/bin/php, /usr/share/php/ etc)
# $PHPENV_VERSION and $TRAVIS_PHP_VERSION are unset.
export PHPENV_VERSION=$(cat /home/travis/.phpenv/version)
echo $PHPENV_VERSION
# https://github.com/pear/DB
composer global require "pear/db=1.9.3"
# https://github.com/squizlabs/PHP_CodeSniffer
composer global require "squizlabs/php_codesniffer=*"
sudo ln -s /home/travis/.config/composer/vendor/bin/phpcs /usr/bin/
# make sure PEAR.php and DB.php are in the include path
tee /tmp/travis.php.ini << EOF
include_path = .:/home/travis/.phpenv/versions/$PHPENV_VERSION/share/pear:/home/travis/.config/composer/vendor/pear/db
EOF
phpenv config-add /tmp/travis.php.ini
sudo -u postgres createuser -S www-data
# Make sure that system servers can read from the home directory:
@@ -77,7 +59,7 @@ make
tee settings/local.php << EOF
<?php
@define('CONST_Website_BaseURL', '/nominatim/');
@define('CONST_Database_DSN', 'pgsql://@/test_api_nominatim');
@define('CONST_Database_DSN', 'pgsql:dbname=test_api_nominatim');
@define('CONST_Wikipedia_Data_Path', CONST_BasePath.'/test/testdb');
EOF