From c60daaee562065a02bd6e913cebb770dbede33fe Mon Sep 17 00:00:00 2001 From: Ariana Barzinpour Date: Wed, 14 Jun 2023 02:43:55 +0000 Subject: [PATCH] update integration db names --- docs/installation/setup/common_install.rst | 13 +++++++------ docs/installation/setup/macosx.rst | 4 ++-- docs/installation/setup/ubuntu.rst | 8 ++++---- wordlist.txt | 2 ++ 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/docs/installation/setup/common_install.rst b/docs/installation/setup/common_install.rst index 44278f374..5018369ae 100644 --- a/docs/installation/setup/common_install.rst +++ b/docs/installation/setup/common_install.rst @@ -59,16 +59,17 @@ Since the only user who can connect to a fresh install is the postgres user, her postgres=# \password -Now we can create the ``agdcintegration`` and ``odcintegration`` databases for testing:: +Now we can create databases for integration testing. You will need 2 databases - one for the Postgres driver and one for the PostGIS driver. You can name these databases however you want. +In this example we will call the databases ``pgintegration`` and ``pgisintegration``:: - postgres=# create database agdcintegration; - postgres=# create database odcintegration; + postgres=# create database pgintegration; + postgres=# create database pgisintegration; Or, directly from the bash terminal:: - createdb agdcintegration - createdb odcintegration + createdb pgintegration + createdb pgisintegration Connecting to your own database to try out some SQL should now be as easy as:: - psql -d agdcintegration + psql -d pgintegration diff --git a/docs/installation/setup/macosx.rst b/docs/installation/setup/macosx.rst index af78a9ca0..e4db80bd3 100644 --- a/docs/installation/setup/macosx.rst +++ b/docs/installation/setup/macosx.rst @@ -33,14 +33,14 @@ Then edit the ``~/.datacube_integration.conf`` with a text editor and add the fo [datacube] db_hostname: localhost - db_database: agdcintegration + db_database: pgintegration index_driver: default db_username: db_password: [experimental] db_hostname: localhost - db_database: odcintegration + db_database: pgisintegration index_driver: postgis db_username: db_password: diff --git a/docs/installation/setup/ubuntu.rst b/docs/installation/setup/ubuntu.rst index a87cf230f..9e57a6e31 100644 --- a/docs/installation/setup/ubuntu.rst +++ b/docs/installation/setup/ubuntu.rst @@ -25,7 +25,7 @@ Ubuntu distribution, eg:: sudo apt-get install postgresql-14 - # Optionally, Postgis too + # Optionally, Postgis too (required for the postgis/experimental index driver) sudo apt-get install postgresql-14-postgis-3 Ubuntu's official repositories usually ship older versions of Postgres. You can alternatively get the most recent version from @@ -45,7 +45,7 @@ If createdb or psql cannot connect to server, check which postgresql installatio If it is running the mambaforge installation, you may need to run the global installation:: - /usr/bin/psql -d agdcintegration + /usr/bin/psql -d pgintegration You can now specify the database user and password for ODC integration testing. To do this:: @@ -56,14 +56,14 @@ Then edit the ``~/.datacube_integration.conf`` with a text editor and add the fo [datacube] db_hostname: /var/run/postgresql - db_database: agdcintegration + db_database: pgintegration index_driver: default db_username: db_password: [experimental] db_hostname: /var/run/postgresql - db_database: odcintegration + db_database: pgisintegration index_driver: postgis db_username: db_password: diff --git a/wordlist.txt b/wordlist.txt index 3b23a0cef..4cd2ffb99 100644 --- a/wordlist.txt +++ b/wordlist.txt @@ -335,6 +335,8 @@ params pc petewa pgadmin +pgintegration +pgisintegration pixelquality pkgs Pluggable