From 841768c3012e95728bb6b2f0a012863df3d16ee6 Mon Sep 17 00:00:00 2001 From: Corey Date: Fri, 13 Mar 2020 23:34:57 -0400 Subject: [PATCH 001/106] Attempting to fix Postgres issue --- .travis.yml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index c47d33628c..9d679e6d57 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,12 +4,12 @@ dist: xenial services: - redis - docker -addons: - postgresql: '11' - apt: - packages: - - postgresql-11-postgis-2.5 - - postgresql-11-postgis-2.5-scripts +#addons: +# postgresql: '11' +# apt: +# packages: +# - postgresql-11-postgis-2.5 +# - postgresql-11-postgis-2.5-scripts branches: only: - master @@ -34,6 +34,9 @@ before_install: - nvm install $NODE_VERSION - nvm use $NODE_VERSION - npm install -g greenkeeper-lockfile@1 +- sudo apt-get remove -q 'postgresql-*' +- sudo apt-get update -q +- sudo apt-get install -q postgresql-11 postgresql-11-postgis-2.5 postgresql-11-postgis-2.5-scripts - sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/11/main/postgresql.conf - sudo cp /etc/postgresql/{10,11}/main/pg_hba.conf - sudo service postgresql stop From 33da65ef40e9d09ae09fe33f89402e7ad74ec428 Mon Sep 17 00:00:00 2001 From: Corey Date: Fri, 13 Mar 2020 23:58:51 -0400 Subject: [PATCH 002/106] Attempting to fix Postgres issue trying to stop loop --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9d679e6d57..cd6b58b78e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ services: # apt: # packages: # - postgresql-11-postgis-2.5 -# - postgresql-11-postgis-2.5-scripts +# - postgresql-11-postgis-2.5-scripts # branches: only: - master From 43b714de8eacb449c5287166883e8295f2a04535 Mon Sep 17 00:00:00 2001 From: Corey Date: Sat, 14 Mar 2020 08:59:03 -0400 Subject: [PATCH 003/106] Attempting to fix Postgres isolating postgres calls --- .travis.yml | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index cd6b58b78e..5b46b0517d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,18 +34,20 @@ before_install: - nvm install $NODE_VERSION - nvm use $NODE_VERSION - npm install -g greenkeeper-lockfile@1 -- sudo apt-get remove -q 'postgresql-*' -- sudo apt-get update -q -- sudo apt-get install -q postgresql-11 postgresql-11-postgis-2.5 postgresql-11-postgis-2.5-scripts -- sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/11/main/postgresql.conf -- sudo cp /etc/postgresql/{10,11}/main/pg_hba.conf -- sudo service postgresql stop -- sudo service postgresql start 11 +- if env(PARSE_SERVER_TEST_DB) = postgres + sudo apt-get remove -q 'postgresql-*' + sudo apt-get update -q + sudo apt-get install -q postgresql-11 postgresql-11-postgis-2.5 postgresql-11-postgis-2.5-scripts + sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/11/main/postgresql.conf + sudo cp /etc/postgresql/{10,11}/main/pg_hba.conf + sudo service postgresql stop + sudo service postgresql start 11 before_script: - node -e 'require("./lib/index.js")' -- psql -c 'create database parse_server_postgres_adapter_test_database;' -U postgres -- psql -c 'CREATE EXTENSION postgis;' -U postgres -d parse_server_postgres_adapter_test_database -- psql -c 'CREATE EXTENSION postgis_topology;' -U postgres -d parse_server_postgres_adapter_test_database +- if env(PARSE_SERVER_TEST_DB) = postgres + psql -c 'create database parse_server_postgres_adapter_test_database;' -U postgres + psql -c 'CREATE EXTENSION postgis;' -U postgres -d parse_server_postgres_adapter_test_database + psql -c 'CREATE EXTENSION postgis_topology;' -U postgres -d parse_server_postgres_adapter_test_database - greenkeeper-lockfile-update script: - npm run lint From 801063371e94af6f52d85c1deee3c07d3b11ee0c Mon Sep 17 00:00:00 2001 From: Corey Date: Sat, 14 Mar 2020 10:16:54 -0400 Subject: [PATCH 004/106] Attempting to fix Postgres issue Separating jobs --- .travis.yml | 52 ++++++++++++++++++++++++++++------------------------ 1 file changed, 28 insertions(+), 24 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5b46b0517d..2289807dcf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,12 +4,6 @@ dist: xenial services: - redis - docker -#addons: -# postgresql: '11' -# apt: -# packages: -# - postgresql-11-postgis-2.5 -# - postgresql-11-postgis-2.5-scripts # branches: only: - master @@ -24,30 +18,12 @@ cache: env: global: - COVERAGE_OPTION='./node_modules/.bin/nyc' - jobs: - - MONGODB_VERSION=4.0.4 MONGODB_TOPOLOGY=replicaset MONGODB_STORAGE_ENGINE=wiredTiger - - MONGODB_VERSION=3.6.9 - - PARSE_SERVER_TEST_DB=postgres - - PARSE_SERVER_TEST_CACHE=redis - - NODE_VERSION=12.12.0 before_install: - nvm install $NODE_VERSION - nvm use $NODE_VERSION - npm install -g greenkeeper-lockfile@1 -- if env(PARSE_SERVER_TEST_DB) = postgres - sudo apt-get remove -q 'postgresql-*' - sudo apt-get update -q - sudo apt-get install -q postgresql-11 postgresql-11-postgis-2.5 postgresql-11-postgis-2.5-scripts - sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/11/main/postgresql.conf - sudo cp /etc/postgresql/{10,11}/main/pg_hba.conf - sudo service postgresql stop - sudo service postgresql start 11 before_script: - node -e 'require("./lib/index.js")' -- if env(PARSE_SERVER_TEST_DB) = postgres - psql -c 'create database parse_server_postgres_adapter_test_database;' -U postgres - psql -c 'CREATE EXTENSION postgis;' -U postgres -d parse_server_postgres_adapter_test_database - psql -c 'CREATE EXTENSION postgis_topology;' -U postgres -d parse_server_postgres_adapter_test_database - greenkeeper-lockfile-update script: - npm run lint @@ -55,6 +31,34 @@ script: after_script: - greenkeeper-lockfile-upload - bash <(curl -s https://codecov.io/bash) +jobs: +- MONGODB_VERSION=4.0.4 MONGODB_TOPOLOGY=replicaset MONGODB_STORAGE_ENGINE=wiredTiger +- MONGODB_VERSION=3.6.9 +- PARSE_SERVER_TEST_CACHE=redis +- NODE_VERSION=12.12.0 +jobs: +- PARSE_SERVER_TEST_DB=postgres +- PARSE_SERVER_TEST_CACHE=redis +- NODE_VERSION=12.12.0 + addons: + postgresql: '11' + apt: + packages: + - postgresql-11-postgis-2.5 + - postgresql-11-postgis-2.5-scripts # +before_install: +- sudo apt-get remove -q 'postgresql-*' +- sudo apt-get update -q +- sudo apt-get install -q postgresql-11 postgresql-11-postgis-2.5 postgresql-11-postgis-2.5-scripts +- sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/11/main/postgresql.conf +- sudo cp /etc/postgresql/{10,11}/main/pg_hba.conf +- sudo service postgresql stop +- sudo service postgresql start 11 +before_script: +- node -e 'require("./lib/index.js")' +- psql -c 'create database parse_server_postgres_adapter_test_database;' -U postgres +- psql -c 'CREATE EXTENSION postgis;' -U postgres -d parse_server_postgres_adapter_test_database +- psql -c 'CREATE EXTENSION postgis_topology;' -U postgres -d parse_server_postgres_adapter_test_database jobs: allow_failures: - env: NODE_VERSION=12.12.0 From cc2506a2ce2d434f557016450b9316de9b866f1e Mon Sep 17 00:00:00 2001 From: Corey Date: Sat, 14 Mar 2020 10:24:00 -0400 Subject: [PATCH 005/106] Attempting to fix postgres --- .travis.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2289807dcf..4cb374eb63 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,6 +18,9 @@ cache: env: global: - COVERAGE_OPTION='./node_modules/.bin/nyc' + jobs: + - PARSE_SERVER_TEST_CACHE=redis + - NODE_VERSION=12.12.0 before_install: - nvm install $NODE_VERSION - nvm use $NODE_VERSION @@ -34,12 +37,8 @@ after_script: jobs: - MONGODB_VERSION=4.0.4 MONGODB_TOPOLOGY=replicaset MONGODB_STORAGE_ENGINE=wiredTiger - MONGODB_VERSION=3.6.9 -- PARSE_SERVER_TEST_CACHE=redis -- NODE_VERSION=12.12.0 jobs: - PARSE_SERVER_TEST_DB=postgres -- PARSE_SERVER_TEST_CACHE=redis -- NODE_VERSION=12.12.0 addons: postgresql: '11' apt: From 05181a756aa6ea57e6d7267b191c2c846026b10d Mon Sep 17 00:00:00 2001 From: Corey Date: Sat, 14 Mar 2020 10:25:46 -0400 Subject: [PATCH 006/106] Attempting to fix postgres --- .travis.yml | 40 ++++++++++++++++------------------------ 1 file changed, 16 insertions(+), 24 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4cb374eb63..c47d33628c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,12 @@ dist: xenial services: - redis - docker +addons: + postgresql: '11' + apt: + packages: + - postgresql-11-postgis-2.5 + - postgresql-11-postgis-2.5-scripts branches: only: - master @@ -19,36 +25,15 @@ env: global: - COVERAGE_OPTION='./node_modules/.bin/nyc' jobs: + - MONGODB_VERSION=4.0.4 MONGODB_TOPOLOGY=replicaset MONGODB_STORAGE_ENGINE=wiredTiger + - MONGODB_VERSION=3.6.9 + - PARSE_SERVER_TEST_DB=postgres - PARSE_SERVER_TEST_CACHE=redis - NODE_VERSION=12.12.0 before_install: - nvm install $NODE_VERSION - nvm use $NODE_VERSION - npm install -g greenkeeper-lockfile@1 -before_script: -- node -e 'require("./lib/index.js")' -- greenkeeper-lockfile-update -script: -- npm run lint -- npm run pretest && npm run coverage -after_script: -- greenkeeper-lockfile-upload -- bash <(curl -s https://codecov.io/bash) -jobs: -- MONGODB_VERSION=4.0.4 MONGODB_TOPOLOGY=replicaset MONGODB_STORAGE_ENGINE=wiredTiger -- MONGODB_VERSION=3.6.9 -jobs: -- PARSE_SERVER_TEST_DB=postgres - addons: - postgresql: '11' - apt: - packages: - - postgresql-11-postgis-2.5 - - postgresql-11-postgis-2.5-scripts # -before_install: -- sudo apt-get remove -q 'postgresql-*' -- sudo apt-get update -q -- sudo apt-get install -q postgresql-11 postgresql-11-postgis-2.5 postgresql-11-postgis-2.5-scripts - sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/11/main/postgresql.conf - sudo cp /etc/postgresql/{10,11}/main/pg_hba.conf - sudo service postgresql stop @@ -58,6 +43,13 @@ before_script: - psql -c 'create database parse_server_postgres_adapter_test_database;' -U postgres - psql -c 'CREATE EXTENSION postgis;' -U postgres -d parse_server_postgres_adapter_test_database - psql -c 'CREATE EXTENSION postgis_topology;' -U postgres -d parse_server_postgres_adapter_test_database +- greenkeeper-lockfile-update +script: +- npm run lint +- npm run pretest && npm run coverage +after_script: +- greenkeeper-lockfile-upload +- bash <(curl -s https://codecov.io/bash) jobs: allow_failures: - env: NODE_VERSION=12.12.0 From 1ff769dc96be06e6b20de9c27bafb34fc641b0a9 Mon Sep 17 00:00:00 2001 From: Corey Date: Sat, 14 Mar 2020 10:48:59 -0400 Subject: [PATCH 007/106] Attempting to fix postgres Separating builds again --- .travis.yml | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index c47d33628c..692d6e0478 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,12 +4,6 @@ dist: xenial services: - redis - docker -addons: - postgresql: '11' - apt: - packages: - - postgresql-11-postgis-2.5 - - postgresql-11-postgis-2.5-scripts branches: only: - master @@ -27,22 +21,14 @@ env: jobs: - MONGODB_VERSION=4.0.4 MONGODB_TOPOLOGY=replicaset MONGODB_STORAGE_ENGINE=wiredTiger - MONGODB_VERSION=3.6.9 - - PARSE_SERVER_TEST_DB=postgres - PARSE_SERVER_TEST_CACHE=redis - NODE_VERSION=12.12.0 before_install: - nvm install $NODE_VERSION - nvm use $NODE_VERSION - npm install -g greenkeeper-lockfile@1 -- sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/11/main/postgresql.conf -- sudo cp /etc/postgresql/{10,11}/main/pg_hba.conf -- sudo service postgresql stop -- sudo service postgresql start 11 before_script: - node -e 'require("./lib/index.js")' -- psql -c 'create database parse_server_postgres_adapter_test_database;' -U postgres -- psql -c 'CREATE EXTENSION postgis;' -U postgres -d parse_server_postgres_adapter_test_database -- psql -c 'CREATE EXTENSION postgis_topology;' -U postgres -d parse_server_postgres_adapter_test_database - greenkeeper-lockfile-update script: - npm run lint @@ -51,6 +37,29 @@ after_script: - greenkeeper-lockfile-upload - bash <(curl -s https://codecov.io/bash) jobs: + include: + env: + - PARSE_SERVER_TEST_DB=postgres + before_install: + - nvm install $NODE_VERSION + - nvm use $NODE_VERSION + - npm install -g greenkeeper-lockfile@1 + - sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/11/main/postgresql.conf + - sudo cp /etc/postgresql/{10,11}/main/pg_hba.conf + - sudo service postgresql stop + - sudo service postgresql start 11 + before_script: + - node -e 'require("./lib/index.js")' + - psql -c 'create database parse_server_postgres_adapter_test_database;' -U postgres + - psql -c 'CREATE EXTENSION postgis;' -U postgres -d parse_server_postgres_adapter_test_database + - psql -c 'CREATE EXTENSION postgis_topology;' -U postgres -d parse_server_postgres_adapter_test_database + - greenkeeper-lockfile-update + addons: + postgresql: '11' + apt: + packages: + - postgresql-11-postgis-2.5 + - postgresql-11-postgis-2.5-scripts allow_failures: - env: NODE_VERSION=12.12.0 include: From fba1b83f03192534443ad52b620c9510904d5610 Mon Sep 17 00:00:00 2001 From: Corey Date: Sat, 14 Mar 2020 10:53:36 -0400 Subject: [PATCH 008/106] Attempting to fix postgres --- .travis.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 692d6e0478..d937365256 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,6 +38,12 @@ after_script: - bash <(curl -s https://codecov.io/bash) jobs: include: + addons: + postgresql: '11' + apt: + packages: + - postgresql-11-postgis-2.5 + - postgresql-11-postgis-2.5-scripts env: - PARSE_SERVER_TEST_DB=postgres before_install: @@ -54,12 +60,6 @@ jobs: - psql -c 'CREATE EXTENSION postgis;' -U postgres -d parse_server_postgres_adapter_test_database - psql -c 'CREATE EXTENSION postgis_topology;' -U postgres -d parse_server_postgres_adapter_test_database - greenkeeper-lockfile-update - addons: - postgresql: '11' - apt: - packages: - - postgresql-11-postgis-2.5 - - postgresql-11-postgis-2.5-scripts allow_failures: - env: NODE_VERSION=12.12.0 include: From edf60e8cf558a22edaf3c4a7ec5307cd93046228 Mon Sep 17 00:00:00 2001 From: Corey Date: Sat, 14 Mar 2020 11:32:21 -0400 Subject: [PATCH 009/106] Attempting to fix postgres --- .travis.yml | 44 +++++++++++++++++++++----------------------- 1 file changed, 21 insertions(+), 23 deletions(-) diff --git a/.travis.yml b/.travis.yml index d937365256..8418bf0df3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,12 @@ dist: xenial services: - redis - docker +addons: + postgresql: '11' + apt: + packages: + - postgresql-11-postgis-2.5 + - postgresql-11-postgis-2.5-scripts branches: only: - master @@ -21,6 +27,21 @@ env: jobs: - MONGODB_VERSION=4.0.4 MONGODB_TOPOLOGY=replicaset MONGODB_STORAGE_ENGINE=wiredTiger - MONGODB_VERSION=3.6.9 + - PARSE_SERVER_TEST_DB=postgres + before_install: + - nvm install $NODE_VERSION + - nvm use $NODE_VERSION + - npm install -g greenkeeper-lockfile@1 + - sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/11/main/postgresql.conf + - sudo cp /etc/postgresql/{10,11}/main/pg_hba.conf + - sudo service postgresql stop + - sudo service postgresql start 11 + before_script: + - node -e 'require("./lib/index.js")' + - psql -c 'create database parse_server_postgres_adapter_test_database;' -U postgres + - psql -c 'CREATE EXTENSION postgis;' -U postgres -d parse_server_postgres_adapter_test_database + - psql -c 'CREATE EXTENSION postgis_topology;' -U postgres -d parse_server_postgres_adapter_test_database + - greenkeeper-lockfile-update - PARSE_SERVER_TEST_CACHE=redis - NODE_VERSION=12.12.0 before_install: @@ -37,29 +58,6 @@ after_script: - greenkeeper-lockfile-upload - bash <(curl -s https://codecov.io/bash) jobs: - include: - addons: - postgresql: '11' - apt: - packages: - - postgresql-11-postgis-2.5 - - postgresql-11-postgis-2.5-scripts - env: - - PARSE_SERVER_TEST_DB=postgres - before_install: - - nvm install $NODE_VERSION - - nvm use $NODE_VERSION - - npm install -g greenkeeper-lockfile@1 - - sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/11/main/postgresql.conf - - sudo cp /etc/postgresql/{10,11}/main/pg_hba.conf - - sudo service postgresql stop - - sudo service postgresql start 11 - before_script: - - node -e 'require("./lib/index.js")' - - psql -c 'create database parse_server_postgres_adapter_test_database;' -U postgres - - psql -c 'CREATE EXTENSION postgis;' -U postgres -d parse_server_postgres_adapter_test_database - - psql -c 'CREATE EXTENSION postgis_topology;' -U postgres -d parse_server_postgres_adapter_test_database - - greenkeeper-lockfile-update allow_failures: - env: NODE_VERSION=12.12.0 include: From c884e5df16d48f1c01ba05cad1ad2e3341dc7090 Mon Sep 17 00:00:00 2001 From: Corey Date: Sat, 14 Mar 2020 11:45:55 -0400 Subject: [PATCH 010/106] Attempting to fix postgres Just added back version 10, just in case it gets called --- .travis.yml | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8418bf0df3..2859ab838f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,8 @@ addons: postgresql: '11' apt: packages: + - postgresql-10-postgis-2.5 + - postgresql-10-postgis-2.5-scripts - postgresql-11-postgis-2.5 - postgresql-11-postgis-2.5-scripts branches: @@ -28,28 +30,21 @@ env: - MONGODB_VERSION=4.0.4 MONGODB_TOPOLOGY=replicaset MONGODB_STORAGE_ENGINE=wiredTiger - MONGODB_VERSION=3.6.9 - PARSE_SERVER_TEST_DB=postgres - before_install: - - nvm install $NODE_VERSION - - nvm use $NODE_VERSION - - npm install -g greenkeeper-lockfile@1 - - sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/11/main/postgresql.conf - - sudo cp /etc/postgresql/{10,11}/main/pg_hba.conf - - sudo service postgresql stop - - sudo service postgresql start 11 - before_script: - - node -e 'require("./lib/index.js")' - - psql -c 'create database parse_server_postgres_adapter_test_database;' -U postgres - - psql -c 'CREATE EXTENSION postgis;' -U postgres -d parse_server_postgres_adapter_test_database - - psql -c 'CREATE EXTENSION postgis_topology;' -U postgres -d parse_server_postgres_adapter_test_database - - greenkeeper-lockfile-update - PARSE_SERVER_TEST_CACHE=redis - NODE_VERSION=12.12.0 before_install: - nvm install $NODE_VERSION - nvm use $NODE_VERSION - npm install -g greenkeeper-lockfile@1 +- sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/11/main/postgresql.conf +- sudo cp /etc/postgresql/{10,11}/main/pg_hba.conf +- sudo service postgresql stop +- sudo service postgresql start 11 before_script: - node -e 'require("./lib/index.js")' +- psql -c 'create database parse_server_postgres_adapter_test_database;' -U postgres +- psql -c 'CREATE EXTENSION postgis;' -U postgres -d parse_server_postgres_adapter_test_database +- psql -c 'CREATE EXTENSION postgis_topology;' -U postgres -d parse_server_postgres_adapter_test_database - greenkeeper-lockfile-update script: - npm run lint From e5532008304d70bd41fdab4fca2893044d90a4b2 Mon Sep 17 00:00:00 2001 From: Corey Date: Sat, 14 Mar 2020 12:12:26 -0400 Subject: [PATCH 011/106] Attempting to fix postgres --- .travis.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2859ab838f..0556f5dee4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,8 +8,8 @@ addons: postgresql: '11' apt: packages: - - postgresql-10-postgis-2.5 - - postgresql-10-postgis-2.5-scripts + #- postgresql-10-postgis-2.5 + #- postgresql-10-postgis-2.5-scripts - postgresql-11-postgis-2.5 - postgresql-11-postgis-2.5-scripts branches: @@ -26,6 +26,7 @@ cache: env: global: - COVERAGE_OPTION='./node_modules/.bin/nyc' + - PGPORT=5433 jobs: - MONGODB_VERSION=4.0.4 MONGODB_TOPOLOGY=replicaset MONGODB_STORAGE_ENGINE=wiredTiger - MONGODB_VERSION=3.6.9 @@ -42,7 +43,7 @@ before_install: - sudo service postgresql start 11 before_script: - node -e 'require("./lib/index.js")' -- psql -c 'create database parse_server_postgres_adapter_test_database;' -U postgres +- psql -c 'CREATE DATABASE parse_server_postgres_adapter_test_database;' -U postgres - psql -c 'CREATE EXTENSION postgis;' -U postgres -d parse_server_postgres_adapter_test_database - psql -c 'CREATE EXTENSION postgis_topology;' -U postgres -d parse_server_postgres_adapter_test_database - greenkeeper-lockfile-update From c7b4411a5bdd86f0167e3f6bce62c54e0b5f112d Mon Sep 17 00:00:00 2001 From: Corey Date: Sat, 14 Mar 2020 12:20:08 -0400 Subject: [PATCH 012/106] Attempting to fix postgres --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0556f5dee4..1b7512cc39 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,8 +37,8 @@ before_install: - nvm install $NODE_VERSION - nvm use $NODE_VERSION - npm install -g greenkeeper-lockfile@1 -- sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/11/main/postgresql.conf -- sudo cp /etc/postgresql/{10,11}/main/pg_hba.conf +#- sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/11/main/postgresql.conf +#- sudo cp /etc/postgresql/{10,11}/main/pg_hba.conf - sudo service postgresql stop - sudo service postgresql start 11 before_script: From 063dd2f82d0ae3285d8abf9d3a9624361afbde65 Mon Sep 17 00:00:00 2001 From: Corey Date: Sat, 14 Mar 2020 12:35:03 -0400 Subject: [PATCH 013/106] Attempting to fix postgres --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1b7512cc39..d7e730a072 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,7 @@ addons: #- postgresql-10-postgis-2.5-scripts - postgresql-11-postgis-2.5 - postgresql-11-postgis-2.5-scripts + - postgresql-client-11 branches: only: - master @@ -38,7 +39,7 @@ before_install: - nvm use $NODE_VERSION - npm install -g greenkeeper-lockfile@1 #- sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/11/main/postgresql.conf -#- sudo cp /etc/postgresql/{10,11}/main/pg_hba.conf +- sudo cp /etc/postgresql/{10,11}/main/pg_hba.conf - sudo service postgresql stop - sudo service postgresql start 11 before_script: From d357a4722dc33257e91c840c4d7880e0d9240cda Mon Sep 17 00:00:00 2001 From: Corey Date: Sat, 14 Mar 2020 12:38:22 -0400 Subject: [PATCH 014/106] Attempting to fix postgres --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index d7e730a072..8e34ce892d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,7 @@ cache: env: global: - COVERAGE_OPTION='./node_modules/.bin/nyc' - - PGPORT=5433 + - PGPORT=5432 jobs: - MONGODB_VERSION=4.0.4 MONGODB_TOPOLOGY=replicaset MONGODB_STORAGE_ENGINE=wiredTiger - MONGODB_VERSION=3.6.9 @@ -38,7 +38,7 @@ before_install: - nvm install $NODE_VERSION - nvm use $NODE_VERSION - npm install -g greenkeeper-lockfile@1 -#- sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/11/main/postgresql.conf +- sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/11/main/postgresql.conf - sudo cp /etc/postgresql/{10,11}/main/pg_hba.conf - sudo service postgresql stop - sudo service postgresql start 11 From b0489664485991454f9789a89e0b9bc0bc70feb0 Mon Sep 17 00:00:00 2001 From: Corey Date: Sat, 14 Mar 2020 12:49:50 -0400 Subject: [PATCH 015/106] Attempting to fix postgres --- .travis.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8e34ce892d..5bf60a941e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,11 +8,11 @@ addons: postgresql: '11' apt: packages: - #- postgresql-10-postgis-2.5 - #- postgresql-10-postgis-2.5-scripts + - postgresql-11-postgis-2.4 + - postgresql-11-postgis-2.4-scripts - postgresql-11-postgis-2.5 - postgresql-11-postgis-2.5-scripts - - postgresql-client-11 + #- postgresql-client-11 branches: only: - master @@ -47,6 +47,7 @@ before_script: - psql -c 'CREATE DATABASE parse_server_postgres_adapter_test_database;' -U postgres - psql -c 'CREATE EXTENSION postgis;' -U postgres -d parse_server_postgres_adapter_test_database - psql -c 'CREATE EXTENSION postgis_topology;' -U postgres -d parse_server_postgres_adapter_test_database +- psql -c 'ALTER EXTENSION postgis; ALTER EXTENSION postgis_topology UPDATE;' -U postgres -d parse_server_postgres_adapter_test_database - greenkeeper-lockfile-update script: - npm run lint From 299b91d7d334678ef43f7a34b723e7ec4401b645 Mon Sep 17 00:00:00 2001 From: Corey Date: Sat, 14 Mar 2020 12:52:32 -0400 Subject: [PATCH 016/106] Attempting to fix postgres --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5bf60a941e..64711209c1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,8 +8,6 @@ addons: postgresql: '11' apt: packages: - - postgresql-11-postgis-2.4 - - postgresql-11-postgis-2.4-scripts - postgresql-11-postgis-2.5 - postgresql-11-postgis-2.5-scripts #- postgresql-client-11 @@ -27,7 +25,7 @@ cache: env: global: - COVERAGE_OPTION='./node_modules/.bin/nyc' - - PGPORT=5432 + #- PGPORT=5432 jobs: - MONGODB_VERSION=4.0.4 MONGODB_TOPOLOGY=replicaset MONGODB_STORAGE_ENGINE=wiredTiger - MONGODB_VERSION=3.6.9 From 6adf026710ee434b0ec7b3248c1a5120bd6472cb Mon Sep 17 00:00:00 2001 From: Corey Date: Sat, 14 Mar 2020 12:57:11 -0400 Subject: [PATCH 017/106] Attempting to fix postgres --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 64711209c1..879f0a252d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,7 +45,7 @@ before_script: - psql -c 'CREATE DATABASE parse_server_postgres_adapter_test_database;' -U postgres - psql -c 'CREATE EXTENSION postgis;' -U postgres -d parse_server_postgres_adapter_test_database - psql -c 'CREATE EXTENSION postgis_topology;' -U postgres -d parse_server_postgres_adapter_test_database -- psql -c 'ALTER EXTENSION postgis; ALTER EXTENSION postgis_topology UPDATE;' -U postgres -d parse_server_postgres_adapter_test_database +- psql -c 'ALTER EXTENSION postgis UPDATE; ALTER EXTENSION postgis_topology UPDATE;' -U postgres -d parse_server_postgres_adapter_test_database - greenkeeper-lockfile-update script: - npm run lint From 87e37a17b8d2cb04d1a175c78c0a6b8124e10374 Mon Sep 17 00:00:00 2001 From: Corey Date: Sat, 14 Mar 2020 14:09:49 -0400 Subject: [PATCH 018/106] Attempting to fix postgres --- .travis.yml | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 879f0a252d..ed76214e57 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,6 @@ addons: packages: - postgresql-11-postgis-2.5 - postgresql-11-postgis-2.5-scripts - #- postgresql-client-11 branches: only: - master @@ -25,11 +24,10 @@ cache: env: global: - COVERAGE_OPTION='./node_modules/.bin/nyc' - #- PGPORT=5432 jobs: - MONGODB_VERSION=4.0.4 MONGODB_TOPOLOGY=replicaset MONGODB_STORAGE_ENGINE=wiredTiger - MONGODB_VERSION=3.6.9 - - PARSE_SERVER_TEST_DB=postgres + #- PARSE_SERVER_TEST_DB=postgres - PARSE_SERVER_TEST_CACHE=redis - NODE_VERSION=12.12.0 before_install: @@ -42,10 +40,10 @@ before_install: - sudo service postgresql start 11 before_script: - node -e 'require("./lib/index.js")' -- psql -c 'CREATE DATABASE parse_server_postgres_adapter_test_database;' -U postgres -- psql -c 'CREATE EXTENSION postgis;' -U postgres -d parse_server_postgres_adapter_test_database -- psql -c 'CREATE EXTENSION postgis_topology;' -U postgres -d parse_server_postgres_adapter_test_database -- psql -c 'ALTER EXTENSION postgis UPDATE; ALTER EXTENSION postgis_topology UPDATE;' -U postgres -d parse_server_postgres_adapter_test_database +#- psql -c 'CREATE DATABASE parse_server_postgres_adapter_test_database;' -U postgres +#- psql -c 'CREATE EXTENSION postgis;' -U postgres -d parse_server_postgres_adapter_test_database +#- psql -c 'CREATE EXTENSION postgis_topology;' -U postgres -d parse_server_postgres_adapter_test_database +##- psql -c 'ALTER EXTENSION postgis UPDATE; ALTER EXTENSION postgis_topology UPDATE;' -U postgres -d parse_server_postgres_adapter_test_database - greenkeeper-lockfile-update script: - npm run lint @@ -57,6 +55,13 @@ jobs: allow_failures: - env: NODE_VERSION=12.12.0 include: + - stage: + env: PARSE_SERVER_TEST_DB=postgres + before_script: + - node -e 'require("./lib/index.js")' + - psql -c 'CREATE DATABASE parse_server_postgres_adapter_test_database;' -U postgres + - psql -c 'CREATE EXTENSION postgis;' -U postgres -d parse_server_postgres_adapter_test_database + - psql -c 'CREATE EXTENSION postgis_topology;' -U postgres -d parse_server_postgres_adapter_test_database - stage: release node_js: '10' env: From c20a82e290dbcfd5e79db7662ef1eb56892000f6 Mon Sep 17 00:00:00 2001 From: Corey Date: Sat, 14 Mar 2020 14:20:52 -0400 Subject: [PATCH 019/106] Attempting to fix postgres --- .travis.yml | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index ed76214e57..5f831569f9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,10 +34,10 @@ before_install: - nvm install $NODE_VERSION - nvm use $NODE_VERSION - npm install -g greenkeeper-lockfile@1 -- sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/11/main/postgresql.conf -- sudo cp /etc/postgresql/{10,11}/main/pg_hba.conf -- sudo service postgresql stop -- sudo service postgresql start 11 +#- sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/11/main/postgresql.conf +#- sudo cp /etc/postgresql/{10,11}/main/pg_hba.conf +#- sudo service postgresql stop +#- sudo service postgresql start 11 before_script: - node -e 'require("./lib/index.js")' #- psql -c 'CREATE DATABASE parse_server_postgres_adapter_test_database;' -U postgres @@ -57,6 +57,14 @@ jobs: include: - stage: env: PARSE_SERVER_TEST_DB=postgres + before_install: + - nvm install $NODE_VERSION + - nvm use $NODE_VERSION + - npm install -g greenkeeper-lockfile@1 + - sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/11/main/postgresql.conf + - sudo cp /etc/postgresql/{10,11}/main/pg_hba.conf + - sudo service postgresql stop + - sudo service postgresql start 11 before_script: - node -e 'require("./lib/index.js")' - psql -c 'CREATE DATABASE parse_server_postgres_adapter_test_database;' -U postgres From 76a29d002416612ccc082c7f4da1a1b9bd372153 Mon Sep 17 00:00:00 2001 From: Corey Date: Sat, 14 Mar 2020 14:33:30 -0400 Subject: [PATCH 020/106] Attempting to fix postgres --- .travis.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5f831569f9..b6f608b171 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,12 +4,6 @@ dist: xenial services: - redis - docker -addons: - postgresql: '11' - apt: - packages: - - postgresql-11-postgis-2.5 - - postgresql-11-postgis-2.5-scripts branches: only: - master @@ -56,6 +50,12 @@ jobs: - env: NODE_VERSION=12.12.0 include: - stage: + addons: + postgresql: '11' + apt: + packages: + - postgresql-11-postgis-2.5 + - postgresql-11-postgis-2.5-scripts env: PARSE_SERVER_TEST_DB=postgres before_install: - nvm install $NODE_VERSION From b90abc4ede79cfd1278d06c2703dff683de762fc Mon Sep 17 00:00:00 2001 From: Corey Date: Sat, 14 Mar 2020 14:50:57 -0400 Subject: [PATCH 021/106] Update .travis.yml --- .travis.yml | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index b6f608b171..f2b2dfd81b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,16 +28,8 @@ before_install: - nvm install $NODE_VERSION - nvm use $NODE_VERSION - npm install -g greenkeeper-lockfile@1 -#- sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/11/main/postgresql.conf -#- sudo cp /etc/postgresql/{10,11}/main/pg_hba.conf -#- sudo service postgresql stop -#- sudo service postgresql start 11 before_script: - node -e 'require("./lib/index.js")' -#- psql -c 'CREATE DATABASE parse_server_postgres_adapter_test_database;' -U postgres -#- psql -c 'CREATE EXTENSION postgis;' -U postgres -d parse_server_postgres_adapter_test_database -#- psql -c 'CREATE EXTENSION postgis_topology;' -U postgres -d parse_server_postgres_adapter_test_database -##- psql -c 'ALTER EXTENSION postgis UPDATE; ALTER EXTENSION postgis_topology UPDATE;' -U postgres -d parse_server_postgres_adapter_test_database - greenkeeper-lockfile-update script: - npm run lint @@ -50,6 +42,31 @@ jobs: - env: NODE_VERSION=12.12.0 include: - stage: + name: postgres-10 + services: + - postgresql: '10' + addons: + #postgresql: "10" + apt: + packages: + - postgresql-10-postgis-2.5 + - postgresql-10-postgis-2.5-scripts + env: PARSE_SERVER_TEST_DB=postgres + before_install: + - nvm install $NODE_VERSION + - nvm use $NODE_VERSION + - npm install -g greenkeeper-lockfile@1 + #- sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/11/main/postgresql.conf + #- sudo cp /etc/postgresql/{10,11}/main/pg_hba.conf + - sudo service postgresql stop + - sudo service postgresql start 10 + before_script: + - node -e 'require("./lib/index.js")' + - psql -c 'CREATE DATABASE parse_server_postgres_adapter_test_database;' -U postgres + - psql -c 'CREATE EXTENSION postgis;' -U postgres -d parse_server_postgres_adapter_test_database + - psql -c 'CREATE EXTENSION postgis_topology;' -U postgres -d parse_server_postgres_adapter_test_database + - stage: + name: postgres-11 addons: postgresql: '11' apt: From 5d4019d50af5d88ac8ca4a5a7a48084994221e60 Mon Sep 17 00:00:00 2001 From: Corey Date: Sat, 14 Mar 2020 14:56:12 -0400 Subject: [PATCH 022/106] Attempting to fix postgres Removed postgres installs from unneeded test cases. Added the ability to test Postgres 10 and 11 --- .travis.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index f2b2dfd81b..745d59a3bf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,10 +43,10 @@ jobs: include: - stage: name: postgres-10 - services: - - postgresql: '10' + #services: + # - postgresql: '10' addons: - #postgresql: "10" + postgresql: "10" apt: packages: - postgresql-10-postgis-2.5 @@ -56,8 +56,8 @@ jobs: - nvm install $NODE_VERSION - nvm use $NODE_VERSION - npm install -g greenkeeper-lockfile@1 - #- sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/11/main/postgresql.conf - #- sudo cp /etc/postgresql/{10,11}/main/pg_hba.conf + - sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/10/main/postgresql.conf + - sudo cp /etc/postgresql/{10,11}/main/pg_hba.conf - sudo service postgresql stop - sudo service postgresql start 10 before_script: From 028daee8895c670fb6d295b79faef2b19743b642 Mon Sep 17 00:00:00 2001 From: Corey Date: Sat, 14 Mar 2020 15:02:37 -0400 Subject: [PATCH 023/106] Attempting to fix postgres --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 745d59a3bf..a9b682a1ee 100644 --- a/.travis.yml +++ b/.travis.yml @@ -57,7 +57,7 @@ jobs: - nvm use $NODE_VERSION - npm install -g greenkeeper-lockfile@1 - sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/10/main/postgresql.conf - - sudo cp /etc/postgresql/{10,11}/main/pg_hba.conf + - sudo cp /etc/postgresql/10/main/pg_hba.conf - sudo service postgresql stop - sudo service postgresql start 10 before_script: From 387258ca3f02062ea47fd16d6e78ab499a7ce47f Mon Sep 17 00:00:00 2001 From: Corey Date: Sat, 14 Mar 2020 15:11:55 -0400 Subject: [PATCH 024/106] Attempting to fix postgres --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a9b682a1ee..aa4985aaa0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -57,7 +57,7 @@ jobs: - nvm use $NODE_VERSION - npm install -g greenkeeper-lockfile@1 - sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/10/main/postgresql.conf - - sudo cp /etc/postgresql/10/main/pg_hba.conf + #- sudo cp /etc/postgresql/10/main/pg_hba.conf - sudo service postgresql stop - sudo service postgresql start 10 before_script: From dc3afa63a4ef409f11f3a8ff43f2fa5c6329faab Mon Sep 17 00:00:00 2001 From: Corey Date: Sat, 14 Mar 2020 15:24:45 -0400 Subject: [PATCH 025/106] Attempting to fix postgres --- .travis.yml | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index aa4985aaa0..b3414452eb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,10 +18,10 @@ cache: env: global: - COVERAGE_OPTION='./node_modules/.bin/nyc' + - PGPORT=5432 jobs: - MONGODB_VERSION=4.0.4 MONGODB_TOPOLOGY=replicaset MONGODB_STORAGE_ENGINE=wiredTiger - MONGODB_VERSION=3.6.9 - #- PARSE_SERVER_TEST_DB=postgres - PARSE_SERVER_TEST_CACHE=redis - NODE_VERSION=12.12.0 before_install: @@ -40,6 +40,7 @@ after_script: jobs: allow_failures: - env: NODE_VERSION=12.12.0 + - name: postgres-12 include: - stage: name: postgres-10 @@ -87,6 +88,28 @@ jobs: - psql -c 'CREATE DATABASE parse_server_postgres_adapter_test_database;' -U postgres - psql -c 'CREATE EXTENSION postgis;' -U postgres -d parse_server_postgres_adapter_test_database - psql -c 'CREATE EXTENSION postgis_topology;' -U postgres -d parse_server_postgres_adapter_test_database + - stage: + name: postgres-12 + addons: + postgresql: '12' + apt: + packages: + - postgresql-12-postgis-2.5 + - postgresql-12-postgis-2.5-scripts + env: PARSE_SERVER_TEST_DB=postgres + before_install: + - nvm install $NODE_VERSION + - nvm use $NODE_VERSION + - npm install -g greenkeeper-lockfile@1 + - sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/12/main/postgresql.conf + - sudo cp /etc/postgresql/{10,12}/main/pg_hba.conf + - sudo service postgresql stop + - sudo service postgresql start 12 + before_script: + - node -e 'require("./lib/index.js")' + - psql -c 'CREATE DATABASE parse_server_postgres_adapter_test_database;' -U postgres + - psql -c 'CREATE EXTENSION postgis;' -U postgres -d parse_server_postgres_adapter_test_database + - psql -c 'CREATE EXTENSION postgis_topology;' -U postgres -d parse_server_postgres_adapter_test_database - stage: release node_js: '10' env: From 06045a54c4fbe28015cf30fabafb9de44bd9b501 Mon Sep 17 00:00:00 2001 From: Corey Date: Sat, 14 Mar 2020 15:27:39 -0400 Subject: [PATCH 026/106] Attempting to fix postgres Added test for postgres 12 that's allowed to fail --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b3414452eb..247c72432b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -88,7 +88,7 @@ jobs: - psql -c 'CREATE DATABASE parse_server_postgres_adapter_test_database;' -U postgres - psql -c 'CREATE EXTENSION postgis;' -U postgres -d parse_server_postgres_adapter_test_database - psql -c 'CREATE EXTENSION postgis_topology;' -U postgres -d parse_server_postgres_adapter_test_database - - stage: + - stage: name: postgres-12 addons: postgresql: '12' From ebcbbb0bd0f8197cbedabdc99b2b9ef84e512b8b Mon Sep 17 00:00:00 2001 From: Corey Date: Sat, 14 Mar 2020 15:37:37 -0400 Subject: [PATCH 027/106] Attempting to fix postgres --- .travis.yml | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/.travis.yml b/.travis.yml index 247c72432b..973177d900 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,30 +42,6 @@ jobs: - env: NODE_VERSION=12.12.0 - name: postgres-12 include: - - stage: - name: postgres-10 - #services: - # - postgresql: '10' - addons: - postgresql: "10" - apt: - packages: - - postgresql-10-postgis-2.5 - - postgresql-10-postgis-2.5-scripts - env: PARSE_SERVER_TEST_DB=postgres - before_install: - - nvm install $NODE_VERSION - - nvm use $NODE_VERSION - - npm install -g greenkeeper-lockfile@1 - - sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/10/main/postgresql.conf - #- sudo cp /etc/postgresql/10/main/pg_hba.conf - - sudo service postgresql stop - - sudo service postgresql start 10 - before_script: - - node -e 'require("./lib/index.js")' - - psql -c 'CREATE DATABASE parse_server_postgres_adapter_test_database;' -U postgres - - psql -c 'CREATE EXTENSION postgis;' -U postgres -d parse_server_postgres_adapter_test_database - - psql -c 'CREATE EXTENSION postgis_topology;' -U postgres -d parse_server_postgres_adapter_test_database - stage: name: postgres-11 addons: From 72f72a1b17aa20eaca84db6d36814bcff25705af Mon Sep 17 00:00:00 2001 From: Corey Date: Sat, 14 Mar 2020 15:55:07 -0400 Subject: [PATCH 028/106] Attempting to fix postgres Second round to see if it fails eventually --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 973177d900..356b47053a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -80,7 +80,7 @@ jobs: - sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/12/main/postgresql.conf - sudo cp /etc/postgresql/{10,12}/main/pg_hba.conf - sudo service postgresql stop - - sudo service postgresql start 12 + - sudo service postgresql start 12 #Round 2 before_script: - node -e 'require("./lib/index.js")' - psql -c 'CREATE DATABASE parse_server_postgres_adapter_test_database;' -U postgres From 2047e2e585aab31910e2cdc58177a4f2e1496d47 Mon Sep 17 00:00:00 2001 From: Corey Date: Sat, 14 Mar 2020 16:01:25 -0400 Subject: [PATCH 029/106] Attempting to fix postgres Round 3 --- .travis.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 356b47053a..3f02247074 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,6 @@ cache: env: global: - COVERAGE_OPTION='./node_modules/.bin/nyc' - - PGPORT=5432 jobs: - MONGODB_VERSION=4.0.4 MONGODB_TOPOLOGY=replicaset MONGODB_STORAGE_ENGINE=wiredTiger - MONGODB_VERSION=3.6.9 @@ -50,7 +49,7 @@ jobs: packages: - postgresql-11-postgis-2.5 - postgresql-11-postgis-2.5-scripts - env: PARSE_SERVER_TEST_DB=postgres + env: PARSE_SERVER_TEST_DB=postgres PGPORT=5432 before_install: - nvm install $NODE_VERSION - nvm use $NODE_VERSION @@ -72,7 +71,7 @@ jobs: packages: - postgresql-12-postgis-2.5 - postgresql-12-postgis-2.5-scripts - env: PARSE_SERVER_TEST_DB=postgres + env: PARSE_SERVER_TEST_DB=postgres PGPORT=5432 before_install: - nvm install $NODE_VERSION - nvm use $NODE_VERSION @@ -80,7 +79,7 @@ jobs: - sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/12/main/postgresql.conf - sudo cp /etc/postgresql/{10,12}/main/pg_hba.conf - sudo service postgresql stop - - sudo service postgresql start 12 #Round 2 + - sudo service postgresql start 12 #Round 3 before_script: - node -e 'require("./lib/index.js")' - psql -c 'CREATE DATABASE parse_server_postgres_adapter_test_database;' -U postgres From fa1063732108f1e985142f916de7698e0a9424d9 Mon Sep 17 00:00:00 2001 From: Corey Date: Sat, 14 Mar 2020 16:17:47 -0400 Subject: [PATCH 030/106] Attempting to fix postgres Allowing all postgres to fail since it seems to occur randomly --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3f02247074..0eae1f624d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,7 +39,7 @@ after_script: jobs: allow_failures: - env: NODE_VERSION=12.12.0 - - name: postgres-12 + - name: postgres-11 postgres-12 include: - stage: name: postgres-11 From 0bdc4f44575756283f2f5a7fa3264a67303c532a Mon Sep 17 00:00:00 2001 From: Corey Date: Sat, 14 Mar 2020 16:36:25 -0400 Subject: [PATCH 031/106] Temporary fix: separated mongo and postgres in travis Now the mongo and postgres scripts are independent of each other to prevent the `ERROR: could not access file "$libdir/postgis-2.4": No such file or directory` of showing up in the rest of the builds. In addition, a test for postgres-12 has been added for future compatibility. Both the postgres-11 and postgres-12 have been added to `allow_failures` because the aforementioned error still creeps up. Important note is that the error has nothing to do with compatibility with postgres, but rather seems to be an error of how postgres (or really postgis) is being referenced in the respective travis distribution. Lastly, this error, if truly random should appear less than before as the postgres scripts aren't being run for every build as it previously was running. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0eae1f624d..d8978071c7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -79,7 +79,7 @@ jobs: - sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/12/main/postgresql.conf - sudo cp /etc/postgresql/{10,12}/main/pg_hba.conf - sudo service postgresql stop - - sudo service postgresql start 12 #Round 3 + - sudo service postgresql start 12 before_script: - node -e 'require("./lib/index.js")' - psql -c 'CREATE DATABASE parse_server_postgres_adapter_test_database;' -U postgres From d60203d84f63b3f1d4e522278699eab762e378e8 Mon Sep 17 00:00:00 2001 From: Corey Date: Sat, 14 Mar 2020 16:55:03 -0400 Subject: [PATCH 032/106] Allowing all postgres to fail --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index d8978071c7..ad5050c801 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,8 +38,7 @@ after_script: - bash <(curl -s https://codecov.io/bash) jobs: allow_failures: - - env: NODE_VERSION=12.12.0 - - name: postgres-11 postgres-12 + - env: NODE_VERSION=12.12.0 PARSE_SERVER_TEST_DB=postgres include: - stage: name: postgres-11 From a7c964bacec0dbf72e85f316eaba328106ef74d9 Mon Sep 17 00:00:00 2001 From: Corey Date: Sat, 14 Mar 2020 17:07:11 -0400 Subject: [PATCH 033/106] Allowing multiple names to fail --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ad5050c801..1e27408087 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,7 +38,9 @@ after_script: - bash <(curl -s https://codecov.io/bash) jobs: allow_failures: - - env: NODE_VERSION=12.12.0 PARSE_SERVER_TEST_DB=postgres + - env: NODE_VERSION=12.12.0 + - name: postgres-11 + - name: postgres-12 include: - stage: name: postgres-11 From d3e795a7e52e7c2c7d1a5ec5dacf8fa02feabfcd Mon Sep 17 00:00:00 2001 From: Corey Date: Sat, 14 Mar 2020 23:07:46 -0400 Subject: [PATCH 034/106] Removing preinstalled versions of postgres from list Seeing if this gets rid of the random error --- .travis.yml | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1e27408087..48d81569fa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,18 +46,21 @@ jobs: name: postgres-11 addons: postgresql: '11' - apt: - packages: - - postgresql-11-postgis-2.5 - - postgresql-11-postgis-2.5-scripts +# apt: +# packages: +# - postgresql-11-postgis-2.5 +# - postgresql-11-postgis-2.5-scripts env: PARSE_SERVER_TEST_DB=postgres PGPORT=5432 before_install: - nvm install $NODE_VERSION - nvm use $NODE_VERSION - npm install -g greenkeeper-lockfile@1 + - sudo service postgresql stop + - sudo apt-get remove -q 'postgresql-*' + - sudo apt-get update -q + - sudo apt-get install -q postgresql-11 postgresql-11-postgis-2.5 postgresql-11-postgis-2.5-scripts - sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/11/main/postgresql.conf - sudo cp /etc/postgresql/{10,11}/main/pg_hba.conf - - sudo service postgresql stop - sudo service postgresql start 11 before_script: - node -e 'require("./lib/index.js")' @@ -68,18 +71,21 @@ jobs: name: postgres-12 addons: postgresql: '12' - apt: - packages: - - postgresql-12-postgis-2.5 - - postgresql-12-postgis-2.5-scripts +# apt: +# packages: +# - postgresql-12-postgis-2.5 +# - postgresql-12-postgis-2.5-scripts env: PARSE_SERVER_TEST_DB=postgres PGPORT=5432 before_install: - nvm install $NODE_VERSION - nvm use $NODE_VERSION - npm install -g greenkeeper-lockfile@1 + - sudo service postgresql stop + - sudo apt-get remove -q 'postgresql-*' + - sudo apt-get update -q + - sudo apt-get install -q postgresql-12 postgresql-12-postgis-2.5 postgresql-12-postgis-2.5-scripts - sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/12/main/postgresql.conf - sudo cp /etc/postgresql/{10,12}/main/pg_hba.conf - - sudo service postgresql stop - sudo service postgresql start 12 before_script: - node -e 'require("./lib/index.js")' From b0e224f1360762effd414b5e402d80fac7c57a42 Mon Sep 17 00:00:00 2001 From: Corey Date: Sat, 14 Mar 2020 23:20:26 -0400 Subject: [PATCH 035/106] Use postgres made for dist --- .travis.yml | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index 48d81569fa..f527121542 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,21 +46,19 @@ jobs: name: postgres-11 addons: postgresql: '11' -# apt: -# packages: -# - postgresql-11-postgis-2.5 -# - postgresql-11-postgis-2.5-scripts + apt: + packages: + - postgresql-11-postgis-2.5 + - postgresql-11-postgis-2.5-scripts env: PARSE_SERVER_TEST_DB=postgres PGPORT=5432 before_install: - nvm install $NODE_VERSION - nvm use $NODE_VERSION - npm install -g greenkeeper-lockfile@1 - - sudo service postgresql stop - - sudo apt-get remove -q 'postgresql-*' - - sudo apt-get update -q - - sudo apt-get install -q postgresql-11 postgresql-11-postgis-2.5 postgresql-11-postgis-2.5-scripts - sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/11/main/postgresql.conf - sudo cp /etc/postgresql/{10,11}/main/pg_hba.conf + - sudo service postgresql stop + - sudo apt-get remove -q 'postgresql-9.*' 'postgresql-10.*' - sudo service postgresql start 11 before_script: - node -e 'require("./lib/index.js")' @@ -71,21 +69,19 @@ jobs: name: postgres-12 addons: postgresql: '12' -# apt: -# packages: -# - postgresql-12-postgis-2.5 -# - postgresql-12-postgis-2.5-scripts + apt: + packages: + - postgresql-12-postgis-2.5 + - postgresql-12-postgis-2.5-scripts env: PARSE_SERVER_TEST_DB=postgres PGPORT=5432 before_install: - nvm install $NODE_VERSION - nvm use $NODE_VERSION - npm install -g greenkeeper-lockfile@1 - - sudo service postgresql stop - - sudo apt-get remove -q 'postgresql-*' - - sudo apt-get update -q - - sudo apt-get install -q postgresql-12 postgresql-12-postgis-2.5 postgresql-12-postgis-2.5-scripts - sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/12/main/postgresql.conf - sudo cp /etc/postgresql/{10,12}/main/pg_hba.conf + - sudo service postgresql stop + - sudo apt-get remove -q 'postgresql-9.*' 'postgresql-10.*' - sudo service postgresql start 12 before_script: - node -e 'require("./lib/index.js")' From 98d83e9d6063217501178e7e6c2e281ab18e3f08 Mon Sep 17 00:00:00 2001 From: Corey Date: Sat, 14 Mar 2020 23:38:03 -0400 Subject: [PATCH 036/106] Second round --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f527121542..436de32a8b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -84,7 +84,7 @@ jobs: - sudo apt-get remove -q 'postgresql-9.*' 'postgresql-10.*' - sudo service postgresql start 12 before_script: - - node -e 'require("./lib/index.js")' + - node -e 'require("./lib/index.js")' #Round 2 - psql -c 'CREATE DATABASE parse_server_postgres_adapter_test_database;' -U postgres - psql -c 'CREATE EXTENSION postgis;' -U postgres -d parse_server_postgres_adapter_test_database - psql -c 'CREATE EXTENSION postgis_topology;' -U postgres -d parse_server_postgres_adapter_test_database From ddd6f4ad718616b9c99eacd2283243c386474a36 Mon Sep 17 00:00:00 2001 From: Corey Date: Sat, 14 Mar 2020 23:55:36 -0400 Subject: [PATCH 037/106] Round 3 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 436de32a8b..fb323fbdcb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -84,7 +84,7 @@ jobs: - sudo apt-get remove -q 'postgresql-9.*' 'postgresql-10.*' - sudo service postgresql start 12 before_script: - - node -e 'require("./lib/index.js")' #Round 2 + - node -e 'require("./lib/index.js")' #Round 3 - psql -c 'CREATE DATABASE parse_server_postgres_adapter_test_database;' -U postgres - psql -c 'CREATE EXTENSION postgis;' -U postgres -d parse_server_postgres_adapter_test_database - psql -c 'CREATE EXTENSION postgis_topology;' -U postgres -d parse_server_postgres_adapter_test_database From efa17ff70855576ee9446b946aacc8e3c9a9b237 Mon Sep 17 00:00:00 2001 From: Corey Date: Sun, 15 Mar 2020 00:08:31 -0400 Subject: [PATCH 038/106] Round 4 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fb323fbdcb..a33391e9f2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -84,7 +84,7 @@ jobs: - sudo apt-get remove -q 'postgresql-9.*' 'postgresql-10.*' - sudo service postgresql start 12 before_script: - - node -e 'require("./lib/index.js")' #Round 3 + - node -e 'require("./lib/index.js")' #Round 4 - psql -c 'CREATE DATABASE parse_server_postgres_adapter_test_database;' -U postgres - psql -c 'CREATE EXTENSION postgis;' -U postgres -d parse_server_postgres_adapter_test_database - psql -c 'CREATE EXTENSION postgis_topology;' -U postgres -d parse_server_postgres_adapter_test_database From 6a98945d1a1e311c54ed299d8dbca403049e3046 Mon Sep 17 00:00:00 2001 From: Corey Date: Sun, 15 Mar 2020 00:24:21 -0400 Subject: [PATCH 039/106] Round 5 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a33391e9f2..b63edf9819 100644 --- a/.travis.yml +++ b/.travis.yml @@ -84,7 +84,7 @@ jobs: - sudo apt-get remove -q 'postgresql-9.*' 'postgresql-10.*' - sudo service postgresql start 12 before_script: - - node -e 'require("./lib/index.js")' #Round 4 + - node -e 'require("./lib/index.js")' #Round 5 - psql -c 'CREATE DATABASE parse_server_postgres_adapter_test_database;' -U postgres - psql -c 'CREATE EXTENSION postgis;' -U postgres -d parse_server_postgres_adapter_test_database - psql -c 'CREATE EXTENSION postgis_topology;' -U postgres -d parse_server_postgres_adapter_test_database From a3f72b81ba4085266c915133b44f402cc78e8012 Mon Sep 17 00:00:00 2001 From: Corey Date: Sun, 15 Mar 2020 00:45:00 -0400 Subject: [PATCH 040/106] Fixed issue with random postgres fail Removing the native postgres builds at the right time seems to have fixed the random error from before. The postgres tests are now not allowed to fail. --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index b63edf9819..00f006388e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,8 +39,6 @@ after_script: jobs: allow_failures: - env: NODE_VERSION=12.12.0 - - name: postgres-11 - - name: postgres-12 include: - stage: name: postgres-11 @@ -84,7 +82,7 @@ jobs: - sudo apt-get remove -q 'postgresql-9.*' 'postgresql-10.*' - sudo service postgresql start 12 before_script: - - node -e 'require("./lib/index.js")' #Round 5 + - node -e 'require("./lib/index.js")' - psql -c 'CREATE DATABASE parse_server_postgres_adapter_test_database;' -U postgres - psql -c 'CREATE EXTENSION postgis;' -U postgres -d parse_server_postgres_adapter_test_database - psql -c 'CREATE EXTENSION postgis_topology;' -U postgres -d parse_server_postgres_adapter_test_database From 5999aff02c9cf8d510c0f6ef66bc8485d9044206 Mon Sep 17 00:00:00 2001 From: Corey Date: Sun, 15 Mar 2020 01:17:39 -0400 Subject: [PATCH 041/106] Added back postgres 11 and 12 to allow_failures The actual problem is fixed, but it seems there are some instability with some of the test cases for postgres that need to be addressed at another time. The issues that pop up are: - Postgres-11 ```Failures: 1) Cloud Code cloud jobs should set the message / success on the job Message: Expected undefined to equal 'hello'. Stack: Error: Expected undefined to equal 'hello'. at at req.message.then.then.jobStatus (/home/travis/build/parse-community/parse-server/spec/CloudCode.spec.js:1571:46) at process._tickCallback (internal/process/next_tick.js:68:7) ``` - Postgres-12 ``` Failures: 1) Cloud Code cloud jobs should set the message / success on the job Message: Expected undefined to equal 'hello'. Stack: Error: Expected undefined to equal 'hello'. at at req.message.then.then.jobStatus (/home/travis/build/parse-community/parse-server/spec/CloudCode.spec.js:1571:46) at process._tickCallback (internal/process/next_tick.js:68:7) Message: Expected 'running' to equal 'succeeded'. Stack: Error: Expected 'running' to equal 'succeeded'. at at promise.then.then.jobStatus (/home/travis/build/parse-community/parse-server/spec/CloudCode.spec.js:1580:45) at process._tickCallback (internal/process/next_tick.js:68:7) ``` --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 00f006388e..a4a3583571 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,6 +39,8 @@ after_script: jobs: allow_failures: - env: NODE_VERSION=12.12.0 + - name: postgres-11 + - name: postgres-12 include: - stage: name: postgres-11 From 579124ca06ddc531bd7d56a6ad93b02ad6e9700f Mon Sep 17 00:00:00 2001 From: Corey MacBook Pro Date: Tue, 17 Mar 2020 09:45:49 -0400 Subject: [PATCH 042/106] added travis scripts for postgres --- scripts/before_install_postgres.sh | 35 ++++++++++++++++++++++++++++++ scripts/before_script_postgres.sh | 15 +++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 scripts/before_install_postgres.sh create mode 100644 scripts/before_script_postgres.sh diff --git a/scripts/before_install_postgres.sh b/scripts/before_install_postgres.sh new file mode 100644 index 0000000000..2b26471e95 --- /dev/null +++ b/scripts/before_install_postgres.sh @@ -0,0 +1,35 @@ +#!/bin/bash + +set -e + +echo "[SCRIPT] Before Install Script :: Setup Postgres ${POSTGRES_MAJOR_VERSION}" + +nvm install $NODE_VERSION +nvm use $NODE_VERSION +npm install -g greenkeeper-lockfile@1 + +sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/${POSTGRES_MAJOR_VERSION}/main/postgresql.conf + +if (( ${POSTGRES_MAJOR_VERSION} < 11 )); then; + # Setup postgres 9 or 10 + sudo service postgresql stop + + # Remove correct version of postgres + if (( ${POSTGRES_MAJOR_VERSION} < 10 )); then; + sudo apt-get remove -q 'postgresql-10.*' + else + sudo apt-get remove -q 'postgresql-9.*' + fi + + sudo service postgresql start ${POSTGRES_MAJOR_VERSION} + + +else + # Setup postgres 11 or higher + sudo cp /etc/postgresql/{10,${POSTGRES_MAJOR_VERSION}}/main/pg_hba.conf + sudo service postgresql stop + # Remove previous versions of postgres + sudo apt-get remove -q 'postgresql-9.*' 'postgresql-10.*' + sudo service postgresql start ${POSTGRES_MAJOR_VERSION} +fi + diff --git a/scripts/before_script_postgres.sh b/scripts/before_script_postgres.sh new file mode 100644 index 0000000000..c63d30de23 --- /dev/null +++ b/scripts/before_script_postgres.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +set -e + +echo "[SCRIPT] Before Script :: Setup Parse DB for Postgres ${POSTGRES_MAJOR_VERSION}" + +node -e 'require("./lib/index.js")' + +psql -v ON_ERROR_STOP=1 --username "postgres" --dbname "${POSTGRES_DB}" <<-EOSQL + CREATE DATABASE parse_server_postgres_adapter_test_database; + \c parse_server_postgres_adapter_test_database; + CREATE EXTENSION postgis; + CREATE EXTENSION postgis_topology; +EOSQL + From 38a2b9e8c734143b4604e800c7c65fc6e40cd682 Mon Sep 17 00:00:00 2001 From: Corey Date: Tue, 17 Mar 2020 09:50:11 -0400 Subject: [PATCH 043/106] Setting up before_install and before_script This should shrink the footprint of the file and and reduce the redundancy of calls for postgres. Added support for testing of Postgres 9 and 10 in the scripts, not adding the tests though --- .travis.yml | 64 ++++++++++++++++++++++++++--------------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/.travis.yml b/.travis.yml index a4a3583571..ae1f673dac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,51 +43,51 @@ jobs: - name: postgres-12 include: - stage: - name: postgres-11 + #name: postgres-11 addons: postgresql: '11' apt: packages: - postgresql-11-postgis-2.5 - postgresql-11-postgis-2.5-scripts - env: PARSE_SERVER_TEST_DB=postgres PGPORT=5432 - before_install: - - nvm install $NODE_VERSION - - nvm use $NODE_VERSION - - npm install -g greenkeeper-lockfile@1 - - sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/11/main/postgresql.conf - - sudo cp /etc/postgresql/{10,11}/main/pg_hba.conf - - sudo service postgresql stop - - sudo apt-get remove -q 'postgresql-9.*' 'postgresql-10.*' - - sudo service postgresql start 11 - before_script: - - node -e 'require("./lib/index.js")' - - psql -c 'CREATE DATABASE parse_server_postgres_adapter_test_database;' -U postgres - - psql -c 'CREATE EXTENSION postgis;' -U postgres -d parse_server_postgres_adapter_test_database - - psql -c 'CREATE EXTENSION postgis_topology;' -U postgres -d parse_server_postgres_adapter_test_database + env: POSTGRES_MAJOR_VERSION=11 PARSE_SERVER_TEST_DB=postgres PGPORT=5432 + before_install: scripts/before_install_postgres.sh + #- nvm install $NODE_VERSION + #- nvm use $NODE_VERSION + #- npm install -g greenkeeper-lockfile@1 + #- sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/11/main/postgresql.conf + #- sudo cp /etc/postgresql/{10,11}/main/pg_hba.conf + #- sudo service postgresql stop + #- sudo apt-get remove -q 'postgresql-9.*' 'postgresql-10.*' + #- sudo service postgresql start 11 + before_script: scripts/before_script_postgres.sh + #- node -e 'require("./lib/index.js")' + #- psql -c 'CREATE DATABASE parse_server_postgres_adapter_test_database;' -U postgres + #- psql -c 'CREATE EXTENSION postgis;' -U postgres -d parse_server_postgres_adapter_test_database + #- psql -c 'CREATE EXTENSION postgis_topology;' -U postgres -d parse_server_postgres_adapter_test_database - stage: - name: postgres-12 + #name: postgres-12 addons: postgresql: '12' apt: packages: - postgresql-12-postgis-2.5 - postgresql-12-postgis-2.5-scripts - env: PARSE_SERVER_TEST_DB=postgres PGPORT=5432 - before_install: - - nvm install $NODE_VERSION - - nvm use $NODE_VERSION - - npm install -g greenkeeper-lockfile@1 - - sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/12/main/postgresql.conf - - sudo cp /etc/postgresql/{10,12}/main/pg_hba.conf - - sudo service postgresql stop - - sudo apt-get remove -q 'postgresql-9.*' 'postgresql-10.*' - - sudo service postgresql start 12 - before_script: - - node -e 'require("./lib/index.js")' - - psql -c 'CREATE DATABASE parse_server_postgres_adapter_test_database;' -U postgres - - psql -c 'CREATE EXTENSION postgis;' -U postgres -d parse_server_postgres_adapter_test_database - - psql -c 'CREATE EXTENSION postgis_topology;' -U postgres -d parse_server_postgres_adapter_test_database + env: POSTGRES_MAJOR_VERSION=12 PARSE_SERVER_TEST_DB=postgres PGPORT=5432 + before_install: scripts/before_install_postgres.sh + #- nvm install $NODE_VERSION + #- nvm use $NODE_VERSION + #- npm install -g greenkeeper-lockfile@1 + #- sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/12/main/postgresql.conf + #- sudo cp /etc/postgresql/{10,12}/main/pg_hba.conf + #- sudo service postgresql stop + #- sudo apt-get remove -q 'postgresql-9.*' 'postgresql-10.*' + #- sudo service postgresql start 12 + before_script: scripts/before_script_postgres.sh + #- node -e 'require("./lib/index.js")' + #- psql -c 'CREATE DATABASE parse_server_postgres_adapter_test_database;' -U postgres + #- psql -c 'CREATE EXTENSION postgis;' -U postgres -d parse_server_postgres_adapter_test_database + #- psql -c 'CREATE EXTENSION postgis_topology;' -U postgres -d parse_server_postgres_adapter_test_database - stage: release node_js: '10' env: From 8b0f875a1a98ae842d5cc9ecd4517592657f45ab Mon Sep 17 00:00:00 2001 From: Corey MacBook Pro Date: Tue, 17 Mar 2020 10:06:38 -0400 Subject: [PATCH 044/106] make scripts executable --- scripts/before_install_postgres.sh | 0 scripts/before_script_postgres.sh | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 scripts/before_install_postgres.sh mode change 100644 => 100755 scripts/before_script_postgres.sh diff --git a/scripts/before_install_postgres.sh b/scripts/before_install_postgres.sh old mode 100644 new mode 100755 diff --git a/scripts/before_script_postgres.sh b/scripts/before_script_postgres.sh old mode 100644 new mode 100755 From 0052963156436e33c8c48f6a9d5e79b37f6d2f66 Mon Sep 17 00:00:00 2001 From: Corey Date: Tue, 17 Mar 2020 10:13:52 -0400 Subject: [PATCH 045/106] Update .travis.yml --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index ae1f673dac..33427e9b28 100644 --- a/.travis.yml +++ b/.travis.yml @@ -51,7 +51,7 @@ jobs: - postgresql-11-postgis-2.5 - postgresql-11-postgis-2.5-scripts env: POSTGRES_MAJOR_VERSION=11 PARSE_SERVER_TEST_DB=postgres PGPORT=5432 - before_install: scripts/before_install_postgres.sh + before_install: bash scripts/before_install_postgres.sh #- nvm install $NODE_VERSION #- nvm use $NODE_VERSION #- npm install -g greenkeeper-lockfile@1 @@ -60,7 +60,7 @@ jobs: #- sudo service postgresql stop #- sudo apt-get remove -q 'postgresql-9.*' 'postgresql-10.*' #- sudo service postgresql start 11 - before_script: scripts/before_script_postgres.sh + before_script: bash scripts/before_script_postgres.sh #- node -e 'require("./lib/index.js")' #- psql -c 'CREATE DATABASE parse_server_postgres_adapter_test_database;' -U postgres #- psql -c 'CREATE EXTENSION postgis;' -U postgres -d parse_server_postgres_adapter_test_database @@ -74,7 +74,7 @@ jobs: - postgresql-12-postgis-2.5 - postgresql-12-postgis-2.5-scripts env: POSTGRES_MAJOR_VERSION=12 PARSE_SERVER_TEST_DB=postgres PGPORT=5432 - before_install: scripts/before_install_postgres.sh + before_install: bash scripts/before_install_postgres.sh #- nvm install $NODE_VERSION #- nvm use $NODE_VERSION #- npm install -g greenkeeper-lockfile@1 @@ -83,7 +83,7 @@ jobs: #- sudo service postgresql stop #- sudo apt-get remove -q 'postgresql-9.*' 'postgresql-10.*' #- sudo service postgresql start 12 - before_script: scripts/before_script_postgres.sh + before_script: bash scripts/before_script_postgres.sh #- node -e 'require("./lib/index.js")' #- psql -c 'CREATE DATABASE parse_server_postgres_adapter_test_database;' -U postgres #- psql -c 'CREATE EXTENSION postgis;' -U postgres -d parse_server_postgres_adapter_test_database From a375604274a356ba1add3eafedbf1cc5de37afdf Mon Sep 17 00:00:00 2001 From: Corey MacBook Pro Date: Tue, 17 Mar 2020 10:21:36 -0400 Subject: [PATCH 046/106] add sourcing in script --- scripts/before_install_postgres.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/before_install_postgres.sh b/scripts/before_install_postgres.sh index 2b26471e95..f7a53d7607 100755 --- a/scripts/before_install_postgres.sh +++ b/scripts/before_install_postgres.sh @@ -2,6 +2,8 @@ set -e +. ~/.bashrc + echo "[SCRIPT] Before Install Script :: Setup Postgres ${POSTGRES_MAJOR_VERSION}" nvm install $NODE_VERSION From 8d26cbc4111a65912d9194fcee750a412f816e43 Mon Sep 17 00:00:00 2001 From: Corey MacBook Pro Date: Tue, 17 Mar 2020 10:27:45 -0400 Subject: [PATCH 047/106] trying to fix source --- scripts/before_install_postgres.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/before_install_postgres.sh b/scripts/before_install_postgres.sh index f7a53d7607..74cc5897ea 100755 --- a/scripts/before_install_postgres.sh +++ b/scripts/before_install_postgres.sh @@ -2,7 +2,7 @@ set -e -. ~/.bashrc +source ~/.nvm/nvm.sh echo "[SCRIPT] Before Install Script :: Setup Postgres ${POSTGRES_MAJOR_VERSION}" From dfcbe0d4a07b10c12ebb093f0bb7a22738ac9988 Mon Sep 17 00:00:00 2001 From: Corey MacBook Pro Date: Tue, 17 Mar 2020 10:36:24 -0400 Subject: [PATCH 048/106] fixing env var in script --- scripts/before_install_postgres.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/before_install_postgres.sh b/scripts/before_install_postgres.sh index 74cc5897ea..af8e7eabcc 100755 --- a/scripts/before_install_postgres.sh +++ b/scripts/before_install_postgres.sh @@ -12,12 +12,12 @@ npm install -g greenkeeper-lockfile@1 sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/${POSTGRES_MAJOR_VERSION}/main/postgresql.conf -if (( ${POSTGRES_MAJOR_VERSION} < 11 )); then; +if (( $POSTGRES_MAJOR_VERSION < 11 )); then; # Setup postgres 9 or 10 sudo service postgresql stop # Remove correct version of postgres - if (( ${POSTGRES_MAJOR_VERSION} < 10 )); then; + if (( $POSTGRES_MAJOR_VERSION < 10 )); then; sudo apt-get remove -q 'postgresql-10.*' else sudo apt-get remove -q 'postgresql-9.*' From a5aa417f775bd642c3350cf4cf05d85f06a98f0e Mon Sep 17 00:00:00 2001 From: Corey MacBook Pro Date: Tue, 17 Mar 2020 10:42:53 -0400 Subject: [PATCH 049/106] fixed ; near then --- scripts/before_install_postgres.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/before_install_postgres.sh b/scripts/before_install_postgres.sh index af8e7eabcc..323b8a8b0f 100755 --- a/scripts/before_install_postgres.sh +++ b/scripts/before_install_postgres.sh @@ -12,12 +12,12 @@ npm install -g greenkeeper-lockfile@1 sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/${POSTGRES_MAJOR_VERSION}/main/postgresql.conf -if (( $POSTGRES_MAJOR_VERSION < 11 )); then; +if [[ $POSTGRES_MAJOR_VERSION -lt 11 ]]; then # Setup postgres 9 or 10 sudo service postgresql stop # Remove correct version of postgres - if (( $POSTGRES_MAJOR_VERSION < 10 )); then; + if [[ $POSTGRES_MAJOR_VERSION -lt 10 ]]; then sudo apt-get remove -q 'postgresql-10.*' else sudo apt-get remove -q 'postgresql-9.*' From cc91dc4da296a343f23e2898be43a7157ad0edfc Mon Sep 17 00:00:00 2001 From: Corey Date: Tue, 17 Mar 2020 10:57:01 -0400 Subject: [PATCH 050/106] Cleaning up travis file removed old lines --- .travis.yml | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/.travis.yml b/.travis.yml index 33427e9b28..3acee4ed26 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,30 +43,16 @@ jobs: - name: postgres-12 include: - stage: - #name: postgres-11 addons: postgresql: '11' apt: packages: - postgresql-11-postgis-2.5 - postgresql-11-postgis-2.5-scripts - env: POSTGRES_MAJOR_VERSION=11 PARSE_SERVER_TEST_DB=postgres PGPORT=5432 + env: POSTGRES_MAJOR_VERSION=11 PARSE_SERVER_TEST_DB=postgres before_install: bash scripts/before_install_postgres.sh - #- nvm install $NODE_VERSION - #- nvm use $NODE_VERSION - #- npm install -g greenkeeper-lockfile@1 - #- sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/11/main/postgresql.conf - #- sudo cp /etc/postgresql/{10,11}/main/pg_hba.conf - #- sudo service postgresql stop - #- sudo apt-get remove -q 'postgresql-9.*' 'postgresql-10.*' - #- sudo service postgresql start 11 before_script: bash scripts/before_script_postgres.sh - #- node -e 'require("./lib/index.js")' - #- psql -c 'CREATE DATABASE parse_server_postgres_adapter_test_database;' -U postgres - #- psql -c 'CREATE EXTENSION postgis;' -U postgres -d parse_server_postgres_adapter_test_database - #- psql -c 'CREATE EXTENSION postgis_topology;' -U postgres -d parse_server_postgres_adapter_test_database - stage: - #name: postgres-12 addons: postgresql: '12' apt: @@ -75,19 +61,7 @@ jobs: - postgresql-12-postgis-2.5-scripts env: POSTGRES_MAJOR_VERSION=12 PARSE_SERVER_TEST_DB=postgres PGPORT=5432 before_install: bash scripts/before_install_postgres.sh - #- nvm install $NODE_VERSION - #- nvm use $NODE_VERSION - #- npm install -g greenkeeper-lockfile@1 - #- sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/12/main/postgresql.conf - #- sudo cp /etc/postgresql/{10,12}/main/pg_hba.conf - #- sudo service postgresql stop - #- sudo apt-get remove -q 'postgresql-9.*' 'postgresql-10.*' - #- sudo service postgresql start 12 before_script: bash scripts/before_script_postgres.sh - #- node -e 'require("./lib/index.js")' - #- psql -c 'CREATE DATABASE parse_server_postgres_adapter_test_database;' -U postgres - #- psql -c 'CREATE EXTENSION postgis;' -U postgres -d parse_server_postgres_adapter_test_database - #- psql -c 'CREATE EXTENSION postgis_topology;' -U postgres -d parse_server_postgres_adapter_test_database - stage: release node_js: '10' env: From 0e33072bd0f37d591cd62a095336fe015d731391 Mon Sep 17 00:00:00 2001 From: Corey Date: Tue, 17 Mar 2020 10:59:39 -0400 Subject: [PATCH 051/106] Finishing clean up --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3acee4ed26..bdde909ac5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -59,7 +59,7 @@ jobs: packages: - postgresql-12-postgis-2.5 - postgresql-12-postgis-2.5-scripts - env: POSTGRES_MAJOR_VERSION=12 PARSE_SERVER_TEST_DB=postgres PGPORT=5432 + env: POSTGRES_MAJOR_VERSION=12 PARSE_SERVER_TEST_DB=postgres before_install: bash scripts/before_install_postgres.sh before_script: bash scripts/before_script_postgres.sh - stage: release From 773ca672270d5ce982b146e03b83c13a9fc4776d Mon Sep 17 00:00:00 2001 From: Corey Date: Tue, 17 Mar 2020 11:05:43 -0400 Subject: [PATCH 052/106] Fixing allow_failures since "name" was removed --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index bdde909ac5..476724b92d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,8 +39,8 @@ after_script: jobs: allow_failures: - env: NODE_VERSION=12.12.0 - - name: postgres-11 - - name: postgres-12 + - name: POSTGRES_MAJOR_VERSION=11 PARSE_SERVER_TEST_DB=postgres + - name: POSTGRES_MAJOR_VERSION=12 PARSE_SERVER_TEST_DB=postgres include: - stage: addons: From fe0077c2144b7c7ee1f07f26333a9177a6ed5aa0 Mon Sep 17 00:00:00 2001 From: Corey Date: Tue, 17 Mar 2020 11:10:55 -0400 Subject: [PATCH 053/106] Update .travis.yml --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 476724b92d..9d2f0bae48 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,8 +39,8 @@ after_script: jobs: allow_failures: - env: NODE_VERSION=12.12.0 - - name: POSTGRES_MAJOR_VERSION=11 PARSE_SERVER_TEST_DB=postgres - - name: POSTGRES_MAJOR_VERSION=12 PARSE_SERVER_TEST_DB=postgres + - env: POSTGRES_MAJOR_VERSION=11 PARSE_SERVER_TEST_DB=postgres + - env: POSTGRES_MAJOR_VERSION=12 PARSE_SERVER_TEST_DB=postgres include: - stage: addons: From 559e0a732c0be7a15a45b128e0abb9dd5bd4b348 Mon Sep 17 00:00:00 2001 From: Corey Date: Tue, 17 Mar 2020 15:26:54 -0400 Subject: [PATCH 054/106] Removed Postgres 11 from allow_failures --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9d2f0bae48..5dcabd2115 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,8 +38,7 @@ after_script: - bash <(curl -s https://codecov.io/bash) jobs: allow_failures: - - env: NODE_VERSION=12.12.0 - - env: POSTGRES_MAJOR_VERSION=11 PARSE_SERVER_TEST_DB=postgres + - env: NODE_VERSION=12.12.0 - env: POSTGRES_MAJOR_VERSION=12 PARSE_SERVER_TEST_DB=postgres include: - stage: From 2ceff98cd4e5b14c5eb8353a341078b34489fbb6 Mon Sep 17 00:00:00 2001 From: Corey MacBook Pro Date: Tue, 17 Mar 2020 16:55:13 -0400 Subject: [PATCH 055/106] I think using travis default postgres port of 5433 will allow us to not have to remove anything from the image --- scripts/before_install_postgres.sh | 40 +++++++++++++++--------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/scripts/before_install_postgres.sh b/scripts/before_install_postgres.sh index 323b8a8b0f..13ed7dbc87 100755 --- a/scripts/before_install_postgres.sh +++ b/scripts/before_install_postgres.sh @@ -10,28 +10,28 @@ nvm install $NODE_VERSION nvm use $NODE_VERSION npm install -g greenkeeper-lockfile@1 -sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/${POSTGRES_MAJOR_VERSION}/main/postgresql.conf +#sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/${POSTGRES_MAJOR_VERSION}/main/postgresql.conf -if [[ $POSTGRES_MAJOR_VERSION -lt 11 ]]; then +#if [[ $POSTGRES_MAJOR_VERSION -lt 11 ]]; then # Setup postgres 9 or 10 - sudo service postgresql stop + #sudo service postgresql stop # Remove correct version of postgres - if [[ $POSTGRES_MAJOR_VERSION -lt 10 ]]; then - sudo apt-get remove -q 'postgresql-10.*' - else - sudo apt-get remove -q 'postgresql-9.*' - fi - - sudo service postgresql start ${POSTGRES_MAJOR_VERSION} - - -else - # Setup postgres 11 or higher - sudo cp /etc/postgresql/{10,${POSTGRES_MAJOR_VERSION}}/main/pg_hba.conf - sudo service postgresql stop - # Remove previous versions of postgres - sudo apt-get remove -q 'postgresql-9.*' 'postgresql-10.*' - sudo service postgresql start ${POSTGRES_MAJOR_VERSION} -fi + #if [[ $POSTGRES_MAJOR_VERSION -lt 10 ]]; then + # sudo apt-get remove -q 'postgresql-10.*' + #else + # sudo apt-get remove -q 'postgresql-9.*' + #fi + + #sudo service postgresql start ${POSTGRES_MAJOR_VERSION} + + +#else +# Setup postgres 11 or higher +sudo cp /etc/postgresql/{10,${POSTGRES_MAJOR_VERSION}}/main/pg_hba.conf +sudo service postgresql stop +# Remove previous versions of postgres +#sudo apt-get remove -q 'postgresql-9.*' 'postgresql-10.*' +sudo service postgresql start ${POSTGRES_MAJOR_VERSION} +#fi From 77764579480ef78b7e92527149d5ba93aa161ef2 Mon Sep 17 00:00:00 2001 From: Corey Date: Tue, 17 Mar 2020 16:57:37 -0400 Subject: [PATCH 056/106] Switching travis to postgres port 5433 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5dcabd2115..11315c751d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,7 +48,7 @@ jobs: packages: - postgresql-11-postgis-2.5 - postgresql-11-postgis-2.5-scripts - env: POSTGRES_MAJOR_VERSION=11 PARSE_SERVER_TEST_DB=postgres + env: POSTGRES_MAJOR_VERSION=11 PARSE_SERVER_TEST_DB=postgres PGPORT=5433 before_install: bash scripts/before_install_postgres.sh before_script: bash scripts/before_script_postgres.sh - stage: @@ -58,7 +58,7 @@ jobs: packages: - postgresql-12-postgis-2.5 - postgresql-12-postgis-2.5-scripts - env: POSTGRES_MAJOR_VERSION=12 PARSE_SERVER_TEST_DB=postgres + env: POSTGRES_MAJOR_VERSION=12 PARSE_SERVER_TEST_DB=postgres PGPORT=5433 before_install: bash scripts/before_install_postgres.sh before_script: bash scripts/before_script_postgres.sh - stage: release From 59a3e8a5e02b0adeedd9436c93c4419ff7108e96 Mon Sep 17 00:00:00 2001 From: Corey MacBook Pro Date: Tue, 17 Mar 2020 17:10:10 -0400 Subject: [PATCH 057/106] modifying script for test --- scripts/before_install_postgres.sh | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/scripts/before_install_postgres.sh b/scripts/before_install_postgres.sh index 13ed7dbc87..69b4b3b6df 100755 --- a/scripts/before_install_postgres.sh +++ b/scripts/before_install_postgres.sh @@ -13,25 +13,25 @@ npm install -g greenkeeper-lockfile@1 #sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/${POSTGRES_MAJOR_VERSION}/main/postgresql.conf #if [[ $POSTGRES_MAJOR_VERSION -lt 11 ]]; then - # Setup postgres 9 or 10 - #sudo service postgresql stop +# # Setup postgres 9 or 10 +# #sudo service postgresql stop - # Remove correct version of postgres - #if [[ $POSTGRES_MAJOR_VERSION -lt 10 ]]; then - # sudo apt-get remove -q 'postgresql-10.*' - #else - # sudo apt-get remove -q 'postgresql-9.*' - #fi +# Remove correct version of postgres +# #if [[ $POSTGRES_MAJOR_VERSION -lt 10 ]]; then +# # sudo apt-get remove -q 'postgresql-10.*' +# #else +# # sudo apt-get remove -q 'postgresql-9.*' +# #fi - #sudo service postgresql start ${POSTGRES_MAJOR_VERSION} +# #sudo service postgresql start ${POSTGRES_MAJOR_VERSION} #else # Setup postgres 11 or higher -sudo cp /etc/postgresql/{10,${POSTGRES_MAJOR_VERSION}}/main/pg_hba.conf -sudo service postgresql stop +#sudo cp /etc/postgresql/{10,${POSTGRES_MAJOR_VERSION}}/main/pg_hba.conf +#sudo service postgresql stop # Remove previous versions of postgres #sudo apt-get remove -q 'postgresql-9.*' 'postgresql-10.*' -sudo service postgresql start ${POSTGRES_MAJOR_VERSION} +#sudo service postgresql start ${POSTGRES_MAJOR_VERSION} #fi From 3a099c1fd151b6f4c9c6900c651b4fd50b5730e6 Mon Sep 17 00:00:00 2001 From: Corey MacBook Pro Date: Tue, 17 Mar 2020 17:15:21 -0400 Subject: [PATCH 058/106] modifying script for test --- scripts/before_install_postgres.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/before_install_postgres.sh b/scripts/before_install_postgres.sh index 69b4b3b6df..9353c66644 100755 --- a/scripts/before_install_postgres.sh +++ b/scripts/before_install_postgres.sh @@ -29,9 +29,9 @@ npm install -g greenkeeper-lockfile@1 #else # Setup postgres 11 or higher #sudo cp /etc/postgresql/{10,${POSTGRES_MAJOR_VERSION}}/main/pg_hba.conf -#sudo service postgresql stop +sudo service postgresql stop # Remove previous versions of postgres #sudo apt-get remove -q 'postgresql-9.*' 'postgresql-10.*' -#sudo service postgresql start ${POSTGRES_MAJOR_VERSION} +sudo service postgresql start ${POSTGRES_MAJOR_VERSION} #fi From fc2006d6f3dbc5e7163f257cd3839c2b3a5e6fe8 Mon Sep 17 00:00:00 2001 From: Corey MacBook Pro Date: Tue, 17 Mar 2020 17:24:06 -0400 Subject: [PATCH 059/106] modifying script for test --- scripts/before_install_postgres.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/before_install_postgres.sh b/scripts/before_install_postgres.sh index 9353c66644..38cd5ca129 100755 --- a/scripts/before_install_postgres.sh +++ b/scripts/before_install_postgres.sh @@ -28,7 +28,7 @@ npm install -g greenkeeper-lockfile@1 #else # Setup postgres 11 or higher -#sudo cp /etc/postgresql/{10,${POSTGRES_MAJOR_VERSION}}/main/pg_hba.conf +sudo cp /etc/postgresql/{10,${POSTGRES_MAJOR_VERSION}}/main/pg_hba.conf sudo service postgresql stop # Remove previous versions of postgres #sudo apt-get remove -q 'postgresql-9.*' 'postgresql-10.*' From 4ffee37d514a3ae24629f78bf3ee6fbb10e5463d Mon Sep 17 00:00:00 2001 From: Corey MacBook Pro Date: Tue, 17 Mar 2020 17:32:56 -0400 Subject: [PATCH 060/106] reverting back to working way with removing postgres from image --- scripts/before_install_postgres.sh | 45 +++++++++++++++--------------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/scripts/before_install_postgres.sh b/scripts/before_install_postgres.sh index 38cd5ca129..f2269e1301 100755 --- a/scripts/before_install_postgres.sh +++ b/scripts/before_install_postgres.sh @@ -10,28 +10,27 @@ nvm install $NODE_VERSION nvm use $NODE_VERSION npm install -g greenkeeper-lockfile@1 -#sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/${POSTGRES_MAJOR_VERSION}/main/postgresql.conf +sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/${POSTGRES_MAJOR_VERSION}/main/postgresql.conf -#if [[ $POSTGRES_MAJOR_VERSION -lt 11 ]]; then -# # Setup postgres 9 or 10 -# #sudo service postgresql stop +if [[ $POSTGRES_MAJOR_VERSION -lt 11 ]]; then + # Setup postgres 9 or 10 + sudo service postgresql stop -# Remove correct version of postgres -# #if [[ $POSTGRES_MAJOR_VERSION -lt 10 ]]; then -# # sudo apt-get remove -q 'postgresql-10.*' -# #else -# # sudo apt-get remove -q 'postgresql-9.*' -# #fi - -# #sudo service postgresql start ${POSTGRES_MAJOR_VERSION} - - -#else -# Setup postgres 11 or higher -sudo cp /etc/postgresql/{10,${POSTGRES_MAJOR_VERSION}}/main/pg_hba.conf -sudo service postgresql stop -# Remove previous versions of postgres -#sudo apt-get remove -q 'postgresql-9.*' 'postgresql-10.*' -sudo service postgresql start ${POSTGRES_MAJOR_VERSION} -#fi - + # Remove correct version of postgres + if [[ $POSTGRES_MAJOR_VERSION -lt 10 ]]; then + sudo apt-get remove -q 'postgresql-10.*' + else + sudo apt-get remove -q 'postgresql-9.*' + fi + + sudo service postgresql start ${POSTGRES_MAJOR_VERSION} + +else + + # Setup postgres 11 or higher + sudo cp /etc/postgresql/{10,${POSTGRES_MAJOR_VERSION}}/main/pg_hba.conf + sudo service postgresql stop + # Remove previous versions of postgres + sudo apt-get remove -q 'postgresql-9.*' 'postgresql-10.*' + sudo service postgresql start ${POSTGRES_MAJOR_VERSION} +fi From 8d17b0495dd85e06436a3a0024333a24062dba58 Mon Sep 17 00:00:00 2001 From: Corey Date: Tue, 17 Mar 2020 17:33:59 -0400 Subject: [PATCH 061/106] Reverted back to removing postgres from image --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 11315c751d..5dcabd2115 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,7 +48,7 @@ jobs: packages: - postgresql-11-postgis-2.5 - postgresql-11-postgis-2.5-scripts - env: POSTGRES_MAJOR_VERSION=11 PARSE_SERVER_TEST_DB=postgres PGPORT=5433 + env: POSTGRES_MAJOR_VERSION=11 PARSE_SERVER_TEST_DB=postgres before_install: bash scripts/before_install_postgres.sh before_script: bash scripts/before_script_postgres.sh - stage: @@ -58,7 +58,7 @@ jobs: packages: - postgresql-12-postgis-2.5 - postgresql-12-postgis-2.5-scripts - env: POSTGRES_MAJOR_VERSION=12 PARSE_SERVER_TEST_DB=postgres PGPORT=5433 + env: POSTGRES_MAJOR_VERSION=12 PARSE_SERVER_TEST_DB=postgres before_install: bash scripts/before_install_postgres.sh before_script: bash scripts/before_script_postgres.sh - stage: release From 84b4a643876fc1c2fc522df5e9e203eab8e93218 Mon Sep 17 00:00:00 2001 From: Corey Date: Wed, 18 Mar 2020 19:59:04 -0400 Subject: [PATCH 062/106] removing postgres 12 --- .travis.yml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5dcabd2115..31123e412f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -51,16 +51,6 @@ jobs: env: POSTGRES_MAJOR_VERSION=11 PARSE_SERVER_TEST_DB=postgres before_install: bash scripts/before_install_postgres.sh before_script: bash scripts/before_script_postgres.sh - - stage: - addons: - postgresql: '12' - apt: - packages: - - postgresql-12-postgis-2.5 - - postgresql-12-postgis-2.5-scripts - env: POSTGRES_MAJOR_VERSION=12 PARSE_SERVER_TEST_DB=postgres - before_install: bash scripts/before_install_postgres.sh - before_script: bash scripts/before_script_postgres.sh - stage: release node_js: '10' env: From 839d3e68a8fabb71780812ac2cd7713b93b90d49 Mon Sep 17 00:00:00 2001 From: Corey Date: Wed, 18 Mar 2020 20:11:06 -0400 Subject: [PATCH 063/106] removed postgres-12 from allow_failures --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 31123e412f..7727843028 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,8 +38,7 @@ after_script: - bash <(curl -s https://codecov.io/bash) jobs: allow_failures: - - env: NODE_VERSION=12.12.0 - - env: POSTGRES_MAJOR_VERSION=12 PARSE_SERVER_TEST_DB=postgres + - env: NODE_VERSION=12.12.0 include: - stage: addons: From c1173cbc386fea6520f147b0377c3f43dbdfb71a Mon Sep 17 00:00:00 2001 From: Corey MacBook Pro Date: Sun, 22 Mar 2020 21:30:14 -0400 Subject: [PATCH 064/106] updated postgres method from deprecated. Also updating postgis to 3.0 --- src/Adapters/Storage/Postgres/PostgresStorageAdapter.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Adapters/Storage/Postgres/PostgresStorageAdapter.js b/src/Adapters/Storage/Postgres/PostgresStorageAdapter.js index 31602afc0d..a3f34dc50b 100644 --- a/src/Adapters/Storage/Postgres/PostgresStorageAdapter.js +++ b/src/Adapters/Storage/Postgres/PostgresStorageAdapter.js @@ -621,11 +621,11 @@ const buildWhereClause = ({ const distance = fieldValue.$maxDistance; const distanceInKM = distance * 6371 * 1000; patterns.push( - `ST_distance_sphere($${index}:name::geometry, POINT($${index + + `ST_DistanceSphere($${index}:name::geometry, POINT($${index + 1}, $${index + 2})::geometry) <= $${index + 3}` ); sorts.push( - `ST_distance_sphere($${index}:name::geometry, POINT($${index + + `ST_DistanceSphere($${index}:name::geometry, POINT($${index + 1}, $${index + 2})::geometry) ASC` ); values.push(fieldName, point.longitude, point.latitude, distanceInKM); @@ -673,7 +673,7 @@ const buildWhereClause = ({ } const distanceInKM = distance * 6371 * 1000; patterns.push( - `ST_distance_sphere($${index}:name::geometry, POINT($${index + + `ST_DistanceSphere($${index}:name::geometry, POINT($${index + 1}, $${index + 2})::geometry) <= $${index + 3}` ); values.push(fieldName, point.longitude, point.latitude, distanceInKM); From 648ea743cb12a7d511af67d9d500950fc71a56c0 Mon Sep 17 00:00:00 2001 From: Corey MacBook Pro Date: Sun, 22 Mar 2020 21:32:55 -0400 Subject: [PATCH 065/106] updated postgis to 3.0 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7727843028..f4b2af9132 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,8 +45,8 @@ jobs: postgresql: '11' apt: packages: - - postgresql-11-postgis-2.5 - - postgresql-11-postgis-2.5-scripts + - postgresql-11-postgis-3.0 + - postgresql-11-postgis-3.0-scripts env: POSTGRES_MAJOR_VERSION=11 PARSE_SERVER_TEST_DB=postgres before_install: bash scripts/before_install_postgres.sh before_script: bash scripts/before_script_postgres.sh From 6a6c2d45cfbc43ac1effa126d02c42881774b25b Mon Sep 17 00:00:00 2001 From: Corey Date: Sun, 22 Mar 2020 21:51:44 -0400 Subject: [PATCH 066/106] Update .travis.yml --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index f4b2af9132..74b1c58dcd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,8 +45,8 @@ jobs: postgresql: '11' apt: packages: - - postgresql-11-postgis-3.0 - - postgresql-11-postgis-3.0-scripts + - postgresql-11-postgis-3 + - postgresql-11-postgis-3-scripts env: POSTGRES_MAJOR_VERSION=11 PARSE_SERVER_TEST_DB=postgres before_install: bash scripts/before_install_postgres.sh before_script: bash scripts/before_script_postgres.sh From fca6973c104adc64d5b7bb14cb9ddf03772483e5 Mon Sep 17 00:00:00 2001 From: Corey MacBook Pro Date: Mon, 23 Mar 2020 17:18:00 -0400 Subject: [PATCH 067/106] fix Postgres test issues that causes some tests to fail locally when using PARSE_SERVER_TEST_DATABASE_URI --- spec/ParseQuery.FullTextSearch.spec.js | 1 + spec/PostgresInitOptions.spec.js | 1 + 2 files changed, 2 insertions(+) diff --git a/spec/ParseQuery.FullTextSearch.spec.js b/spec/ParseQuery.FullTextSearch.spec.js index 6f2bebc71a..6f872e3ef0 100644 --- a/spec/ParseQuery.FullTextSearch.spec.js +++ b/spec/ParseQuery.FullTextSearch.spec.js @@ -7,6 +7,7 @@ const mongoURI = const PostgresStorageAdapter = require('../lib/Adapters/Storage/Postgres/PostgresStorageAdapter') .default; const postgresURI = + process.env.PARSE_SERVER_TEST_DATABASE_URI || 'postgres://localhost:5432/parse_server_postgres_adapter_test_database'; const Parse = require('parse/node'); const request = require('../lib/request'); diff --git a/spec/PostgresInitOptions.spec.js b/spec/PostgresInitOptions.spec.js index 956d8e543a..31caf7393e 100644 --- a/spec/PostgresInitOptions.spec.js +++ b/spec/PostgresInitOptions.spec.js @@ -2,6 +2,7 @@ const Parse = require('parse/node').Parse; const PostgresStorageAdapter = require('../lib/Adapters/Storage/Postgres/PostgresStorageAdapter') .default; const postgresURI = + process.env.PARSE_SERVER_TEST_DATABASE_URI || 'postgres://localhost:5432/parse_server_postgres_adapter_test_database'; const ParseServer = require('../lib/index'); const express = require('express'); From bcf2116f3baba2d6b8646f6fc5484306e8e34198 Mon Sep 17 00:00:00 2001 From: Corey MacBook Pro Date: Tue, 24 Mar 2020 00:40:40 -0400 Subject: [PATCH 068/106] removed dependence on creating adapter locally in testcase and use config instead. --- spec/ParseQuery.FullTextSearch.spec.js | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/spec/ParseQuery.FullTextSearch.spec.js b/spec/ParseQuery.FullTextSearch.spec.js index 6f872e3ef0..21d1c2a2f5 100644 --- a/spec/ParseQuery.FullTextSearch.spec.js +++ b/spec/ParseQuery.FullTextSearch.spec.js @@ -1,26 +1,14 @@ 'use strict'; -const MongoStorageAdapter = require('../lib/Adapters/Storage/Mongo/MongoStorageAdapter') - .default; -const mongoURI = - 'mongodb://localhost:27017/parseServerMongoAdapterTestDatabase'; -const PostgresStorageAdapter = require('../lib/Adapters/Storage/Postgres/PostgresStorageAdapter') - .default; -const postgresURI = - process.env.PARSE_SERVER_TEST_DATABASE_URI || - 'postgres://localhost:5432/parse_server_postgres_adapter_test_database'; +const Config = require('../lib/Config'); const Parse = require('parse/node'); const request = require('../lib/request'); let databaseAdapter; const fullTextHelper = () => { - if (process.env.PARSE_SERVER_TEST_DB === 'postgres') { - if (!databaseAdapter) { - databaseAdapter = new PostgresStorageAdapter({ uri: postgresURI }); - } - } else { - databaseAdapter = new MongoStorageAdapter({ uri: mongoURI }); - } + const config = Config.get('test'); + databaseAdapter = config.database.adapter; + const subjects = [ 'coffee', 'Coffee Shopping', From 530bc9d22ebe5e09c380defac7698fee5c517f4a Mon Sep 17 00:00:00 2001 From: Corey MacBook Pro Date: Tue, 24 Mar 2020 00:53:18 -0400 Subject: [PATCH 069/106] fixed one more potential issue with postgres adapter --- spec/PostgresStorageAdapter.spec.js | 1 + 1 file changed, 1 insertion(+) diff --git a/spec/PostgresStorageAdapter.spec.js b/spec/PostgresStorageAdapter.spec.js index e722fa4cec..0ec500cff1 100644 --- a/spec/PostgresStorageAdapter.spec.js +++ b/spec/PostgresStorageAdapter.spec.js @@ -1,6 +1,7 @@ const PostgresStorageAdapter = require('../lib/Adapters/Storage/Postgres/PostgresStorageAdapter') .default; const databaseURI = + process.env.PARSE_SERVER_TEST_DATABASE_URI || 'postgres://localhost:5432/parse_server_postgres_adapter_test_database'; const Config = require('../lib/Config'); From b4c6ee05ed34a09156fe640df3667cb58cd044e8 Mon Sep 17 00:00:00 2001 From: Corey MacBook Pro Date: Wed, 25 Mar 2020 15:24:25 -0400 Subject: [PATCH 070/106] modified travis and script to leverage PARSE_SERVER_TEST_DATABASE_URI --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 74b1c58dcd..526a9e79ea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,7 +47,7 @@ jobs: packages: - postgresql-11-postgis-3 - postgresql-11-postgis-3-scripts - env: POSTGRES_MAJOR_VERSION=11 PARSE_SERVER_TEST_DB=postgres + env: POSTGRES_MAJOR_VERSION=11 PARSE_SERVER_TEST_DB=postgres PARSE_SERVER_TEST_DATABASE_URI=postgres://localhost:5433/parse_server_postgres_adapter_test_database before_install: bash scripts/before_install_postgres.sh before_script: bash scripts/before_script_postgres.sh - stage: release From bdac2f43d0f0fe4ec5b9132f321790b55a3545ac Mon Sep 17 00:00:00 2001 From: Corey MacBook Pro Date: Wed, 25 Mar 2020 15:32:00 -0400 Subject: [PATCH 071/106] changes to before install to reduce time --- scripts/before_install_postgres.sh | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/scripts/before_install_postgres.sh b/scripts/before_install_postgres.sh index f2269e1301..869ffa67be 100755 --- a/scripts/before_install_postgres.sh +++ b/scripts/before_install_postgres.sh @@ -10,27 +10,19 @@ nvm install $NODE_VERSION nvm use $NODE_VERSION npm install -g greenkeeper-lockfile@1 -sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/${POSTGRES_MAJOR_VERSION}/main/postgresql.conf - +# Currently the Xenial immage lists posgres < 11 are pre-installed, we can use those +# as long as we change the port of the one we need. Note that we leave PGPORT=5432 +# as there were random issues that popped up with looking for older versions of postgis +# when using the default port if [[ $POSTGRES_MAJOR_VERSION -lt 11 ]]; then # Setup postgres 9 or 10 + + #Stop the default service since changes are needed to the config file sudo service postgresql stop - - # Remove correct version of postgres - if [[ $POSTGRES_MAJOR_VERSION -lt 10 ]]; then - sudo apt-get remove -q 'postgresql-10.*' - else - sudo apt-get remove -q 'postgresql-9.*' - fi + + #Switched installed default port to 5433 since URI is is using this port + sudo sed -i 's/port = 5432/port = 5433/' /etc/postgresql/${POSTGRES_MAJOR_VERSION}/main/postgresql.conf sudo service postgresql start ${POSTGRES_MAJOR_VERSION} -else - - # Setup postgres 11 or higher - sudo cp /etc/postgresql/{10,${POSTGRES_MAJOR_VERSION}}/main/pg_hba.conf - sudo service postgresql stop - # Remove previous versions of postgres - sudo apt-get remove -q 'postgresql-9.*' 'postgresql-10.*' - sudo service postgresql start ${POSTGRES_MAJOR_VERSION} fi From 4192af35d326907b85b1cb2ce0c1417f7946781d Mon Sep 17 00:00:00 2001 From: Corey MacBook Pro Date: Wed, 25 Mar 2020 15:44:24 -0400 Subject: [PATCH 072/106] add updated port to script for psql connection --- scripts/before_script_postgres.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/before_script_postgres.sh b/scripts/before_script_postgres.sh index c63d30de23..d9a354e40f 100755 --- a/scripts/before_script_postgres.sh +++ b/scripts/before_script_postgres.sh @@ -6,7 +6,7 @@ echo "[SCRIPT] Before Script :: Setup Parse DB for Postgres ${POSTGRES_MAJOR_VER node -e 'require("./lib/index.js")' -psql -v ON_ERROR_STOP=1 --username "postgres" --dbname "${POSTGRES_DB}" <<-EOSQL +psql -v ON_ERROR_STOP=1 -port 5433 --username "postgres" --dbname "${POSTGRES_DB}" <<-EOSQL CREATE DATABASE parse_server_postgres_adapter_test_database; \c parse_server_postgres_adapter_test_database; CREATE EXTENSION postgis; From 48d1461072e3161be61ae8a0a53771a0164047ab Mon Sep 17 00:00:00 2001 From: Corey MacBook Pro Date: Wed, 25 Mar 2020 15:58:42 -0400 Subject: [PATCH 073/106] fixed arg for psql --- scripts/before_script_postgres.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/before_script_postgres.sh b/scripts/before_script_postgres.sh index d9a354e40f..4601ea3f2a 100755 --- a/scripts/before_script_postgres.sh +++ b/scripts/before_script_postgres.sh @@ -6,7 +6,7 @@ echo "[SCRIPT] Before Script :: Setup Parse DB for Postgres ${POSTGRES_MAJOR_VER node -e 'require("./lib/index.js")' -psql -v ON_ERROR_STOP=1 -port 5433 --username "postgres" --dbname "${POSTGRES_DB}" <<-EOSQL +psql -v ON_ERROR_STOP=1 -p 5433 --username "postgres" --dbname "${POSTGRES_DB}" <<-EOSQL CREATE DATABASE parse_server_postgres_adapter_test_database; \c parse_server_postgres_adapter_test_database; CREATE EXTENSION postgis; From 5265115592e6dd530f9bec6669b1bba104ba2d54 Mon Sep 17 00:00:00 2001 From: Corey MacBook Pro Date: Wed, 25 Mar 2020 16:07:58 -0400 Subject: [PATCH 074/106] added back conf file as it probably contains the default permissions --- scripts/before_install_postgres.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/scripts/before_install_postgres.sh b/scripts/before_install_postgres.sh index 869ffa67be..941510512b 100755 --- a/scripts/before_install_postgres.sh +++ b/scripts/before_install_postgres.sh @@ -25,4 +25,13 @@ if [[ $POSTGRES_MAJOR_VERSION -lt 11 ]]; then sudo service postgresql start ${POSTGRES_MAJOR_VERSION} +else + + # Setup postgres 11 or higher + sudo cp /etc/postgresql/{10,${POSTGRES_MAJOR_VERSION}}/main/pg_hba.conf + sudo service postgresql stop + sudo service postgresql start ${POSTGRES_MAJOR_VERSION} + fi + + From 4cd60dfdda31de13b104d7c0d371329f09aa92e0 Mon Sep 17 00:00:00 2001 From: Corey MacBook Pro Date: Wed, 25 Mar 2020 16:19:10 -0400 Subject: [PATCH 075/106] seeing if stopping/starting postgres back-to-back was the issue --- scripts/before_install_postgres.sh | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/scripts/before_install_postgres.sh b/scripts/before_install_postgres.sh index 941510512b..3d7a4f3e47 100755 --- a/scripts/before_install_postgres.sh +++ b/scripts/before_install_postgres.sh @@ -6,6 +6,8 @@ source ~/.nvm/nvm.sh echo "[SCRIPT] Before Install Script :: Setup Postgres ${POSTGRES_MAJOR_VERSION}" +#Stop the default service since changes are needed to the config file +sudo service postgresql stop nvm install $NODE_VERSION nvm use $NODE_VERSION npm install -g greenkeeper-lockfile@1 @@ -17,9 +19,6 @@ npm install -g greenkeeper-lockfile@1 if [[ $POSTGRES_MAJOR_VERSION -lt 11 ]]; then # Setup postgres 9 or 10 - #Stop the default service since changes are needed to the config file - sudo service postgresql stop - #Switched installed default port to 5433 since URI is is using this port sudo sed -i 's/port = 5432/port = 5433/' /etc/postgresql/${POSTGRES_MAJOR_VERSION}/main/postgresql.conf @@ -29,9 +28,7 @@ else # Setup postgres 11 or higher sudo cp /etc/postgresql/{10,${POSTGRES_MAJOR_VERSION}}/main/pg_hba.conf - sudo service postgresql stop sudo service postgresql start ${POSTGRES_MAJOR_VERSION} fi - From 183e273977785bf54821066bfa22d7d82bcd5d9e Mon Sep 17 00:00:00 2001 From: Corey MacBook Pro Date: Wed, 25 Mar 2020 16:28:48 -0400 Subject: [PATCH 076/106] checking fix --- scripts/before_install_postgres.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/before_install_postgres.sh b/scripts/before_install_postgres.sh index 3d7a4f3e47..e90cbd167a 100755 --- a/scripts/before_install_postgres.sh +++ b/scripts/before_install_postgres.sh @@ -6,12 +6,15 @@ source ~/.nvm/nvm.sh echo "[SCRIPT] Before Install Script :: Setup Postgres ${POSTGRES_MAJOR_VERSION}" -#Stop the default service since changes are needed to the config file -sudo service postgresql stop nvm install $NODE_VERSION nvm use $NODE_VERSION npm install -g greenkeeper-lockfile@1 +#Stop the default service since changes are needed to the config file +sudo service postgresql stop +#Switched installed default port to 5433 since URI is is using this port +sudo sed -i 's/port = 5432/port = 5433/' /etc/postgresql/${POSTGRES_MAJOR_VERSION}/main/postgresql.conf + # Currently the Xenial immage lists posgres < 11 are pre-installed, we can use those # as long as we change the port of the one we need. Note that we leave PGPORT=5432 # as there were random issues that popped up with looking for older versions of postgis @@ -19,9 +22,6 @@ npm install -g greenkeeper-lockfile@1 if [[ $POSTGRES_MAJOR_VERSION -lt 11 ]]; then # Setup postgres 9 or 10 - #Switched installed default port to 5433 since URI is is using this port - sudo sed -i 's/port = 5432/port = 5433/' /etc/postgresql/${POSTGRES_MAJOR_VERSION}/main/postgresql.conf - sudo service postgresql start ${POSTGRES_MAJOR_VERSION} else From 5457858ac3849de7527031953185ba3e4ad506ba Mon Sep 17 00:00:00 2001 From: Corey MacBook Pro Date: Wed, 25 Mar 2020 16:33:40 -0400 Subject: [PATCH 077/106] revert to working version of install script --- scripts/before_install_postgres.sh | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/scripts/before_install_postgres.sh b/scripts/before_install_postgres.sh index e90cbd167a..f2269e1301 100755 --- a/scripts/before_install_postgres.sh +++ b/scripts/before_install_postgres.sh @@ -10,25 +10,27 @@ nvm install $NODE_VERSION nvm use $NODE_VERSION npm install -g greenkeeper-lockfile@1 -#Stop the default service since changes are needed to the config file -sudo service postgresql stop -#Switched installed default port to 5433 since URI is is using this port -sudo sed -i 's/port = 5432/port = 5433/' /etc/postgresql/${POSTGRES_MAJOR_VERSION}/main/postgresql.conf - -# Currently the Xenial immage lists posgres < 11 are pre-installed, we can use those -# as long as we change the port of the one we need. Note that we leave PGPORT=5432 -# as there were random issues that popped up with looking for older versions of postgis -# when using the default port +sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/${POSTGRES_MAJOR_VERSION}/main/postgresql.conf + if [[ $POSTGRES_MAJOR_VERSION -lt 11 ]]; then # Setup postgres 9 or 10 + sudo service postgresql stop + + # Remove correct version of postgres + if [[ $POSTGRES_MAJOR_VERSION -lt 10 ]]; then + sudo apt-get remove -q 'postgresql-10.*' + else + sudo apt-get remove -q 'postgresql-9.*' + fi sudo service postgresql start ${POSTGRES_MAJOR_VERSION} -else +else # Setup postgres 11 or higher sudo cp /etc/postgresql/{10,${POSTGRES_MAJOR_VERSION}}/main/pg_hba.conf + sudo service postgresql stop + # Remove previous versions of postgres + sudo apt-get remove -q 'postgresql-9.*' 'postgresql-10.*' sudo service postgresql start ${POSTGRES_MAJOR_VERSION} - fi - From 5a175d5cd250faf20abb25d11cfdf6e9f44e77da Mon Sep 17 00:00:00 2001 From: Corey MacBook Pro Date: Wed, 25 Mar 2020 16:40:08 -0400 Subject: [PATCH 078/106] leave default port --- scripts/before_install_postgres.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/before_install_postgres.sh b/scripts/before_install_postgres.sh index f2269e1301..efb835d2cc 100755 --- a/scripts/before_install_postgres.sh +++ b/scripts/before_install_postgres.sh @@ -10,7 +10,7 @@ nvm install $NODE_VERSION nvm use $NODE_VERSION npm install -g greenkeeper-lockfile@1 -sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/${POSTGRES_MAJOR_VERSION}/main/postgresql.conf +#sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/${POSTGRES_MAJOR_VERSION}/main/postgresql.conf if [[ $POSTGRES_MAJOR_VERSION -lt 11 ]]; then # Setup postgres 9 or 10 From 245528157f37fbb4d7871aecb1a9fd1fe074bf4b Mon Sep 17 00:00:00 2001 From: Corey MacBook Pro Date: Wed, 25 Mar 2020 16:53:11 -0400 Subject: [PATCH 079/106] removing uninstall of postgres from script --- scripts/before_install_postgres.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/before_install_postgres.sh b/scripts/before_install_postgres.sh index efb835d2cc..b3b652ea31 100755 --- a/scripts/before_install_postgres.sh +++ b/scripts/before_install_postgres.sh @@ -31,6 +31,6 @@ else sudo cp /etc/postgresql/{10,${POSTGRES_MAJOR_VERSION}}/main/pg_hba.conf sudo service postgresql stop # Remove previous versions of postgres - sudo apt-get remove -q 'postgresql-9.*' 'postgresql-10.*' + #sudo apt-get remove -q 'postgresql-9.*' 'postgresql-10.*' sudo service postgresql start ${POSTGRES_MAJOR_VERSION} fi From 36d590a9895a8c07fb8fad07760ab33a8b277ce8 Mon Sep 17 00:00:00 2001 From: Corey MacBook Pro Date: Wed, 25 Mar 2020 16:59:50 -0400 Subject: [PATCH 080/106] looks like postgres won't start until the others are removed --- scripts/before_install_postgres.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/before_install_postgres.sh b/scripts/before_install_postgres.sh index b3b652ea31..cee5514d39 100755 --- a/scripts/before_install_postgres.sh +++ b/scripts/before_install_postgres.sh @@ -10,11 +10,12 @@ nvm install $NODE_VERSION nvm use $NODE_VERSION npm install -g greenkeeper-lockfile@1 -#sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/${POSTGRES_MAJOR_VERSION}/main/postgresql.conf +# Setup postgres 9 or 10 +sudo service postgresql stop if [[ $POSTGRES_MAJOR_VERSION -lt 11 ]]; then - # Setup postgres 9 or 10 - sudo service postgresql stop + + sudo sed -i 's/port = 5432/port = 5433/' /etc/postgresql/${POSTGRES_MAJOR_VERSION}/main/postgresql.conf # Remove correct version of postgres if [[ $POSTGRES_MAJOR_VERSION -lt 10 ]]; then @@ -29,8 +30,7 @@ else # Setup postgres 11 or higher sudo cp /etc/postgresql/{10,${POSTGRES_MAJOR_VERSION}}/main/pg_hba.conf - sudo service postgresql stop # Remove previous versions of postgres - #sudo apt-get remove -q 'postgresql-9.*' 'postgresql-10.*' + sudo apt-get remove -q 'postgresql-9.*' 'postgresql-10.*' sudo service postgresql start ${POSTGRES_MAJOR_VERSION} fi From ee57800bb3234a45a643474f27fd4fc1ffaa8b90 Mon Sep 17 00:00:00 2001 From: Corey MacBook Pro Date: Wed, 25 Mar 2020 17:19:19 -0400 Subject: [PATCH 081/106] forgoing using posgres service and starting directly, hoping it allows to skip remove --- scripts/before_install_postgres.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/before_install_postgres.sh b/scripts/before_install_postgres.sh index cee5514d39..de74ab9898 100755 --- a/scripts/before_install_postgres.sh +++ b/scripts/before_install_postgres.sh @@ -30,7 +30,8 @@ else # Setup postgres 11 or higher sudo cp /etc/postgresql/{10,${POSTGRES_MAJOR_VERSION}}/main/pg_hba.conf + sudo /usr/lib/postgresql/${POSTGRES_MAJOR_VERSION}/bin/pg_ctl -D /var/lib/postgresql/${POSTGRES_MAJOR_VERSION}/main -l logfile start # Remove previous versions of postgres - sudo apt-get remove -q 'postgresql-9.*' 'postgresql-10.*' + #sudo apt-get remove -q 'postgresql-9.*' 'postgresql-10.*' sudo service postgresql start ${POSTGRES_MAJOR_VERSION} fi From 8300f20d73e02e3b360fcf4bc0ff46f702ad3263 Mon Sep 17 00:00:00 2001 From: Corey MacBook Pro Date: Wed, 25 Mar 2020 17:22:36 -0400 Subject: [PATCH 082/106] removed sudo for starting postgres --- scripts/before_install_postgres.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/before_install_postgres.sh b/scripts/before_install_postgres.sh index de74ab9898..3b81db6518 100755 --- a/scripts/before_install_postgres.sh +++ b/scripts/before_install_postgres.sh @@ -30,7 +30,7 @@ else # Setup postgres 11 or higher sudo cp /etc/postgresql/{10,${POSTGRES_MAJOR_VERSION}}/main/pg_hba.conf - sudo /usr/lib/postgresql/${POSTGRES_MAJOR_VERSION}/bin/pg_ctl -D /var/lib/postgresql/${POSTGRES_MAJOR_VERSION}/main -l logfile start + /usr/lib/postgresql/${POSTGRES_MAJOR_VERSION}/bin/pg_ctl -D /var/lib/postgresql/${POSTGRES_MAJOR_VERSION}/main -l logfile start # Remove previous versions of postgres #sudo apt-get remove -q 'postgresql-9.*' 'postgresql-10.*' sudo service postgresql start ${POSTGRES_MAJOR_VERSION} From dc6e595d815c2e3e54387597633a82c3b5b77b8d Mon Sep 17 00:00:00 2001 From: Corey MacBook Pro Date: Wed, 25 Mar 2020 17:36:33 -0400 Subject: [PATCH 083/106] adding back sude, but using default user for postgres --- scripts/before_install_postgres.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/before_install_postgres.sh b/scripts/before_install_postgres.sh index 3b81db6518..453a76ccdd 100755 --- a/scripts/before_install_postgres.sh +++ b/scripts/before_install_postgres.sh @@ -30,7 +30,7 @@ else # Setup postgres 11 or higher sudo cp /etc/postgresql/{10,${POSTGRES_MAJOR_VERSION}}/main/pg_hba.conf - /usr/lib/postgresql/${POSTGRES_MAJOR_VERSION}/bin/pg_ctl -D /var/lib/postgresql/${POSTGRES_MAJOR_VERSION}/main -l logfile start + sudo -u postgres /usr/lib/postgresql/${POSTGRES_MAJOR_VERSION}/bin/pg_ctl -D /var/lib/postgresql/${POSTGRES_MAJOR_VERSION}/main -l logfile start # Remove previous versions of postgres #sudo apt-get remove -q 'postgresql-9.*' 'postgresql-10.*' sudo service postgresql start ${POSTGRES_MAJOR_VERSION} From 59c903115ab0d91c135842bab8b65081f61e5257 Mon Sep 17 00:00:00 2001 From: Corey MacBook Pro Date: Wed, 25 Mar 2020 17:40:38 -0400 Subject: [PATCH 084/106] fix --- scripts/before_install_postgres.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/before_install_postgres.sh b/scripts/before_install_postgres.sh index 453a76ccdd..ec44dc4631 100755 --- a/scripts/before_install_postgres.sh +++ b/scripts/before_install_postgres.sh @@ -30,7 +30,7 @@ else # Setup postgres 11 or higher sudo cp /etc/postgresql/{10,${POSTGRES_MAJOR_VERSION}}/main/pg_hba.conf - sudo -u postgres /usr/lib/postgresql/${POSTGRES_MAJOR_VERSION}/bin/pg_ctl -D /var/lib/postgresql/${POSTGRES_MAJOR_VERSION}/main -l logfile start + sudo -u postgres /usr/lib/postgresql/${POSTGRES_MAJOR_VERSION}/bin/pg_ctl -D /var/lib/postgresql/${POSTGRES_MAJOR_VERSION}/main start # Remove previous versions of postgres #sudo apt-get remove -q 'postgresql-9.*' 'postgresql-10.*' sudo service postgresql start ${POSTGRES_MAJOR_VERSION} From 8e27b4630a9fed8e8d9dd955fd21708870db9d27 Mon Sep 17 00:00:00 2001 From: Corey MacBook Pro Date: Wed, 25 Mar 2020 17:44:50 -0400 Subject: [PATCH 085/106] don't start service --- scripts/before_install_postgres.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/before_install_postgres.sh b/scripts/before_install_postgres.sh index ec44dc4631..407a521d2c 100755 --- a/scripts/before_install_postgres.sh +++ b/scripts/before_install_postgres.sh @@ -33,5 +33,5 @@ else sudo -u postgres /usr/lib/postgresql/${POSTGRES_MAJOR_VERSION}/bin/pg_ctl -D /var/lib/postgresql/${POSTGRES_MAJOR_VERSION}/main start # Remove previous versions of postgres #sudo apt-get remove -q 'postgresql-9.*' 'postgresql-10.*' - sudo service postgresql start ${POSTGRES_MAJOR_VERSION} + #sudo service postgresql start ${POSTGRES_MAJOR_VERSION} fi From 268c08a80643e9db65e87c39b27a1e4447a589cb Mon Sep 17 00:00:00 2001 From: Corey MacBook Pro Date: Wed, 25 Mar 2020 18:14:24 -0400 Subject: [PATCH 086/106] init db cluster before starting --- scripts/before_install_postgres.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/before_install_postgres.sh b/scripts/before_install_postgres.sh index 407a521d2c..102d358dab 100755 --- a/scripts/before_install_postgres.sh +++ b/scripts/before_install_postgres.sh @@ -30,7 +30,8 @@ else # Setup postgres 11 or higher sudo cp /etc/postgresql/{10,${POSTGRES_MAJOR_VERSION}}/main/pg_hba.conf - sudo -u postgres /usr/lib/postgresql/${POSTGRES_MAJOR_VERSION}/bin/pg_ctl -D /var/lib/postgresql/${POSTGRES_MAJOR_VERSION}/main start + sudo -u postgres /usr/lib/postgresql/${POSTGRES_MAJOR_VERSION}/bin/initdb -D /var/lib/postgresql/${POSTGRES_MAJOR_VERSION}/main -E SQL_ASCII --no-locale + sudo -u postgres /usr/lib/postgresql/${POSTGRES_MAJOR_VERSION}/bin/pg_ctl -D /var/lib/postgresql/${POSTGRES_MAJOR_VERSION}/main -l /var/lib/postgresql/${POSTGRES_MAJOR_VERSION}/main/serverlog start # Remove previous versions of postgres #sudo apt-get remove -q 'postgresql-9.*' 'postgresql-10.*' #sudo service postgresql start ${POSTGRES_MAJOR_VERSION} From f93620f31964d6d715c815a1484da53b5e201582 Mon Sep 17 00:00:00 2001 From: Corey MacBook Pro Date: Wed, 25 Mar 2020 18:33:17 -0400 Subject: [PATCH 087/106] remove folder befor init --- scripts/before_install_postgres.sh | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/scripts/before_install_postgres.sh b/scripts/before_install_postgres.sh index 102d358dab..87034178e9 100755 --- a/scripts/before_install_postgres.sh +++ b/scripts/before_install_postgres.sh @@ -10,27 +10,28 @@ nvm install $NODE_VERSION nvm use $NODE_VERSION npm install -g greenkeeper-lockfile@1 -# Setup postgres 9 or 10 -sudo service postgresql stop - if [[ $POSTGRES_MAJOR_VERSION -lt 11 ]]; then - + # Setup postgres 9 or 10 sudo sed -i 's/port = 5432/port = 5433/' /etc/postgresql/${POSTGRES_MAJOR_VERSION}/main/postgresql.conf + + # Stop the current running service + sudo service postgresql stop # Remove correct version of postgres - if [[ $POSTGRES_MAJOR_VERSION -lt 10 ]]; then - sudo apt-get remove -q 'postgresql-10.*' - else - sudo apt-get remove -q 'postgresql-9.*' - fi + #if [[ $POSTGRES_MAJOR_VERSION -lt 10 ]]; then + # sudo apt-get remove -q 'postgresql-10.*' + #else + # sudo apt-get remove -q 'postgresql-9.*' + #fi - sudo service postgresql start ${POSTGRES_MAJOR_VERSION} + #sudo service postgresql start ${POSTGRES_MAJOR_VERSION} else # Setup postgres 11 or higher - sudo cp /etc/postgresql/{10,${POSTGRES_MAJOR_VERSION}}/main/pg_hba.conf + rm -rf /var/lib/postgresql/${POSTGRES_MAJOR_VERSION}/main sudo -u postgres /usr/lib/postgresql/${POSTGRES_MAJOR_VERSION}/bin/initdb -D /var/lib/postgresql/${POSTGRES_MAJOR_VERSION}/main -E SQL_ASCII --no-locale + sudo cp /etc/postgresql/{10,${POSTGRES_MAJOR_VERSION}}/main/pg_hba.conf sudo -u postgres /usr/lib/postgresql/${POSTGRES_MAJOR_VERSION}/bin/pg_ctl -D /var/lib/postgresql/${POSTGRES_MAJOR_VERSION}/main -l /var/lib/postgresql/${POSTGRES_MAJOR_VERSION}/main/serverlog start # Remove previous versions of postgres #sudo apt-get remove -q 'postgresql-9.*' 'postgresql-10.*' From c1dde027316a337a35e83d827295297f94399c4b Mon Sep 17 00:00:00 2001 From: Corey MacBook Pro Date: Wed, 25 Mar 2020 18:36:11 -0400 Subject: [PATCH 088/106] remove folder befor init --- scripts/before_install_postgres.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/before_install_postgres.sh b/scripts/before_install_postgres.sh index 87034178e9..5262fe5e7a 100755 --- a/scripts/before_install_postgres.sh +++ b/scripts/before_install_postgres.sh @@ -29,7 +29,7 @@ if [[ $POSTGRES_MAJOR_VERSION -lt 11 ]]; then else # Setup postgres 11 or higher - rm -rf /var/lib/postgresql/${POSTGRES_MAJOR_VERSION}/main + sudo rm -rf /var/lib/postgresql/${POSTGRES_MAJOR_VERSION}/main sudo -u postgres /usr/lib/postgresql/${POSTGRES_MAJOR_VERSION}/bin/initdb -D /var/lib/postgresql/${POSTGRES_MAJOR_VERSION}/main -E SQL_ASCII --no-locale sudo cp /etc/postgresql/{10,${POSTGRES_MAJOR_VERSION}}/main/pg_hba.conf sudo -u postgres /usr/lib/postgresql/${POSTGRES_MAJOR_VERSION}/bin/pg_ctl -D /var/lib/postgresql/${POSTGRES_MAJOR_VERSION}/main -l /var/lib/postgresql/${POSTGRES_MAJOR_VERSION}/main/serverlog start From b269e6b103b5fdca53e5c26279ec24f0c990728e Mon Sep 17 00:00:00 2001 From: Corey MacBook Pro Date: Wed, 25 Mar 2020 18:44:45 -0400 Subject: [PATCH 089/106] still have to stop service --- scripts/before_install_postgres.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/before_install_postgres.sh b/scripts/before_install_postgres.sh index 5262fe5e7a..6f11ddb1ab 100755 --- a/scripts/before_install_postgres.sh +++ b/scripts/before_install_postgres.sh @@ -10,13 +10,13 @@ nvm install $NODE_VERSION nvm use $NODE_VERSION npm install -g greenkeeper-lockfile@1 +# Stop the current running service +sudo service postgresql stop + if [[ $POSTGRES_MAJOR_VERSION -lt 11 ]]; then # Setup postgres 9 or 10 sudo sed -i 's/port = 5432/port = 5433/' /etc/postgresql/${POSTGRES_MAJOR_VERSION}/main/postgresql.conf - # Stop the current running service - sudo service postgresql stop - # Remove correct version of postgres #if [[ $POSTGRES_MAJOR_VERSION -lt 10 ]]; then # sudo apt-get remove -q 'postgresql-10.*' From bd5a1f8aee5763d8d5e6701290dc4f91e82b8ddc Mon Sep 17 00:00:00 2001 From: Corey MacBook Pro Date: Wed, 25 Mar 2020 19:07:35 -0400 Subject: [PATCH 090/106] switch ports after new configs are made --- scripts/before_install_postgres.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/before_install_postgres.sh b/scripts/before_install_postgres.sh index 6f11ddb1ab..f6552d6a11 100755 --- a/scripts/before_install_postgres.sh +++ b/scripts/before_install_postgres.sh @@ -31,7 +31,9 @@ else # Setup postgres 11 or higher sudo rm -rf /var/lib/postgresql/${POSTGRES_MAJOR_VERSION}/main sudo -u postgres /usr/lib/postgresql/${POSTGRES_MAJOR_VERSION}/bin/initdb -D /var/lib/postgresql/${POSTGRES_MAJOR_VERSION}/main -E SQL_ASCII --no-locale - sudo cp /etc/postgresql/{10,${POSTGRES_MAJOR_VERSION}}/main/pg_hba.conf + + sudo sed -i 's/port = 5432/port = 5433/' /etc/postgresql/${POSTGRES_MAJOR_VERSION}/main/postgresql.conf + #sudo cp /etc/postgresql/{10,${POSTGRES_MAJOR_VERSION}}/main/pg_hba.conf sudo -u postgres /usr/lib/postgresql/${POSTGRES_MAJOR_VERSION}/bin/pg_ctl -D /var/lib/postgresql/${POSTGRES_MAJOR_VERSION}/main -l /var/lib/postgresql/${POSTGRES_MAJOR_VERSION}/main/serverlog start # Remove previous versions of postgres #sudo apt-get remove -q 'postgresql-9.*' 'postgresql-10.*' From 160f5a511232142fa82f09c57f7617ab100fe4e0 Mon Sep 17 00:00:00 2001 From: Corey MacBook Pro Date: Wed, 25 Mar 2020 19:28:44 -0400 Subject: [PATCH 091/106] switch ports after new configs are made --- scripts/before_install_postgres.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/before_install_postgres.sh b/scripts/before_install_postgres.sh index f6552d6a11..af10b3599f 100755 --- a/scripts/before_install_postgres.sh +++ b/scripts/before_install_postgres.sh @@ -31,10 +31,9 @@ else # Setup postgres 11 or higher sudo rm -rf /var/lib/postgresql/${POSTGRES_MAJOR_VERSION}/main sudo -u postgres /usr/lib/postgresql/${POSTGRES_MAJOR_VERSION}/bin/initdb -D /var/lib/postgresql/${POSTGRES_MAJOR_VERSION}/main -E SQL_ASCII --no-locale - sudo sed -i 's/port = 5432/port = 5433/' /etc/postgresql/${POSTGRES_MAJOR_VERSION}/main/postgresql.conf #sudo cp /etc/postgresql/{10,${POSTGRES_MAJOR_VERSION}}/main/pg_hba.conf - sudo -u postgres /usr/lib/postgresql/${POSTGRES_MAJOR_VERSION}/bin/pg_ctl -D /var/lib/postgresql/${POSTGRES_MAJOR_VERSION}/main -l /var/lib/postgresql/${POSTGRES_MAJOR_VERSION}/main/serverlog start + sudo -u postgres /usr/lib/postgresql/${POSTGRES_MAJOR_VERSION}/bin/pg_ctl -D /var/lib/postgresql/${POSTGRES_MAJOR_VERSION}/main -l /var/lib/postgresql/${POSTGRES_MAJOR_VERSION}/main/serverlog -o "-F -p 5433" start # Remove previous versions of postgres #sudo apt-get remove -q 'postgresql-9.*' 'postgresql-10.*' #sudo service postgresql start ${POSTGRES_MAJOR_VERSION} From 2eb79875fc299ada84fa435a9cc5b74e193bb241 Mon Sep 17 00:00:00 2001 From: Corey MacBook Pro Date: Wed, 25 Mar 2020 19:38:14 -0400 Subject: [PATCH 092/106] went back to removing to get it to start properly --- scripts/before_install_postgres.sh | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/scripts/before_install_postgres.sh b/scripts/before_install_postgres.sh index af10b3599f..a9a6c155c8 100755 --- a/scripts/before_install_postgres.sh +++ b/scripts/before_install_postgres.sh @@ -18,23 +18,19 @@ if [[ $POSTGRES_MAJOR_VERSION -lt 11 ]]; then sudo sed -i 's/port = 5432/port = 5433/' /etc/postgresql/${POSTGRES_MAJOR_VERSION}/main/postgresql.conf # Remove correct version of postgres - #if [[ $POSTGRES_MAJOR_VERSION -lt 10 ]]; then - # sudo apt-get remove -q 'postgresql-10.*' - #else - # sudo apt-get remove -q 'postgresql-9.*' - #fi + if [[ $POSTGRES_MAJOR_VERSION -lt 10 ]]; then + sudo apt-get remove -q 'postgresql-10.*' + else + sudo apt-get remove -q 'postgresql-9.*' + fi - #sudo service postgresql start ${POSTGRES_MAJOR_VERSION} + sudo service postgresql start else # Setup postgres 11 or higher - sudo rm -rf /var/lib/postgresql/${POSTGRES_MAJOR_VERSION}/main - sudo -u postgres /usr/lib/postgresql/${POSTGRES_MAJOR_VERSION}/bin/initdb -D /var/lib/postgresql/${POSTGRES_MAJOR_VERSION}/main -E SQL_ASCII --no-locale - sudo sed -i 's/port = 5432/port = 5433/' /etc/postgresql/${POSTGRES_MAJOR_VERSION}/main/postgresql.conf - #sudo cp /etc/postgresql/{10,${POSTGRES_MAJOR_VERSION}}/main/pg_hba.conf - sudo -u postgres /usr/lib/postgresql/${POSTGRES_MAJOR_VERSION}/bin/pg_ctl -D /var/lib/postgresql/${POSTGRES_MAJOR_VERSION}/main -l /var/lib/postgresql/${POSTGRES_MAJOR_VERSION}/main/serverlog -o "-F -p 5433" start + sudo cp /etc/postgresql/{10,${POSTGRES_MAJOR_VERSION}}/main/pg_hba.conf # Remove previous versions of postgres - #sudo apt-get remove -q 'postgresql-9.*' 'postgresql-10.*' - #sudo service postgresql start ${POSTGRES_MAJOR_VERSION} + sudo apt-get remove -q 'postgresql-9.*' 'postgresql-10.*' + sudo service postgresql start ${POSTGRES_MAJOR_VERSION} fi From f63570684296eadb2c5dd5212eebaad02019d9c6 Mon Sep 17 00:00:00 2001 From: Corey MacBook Pro Date: Wed, 25 Mar 2020 19:45:36 -0400 Subject: [PATCH 093/106] seeing if you can use postgres installaition out of the box --- scripts/before_install_postgres.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/scripts/before_install_postgres.sh b/scripts/before_install_postgres.sh index a9a6c155c8..97d9bab4bc 100755 --- a/scripts/before_install_postgres.sh +++ b/scripts/before_install_postgres.sh @@ -10,13 +10,14 @@ nvm install $NODE_VERSION nvm use $NODE_VERSION npm install -g greenkeeper-lockfile@1 -# Stop the current running service -sudo service postgresql stop if [[ $POSTGRES_MAJOR_VERSION -lt 11 ]]; then # Setup postgres 9 or 10 sudo sed -i 's/port = 5432/port = 5433/' /etc/postgresql/${POSTGRES_MAJOR_VERSION}/main/postgresql.conf + # Stop the current running service + sudo service postgresql stop + # Remove correct version of postgres if [[ $POSTGRES_MAJOR_VERSION -lt 10 ]]; then sudo apt-get remove -q 'postgresql-10.*' @@ -29,8 +30,8 @@ if [[ $POSTGRES_MAJOR_VERSION -lt 11 ]]; then else # Setup postgres 11 or higher - sudo cp /etc/postgresql/{10,${POSTGRES_MAJOR_VERSION}}/main/pg_hba.conf + #sudo cp /etc/postgresql/{10,${POSTGRES_MAJOR_VERSION}}/main/pg_hba.conf # Remove previous versions of postgres - sudo apt-get remove -q 'postgresql-9.*' 'postgresql-10.*' - sudo service postgresql start ${POSTGRES_MAJOR_VERSION} + #sudo apt-get remove -q 'postgresql-9.*' 'postgresql-10.*' + #sudo service postgresql start fi From fff3f0d597387e88e4f848a1942598c98674effa Mon Sep 17 00:00:00 2001 From: Corey MacBook Pro Date: Wed, 25 Mar 2020 19:50:29 -0400 Subject: [PATCH 094/106] seeing if you can use postgres installaition out of the box --- scripts/before_install_postgres.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/before_install_postgres.sh b/scripts/before_install_postgres.sh index 97d9bab4bc..6a4d393092 100755 --- a/scripts/before_install_postgres.sh +++ b/scripts/before_install_postgres.sh @@ -27,7 +27,7 @@ if [[ $POSTGRES_MAJOR_VERSION -lt 11 ]]; then sudo service postgresql start -else +#else # Setup postgres 11 or higher #sudo cp /etc/postgresql/{10,${POSTGRES_MAJOR_VERSION}}/main/pg_hba.conf From f03310e066d66025be1a26f1f34ea5ad8e94874e Mon Sep 17 00:00:00 2001 From: Corey MacBook Pro Date: Wed, 25 Mar 2020 20:02:12 -0400 Subject: [PATCH 095/106] copy hba file, then stop,start --- scripts/before_install_postgres.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/before_install_postgres.sh b/scripts/before_install_postgres.sh index 6a4d393092..8d63fc8274 100755 --- a/scripts/before_install_postgres.sh +++ b/scripts/before_install_postgres.sh @@ -27,10 +27,11 @@ if [[ $POSTGRES_MAJOR_VERSION -lt 11 ]]; then sudo service postgresql start -#else - +else # Setup postgres 11 or higher - #sudo cp /etc/postgresql/{10,${POSTGRES_MAJOR_VERSION}}/main/pg_hba.conf + sudo cp /etc/postgresql/{10,${POSTGRES_MAJOR_VERSION}}/main/pg_hba.conf + sudo systemctl stop postgresql@${POSTGRES_MAJOR_VERSION}-main + sudo systemctl start postgresql@${POSTGRES_MAJOR_VERSION}-main # Remove previous versions of postgres #sudo apt-get remove -q 'postgresql-9.*' 'postgresql-10.*' #sudo service postgresql start From 020080ec488ce7cd6dbd5bea82197dc020d7d0cf Mon Sep 17 00:00:00 2001 From: Corey MacBook Pro Date: Wed, 25 Mar 2020 20:14:35 -0400 Subject: [PATCH 096/106] testing using port as argument --- .travis.yml | 2 +- scripts/before_install_postgres.sh | 3 ++- scripts/before_script_postgres.sh | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 526a9e79ea..7e92f52cf8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,7 +47,7 @@ jobs: packages: - postgresql-11-postgis-3 - postgresql-11-postgis-3-scripts - env: POSTGRES_MAJOR_VERSION=11 PARSE_SERVER_TEST_DB=postgres PARSE_SERVER_TEST_DATABASE_URI=postgres://localhost:5433/parse_server_postgres_adapter_test_database + env: POSTGRES_MAJOR_VERSION=11 PARSE_SERVER_TEST_DB=postgres PARSE_PG_PORT=5433 PARSE_SERVER_TEST_DATABASE_URI=postgres://localhost:${PARSE_PG_PORT}/parse_server_postgres_adapter_test_database before_install: bash scripts/before_install_postgres.sh before_script: bash scripts/before_script_postgres.sh - stage: release diff --git a/scripts/before_install_postgres.sh b/scripts/before_install_postgres.sh index 8d63fc8274..cc1dd940cc 100755 --- a/scripts/before_install_postgres.sh +++ b/scripts/before_install_postgres.sh @@ -13,7 +13,7 @@ npm install -g greenkeeper-lockfile@1 if [[ $POSTGRES_MAJOR_VERSION -lt 11 ]]; then # Setup postgres 9 or 10 - sudo sed -i 's/port = 5432/port = 5433/' /etc/postgresql/${POSTGRES_MAJOR_VERSION}/main/postgresql.conf + sudo sed -i 's/port = 5432/port = ${PARSE_PG_PORT}/' /etc/postgresql/${POSTGRES_MAJOR_VERSION}/main/postgresql.conf # Stop the current running service sudo service postgresql stop @@ -29,6 +29,7 @@ if [[ $POSTGRES_MAJOR_VERSION -lt 11 ]]; then else # Setup postgres 11 or higher + sudo sed -i 's/port = 5433/port = ${PARSE_PG_PORT}/' /etc/postgresql/${POSTGRES_MAJOR_VERSION}/main/postgresql.conf sudo cp /etc/postgresql/{10,${POSTGRES_MAJOR_VERSION}}/main/pg_hba.conf sudo systemctl stop postgresql@${POSTGRES_MAJOR_VERSION}-main sudo systemctl start postgresql@${POSTGRES_MAJOR_VERSION}-main diff --git a/scripts/before_script_postgres.sh b/scripts/before_script_postgres.sh index 4601ea3f2a..14ccc56d1c 100755 --- a/scripts/before_script_postgres.sh +++ b/scripts/before_script_postgres.sh @@ -6,7 +6,7 @@ echo "[SCRIPT] Before Script :: Setup Parse DB for Postgres ${POSTGRES_MAJOR_VER node -e 'require("./lib/index.js")' -psql -v ON_ERROR_STOP=1 -p 5433 --username "postgres" --dbname "${POSTGRES_DB}" <<-EOSQL +psql -v ON_ERROR_STOP=1 -p ${PARSE_PG_PORT} --username "postgres" --dbname "${POSTGRES_DB}" <<-EOSQL CREATE DATABASE parse_server_postgres_adapter_test_database; \c parse_server_postgres_adapter_test_database; CREATE EXTENSION postgis; From 79c7949b66d8ac07fb11844748fc70d5b8d01129 Mon Sep 17 00:00:00 2001 From: Corey MacBook Pro Date: Wed, 25 Mar 2020 20:23:51 -0400 Subject: [PATCH 097/106] working version --- .travis.yml | 2 +- scripts/before_install_postgres.sh | 3 +-- scripts/before_script_postgres.sh | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7e92f52cf8..526a9e79ea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,7 +47,7 @@ jobs: packages: - postgresql-11-postgis-3 - postgresql-11-postgis-3-scripts - env: POSTGRES_MAJOR_VERSION=11 PARSE_SERVER_TEST_DB=postgres PARSE_PG_PORT=5433 PARSE_SERVER_TEST_DATABASE_URI=postgres://localhost:${PARSE_PG_PORT}/parse_server_postgres_adapter_test_database + env: POSTGRES_MAJOR_VERSION=11 PARSE_SERVER_TEST_DB=postgres PARSE_SERVER_TEST_DATABASE_URI=postgres://localhost:5433/parse_server_postgres_adapter_test_database before_install: bash scripts/before_install_postgres.sh before_script: bash scripts/before_script_postgres.sh - stage: release diff --git a/scripts/before_install_postgres.sh b/scripts/before_install_postgres.sh index cc1dd940cc..8d63fc8274 100755 --- a/scripts/before_install_postgres.sh +++ b/scripts/before_install_postgres.sh @@ -13,7 +13,7 @@ npm install -g greenkeeper-lockfile@1 if [[ $POSTGRES_MAJOR_VERSION -lt 11 ]]; then # Setup postgres 9 or 10 - sudo sed -i 's/port = 5432/port = ${PARSE_PG_PORT}/' /etc/postgresql/${POSTGRES_MAJOR_VERSION}/main/postgresql.conf + sudo sed -i 's/port = 5432/port = 5433/' /etc/postgresql/${POSTGRES_MAJOR_VERSION}/main/postgresql.conf # Stop the current running service sudo service postgresql stop @@ -29,7 +29,6 @@ if [[ $POSTGRES_MAJOR_VERSION -lt 11 ]]; then else # Setup postgres 11 or higher - sudo sed -i 's/port = 5433/port = ${PARSE_PG_PORT}/' /etc/postgresql/${POSTGRES_MAJOR_VERSION}/main/postgresql.conf sudo cp /etc/postgresql/{10,${POSTGRES_MAJOR_VERSION}}/main/pg_hba.conf sudo systemctl stop postgresql@${POSTGRES_MAJOR_VERSION}-main sudo systemctl start postgresql@${POSTGRES_MAJOR_VERSION}-main diff --git a/scripts/before_script_postgres.sh b/scripts/before_script_postgres.sh index 14ccc56d1c..4601ea3f2a 100755 --- a/scripts/before_script_postgres.sh +++ b/scripts/before_script_postgres.sh @@ -6,7 +6,7 @@ echo "[SCRIPT] Before Script :: Setup Parse DB for Postgres ${POSTGRES_MAJOR_VER node -e 'require("./lib/index.js")' -psql -v ON_ERROR_STOP=1 -p ${PARSE_PG_PORT} --username "postgres" --dbname "${POSTGRES_DB}" <<-EOSQL +psql -v ON_ERROR_STOP=1 -p 5433 --username "postgres" --dbname "${POSTGRES_DB}" <<-EOSQL CREATE DATABASE parse_server_postgres_adapter_test_database; \c parse_server_postgres_adapter_test_database; CREATE EXTENSION postgis; From c27c30420e2097896ff0b5213806df5ab17a5b98 Mon Sep 17 00:00:00 2001 From: Corey MacBook Pro Date: Wed, 25 Mar 2020 20:32:57 -0400 Subject: [PATCH 098/106] round 2 --- scripts/before_install_postgres.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/scripts/before_install_postgres.sh b/scripts/before_install_postgres.sh index 8d63fc8274..56dd9c59d8 100755 --- a/scripts/before_install_postgres.sh +++ b/scripts/before_install_postgres.sh @@ -32,7 +32,4 @@ else sudo cp /etc/postgresql/{10,${POSTGRES_MAJOR_VERSION}}/main/pg_hba.conf sudo systemctl stop postgresql@${POSTGRES_MAJOR_VERSION}-main sudo systemctl start postgresql@${POSTGRES_MAJOR_VERSION}-main - # Remove previous versions of postgres - #sudo apt-get remove -q 'postgresql-9.*' 'postgresql-10.*' - #sudo service postgresql start fi From bb86193995721bf829cf89e3497adc36e335e2de Mon Sep 17 00:00:00 2001 From: Corey MacBook Pro Date: Thu, 26 Mar 2020 08:57:06 -0400 Subject: [PATCH 099/106] updated documentation to reflect changes --- CONTRIBUTING.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 756a2efeab..8b89f73cf6 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -58,13 +58,18 @@ Once you have babel running in watch mode, you can start making changes to parse If your pull request introduces a change that may affect the storage or retrieval of objects, you may want to make sure it plays nice with Postgres. -* Run the tests against the postgres database with `PARSE_SERVER_TEST_DB=postgres npm test`. You'll need to have postgres running on your machine and setup [appropriately](https://github.com/parse-community/parse-server/blob/master/.travis.yml#L37) or use [`Docker`](#run-a-parse-postgres-with-docker). +* Run the tests against the postgres database with `PARSE_SERVER_TEST_DB=postgres PARSE_SERVER_TEST_DATABASE_URI=postgres://postgres:password@localhost:5432/parse_server_postgres_adapter_test_database npm test`. You'll need to have postgres running on your machine and setup [appropriately](https://github.com/parse-community/parse-server/blob/master/.travis.yml#L43) or use [`Docker`](#run-a-parse-postgres-with-docker). * The Postgres adapter has a special debugger that traces all the sql commands. You can enable it with setting the environment variable `PARSE_SERVER_LOG_LEVEL=debug` * If your feature is intended to only work with MongoDB, you should disable PostgreSQL-specific tests with: - `describe_only_db('mongo')` // will create a `describe` that runs only on mongoDB - `it_only_db('mongo')` // will make a test that only runs on mongo - `it_exclude_dbs(['postgres'])` // will make a test that runs against all DB's but postgres +* Similarly, if your feature is intended to only work with PostgreSQL, you should disable MongoDB-specific tests with: + + - `describe_only_db('postgres')` // will create a `describe` that runs only on postgres + - `it_only_db('postgres')` // will make a test that only runs on postgres + - `it_exclude_dbs(['mongo'])` // will make a test that runs against all DB's but mongo #### Run a Parse Postgres with Docker From 4a8650eb38f66187911aeff2cb36792d1b5b491d Mon Sep 17 00:00:00 2001 From: Corey Date: Fri, 27 Mar 2020 10:08:18 -0400 Subject: [PATCH 100/106] use restart instead of stop/start for postgres --- scripts/before_install_postgres.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/before_install_postgres.sh b/scripts/before_install_postgres.sh index 56dd9c59d8..dc12d660e5 100755 --- a/scripts/before_install_postgres.sh +++ b/scripts/before_install_postgres.sh @@ -30,6 +30,5 @@ if [[ $POSTGRES_MAJOR_VERSION -lt 11 ]]; then else # Setup postgres 11 or higher sudo cp /etc/postgresql/{10,${POSTGRES_MAJOR_VERSION}}/main/pg_hba.conf - sudo systemctl stop postgresql@${POSTGRES_MAJOR_VERSION}-main - sudo systemctl start postgresql@${POSTGRES_MAJOR_VERSION}-main + sudo systemctl restart postgresql@${POSTGRES_MAJOR_VERSION}-main fi From a70e1f9fba7033fa75b6eb1aee6a8a4004e6c117 Mon Sep 17 00:00:00 2001 From: Corey Date: Fri, 27 Mar 2020 10:21:17 -0400 Subject: [PATCH 101/106] removed extra lines to ensure consistency with future builds --- scripts/before_install_postgres.sh | 7 ------- 1 file changed, 7 deletions(-) diff --git a/scripts/before_install_postgres.sh b/scripts/before_install_postgres.sh index dc12d660e5..8c40d9e3d3 100755 --- a/scripts/before_install_postgres.sh +++ b/scripts/before_install_postgres.sh @@ -2,15 +2,8 @@ set -e -source ~/.nvm/nvm.sh - echo "[SCRIPT] Before Install Script :: Setup Postgres ${POSTGRES_MAJOR_VERSION}" -nvm install $NODE_VERSION -nvm use $NODE_VERSION -npm install -g greenkeeper-lockfile@1 - - if [[ $POSTGRES_MAJOR_VERSION -lt 11 ]]; then # Setup postgres 9 or 10 sudo sed -i 's/port = 5432/port = 5433/' /etc/postgresql/${POSTGRES_MAJOR_VERSION}/main/postgresql.conf From 9073081bb2cfea69ee08c33e42366369bc1532ca Mon Sep 17 00:00:00 2001 From: Corey MacBook Pro Date: Sat, 28 Mar 2020 13:10:20 -0400 Subject: [PATCH 102/106] reload instead of restart postgres --- scripts/before_install_postgres.sh | 6 +++++- scripts/before_script_postgres.sh | 2 -- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/before_install_postgres.sh b/scripts/before_install_postgres.sh index 8c40d9e3d3..07cff3c1bd 100755 --- a/scripts/before_install_postgres.sh +++ b/scripts/before_install_postgres.sh @@ -22,6 +22,10 @@ if [[ $POSTGRES_MAJOR_VERSION -lt 11 ]]; then else # Setup postgres 11 or higher + + #Copy defauilt hba config file and tell postgres to reload it sudo cp /etc/postgresql/{10,${POSTGRES_MAJOR_VERSION}}/main/pg_hba.conf - sudo systemctl restart postgresql@${POSTGRES_MAJOR_VERSION}-main + psql -v ON_ERROR_STOP=1 -p 5433 --username "postgres" --dbname "${POSTGRES_DB}" <<-EOSQL + SELECT pg_reload_conf(); +EOSQL fi diff --git a/scripts/before_script_postgres.sh b/scripts/before_script_postgres.sh index 4601ea3f2a..ec67b5142d 100755 --- a/scripts/before_script_postgres.sh +++ b/scripts/before_script_postgres.sh @@ -4,8 +4,6 @@ set -e echo "[SCRIPT] Before Script :: Setup Parse DB for Postgres ${POSTGRES_MAJOR_VERSION}" -node -e 'require("./lib/index.js")' - psql -v ON_ERROR_STOP=1 -p 5433 --username "postgres" --dbname "${POSTGRES_DB}" <<-EOSQL CREATE DATABASE parse_server_postgres_adapter_test_database; \c parse_server_postgres_adapter_test_database; From a03d511fa3db14adb71e23feca837d30a2f65749 Mon Sep 17 00:00:00 2001 From: Corey Date: Sat, 28 Mar 2020 13:16:08 -0400 Subject: [PATCH 103/106] restart postgres since we can't currently connect --- scripts/before_install_postgres.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/scripts/before_install_postgres.sh b/scripts/before_install_postgres.sh index 07cff3c1bd..05485f3d6c 100755 --- a/scripts/before_install_postgres.sh +++ b/scripts/before_install_postgres.sh @@ -23,9 +23,7 @@ if [[ $POSTGRES_MAJOR_VERSION -lt 11 ]]; then else # Setup postgres 11 or higher - #Copy defauilt hba config file and tell postgres to reload it + #Copy defauilt hba config file and tell postgres to restart sudo cp /etc/postgresql/{10,${POSTGRES_MAJOR_VERSION}}/main/pg_hba.conf - psql -v ON_ERROR_STOP=1 -p 5433 --username "postgres" --dbname "${POSTGRES_DB}" <<-EOSQL - SELECT pg_reload_conf(); -EOSQL + sudo systemctl restart postgresql@${POSTGRES_MAJOR_VERSION}-main fi From fc73f17d65ff7e15e7754686549157086d66e51a Mon Sep 17 00:00:00 2001 From: Corey Date: Thu, 2 Apr 2020 22:42:14 -0400 Subject: [PATCH 104/106] Switch to testonly for postgres --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8b89f73cf6..2b847c1816 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -58,7 +58,7 @@ Once you have babel running in watch mode, you can start making changes to parse If your pull request introduces a change that may affect the storage or retrieval of objects, you may want to make sure it plays nice with Postgres. -* Run the tests against the postgres database with `PARSE_SERVER_TEST_DB=postgres PARSE_SERVER_TEST_DATABASE_URI=postgres://postgres:password@localhost:5432/parse_server_postgres_adapter_test_database npm test`. You'll need to have postgres running on your machine and setup [appropriately](https://github.com/parse-community/parse-server/blob/master/.travis.yml#L43) or use [`Docker`](#run-a-parse-postgres-with-docker). +* Run the tests against the postgres database with `PARSE_SERVER_TEST_DB=postgres PARSE_SERVER_TEST_DATABASE_URI=postgres://postgres:password@localhost:5432/parse_server_postgres_adapter_test_database npm testonly`. You'll need to have postgres running on your machine and setup [appropriately](https://github.com/parse-community/parse-server/blob/master/.travis.yml#L43) or use [`Docker`](#run-a-parse-postgres-with-docker). * The Postgres adapter has a special debugger that traces all the sql commands. You can enable it with setting the environment variable `PARSE_SERVER_LOG_LEVEL=debug` * If your feature is intended to only work with MongoDB, you should disable PostgreSQL-specific tests with: From 861f048c351cb239957bd63eab990a2bc8427341 Mon Sep 17 00:00:00 2001 From: Corey Date: Thu, 2 Apr 2020 22:44:41 -0400 Subject: [PATCH 105/106] run testonly --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2b847c1816..d36da0c0ed 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -58,7 +58,7 @@ Once you have babel running in watch mode, you can start making changes to parse If your pull request introduces a change that may affect the storage or retrieval of objects, you may want to make sure it plays nice with Postgres. -* Run the tests against the postgres database with `PARSE_SERVER_TEST_DB=postgres PARSE_SERVER_TEST_DATABASE_URI=postgres://postgres:password@localhost:5432/parse_server_postgres_adapter_test_database npm testonly`. You'll need to have postgres running on your machine and setup [appropriately](https://github.com/parse-community/parse-server/blob/master/.travis.yml#L43) or use [`Docker`](#run-a-parse-postgres-with-docker). +* Run the tests against the postgres database with `PARSE_SERVER_TEST_DB=postgres PARSE_SERVER_TEST_DATABASE_URI=postgres://postgres:password@localhost:5432/parse_server_postgres_adapter_test_database npm run testonly`. You'll need to have postgres running on your machine and setup [appropriately](https://github.com/parse-community/parse-server/blob/master/.travis.yml#L43) or use [`Docker`](#run-a-parse-postgres-with-docker). * The Postgres adapter has a special debugger that traces all the sql commands. You can enable it with setting the environment variable `PARSE_SERVER_LOG_LEVEL=debug` * If your feature is intended to only work with MongoDB, you should disable PostgreSQL-specific tests with: From 8d40f0cc2b91f8255973a0fd17846d99349821fe Mon Sep 17 00:00:00 2001 From: Corey Date: Thu, 2 Apr 2020 23:44:06 -0400 Subject: [PATCH 106/106] Declare as mongo test since it's handed coded to a mongo uri --- spec/GridFSBucketStorageAdapter.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/GridFSBucketStorageAdapter.spec.js b/spec/GridFSBucketStorageAdapter.spec.js index d4b1911b52..58905e552e 100644 --- a/spec/GridFSBucketStorageAdapter.spec.js +++ b/spec/GridFSBucketStorageAdapter.spec.js @@ -14,7 +14,7 @@ async function expectMissingFile(gfsAdapter, name) { } } -describe('GridFSBucket and GridStore interop', () => { +describe_only_db('mongo')('GridFSBucket and GridStore interop', () => { beforeEach(async () => { const gsAdapter = new GridStoreAdapter(databaseURI); const db = await gsAdapter._connect();