From 841768c3012e95728bb6b2f0a012863df3d16ee6 Mon Sep 17 00:00:00 2001 From: Corey Date: Fri, 13 Mar 2020 23:34:57 -0400 Subject: [PATCH 01/66] 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 02/66] 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 03/66] 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 04/66] 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 05/66] 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 06/66] 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 07/66] 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 08/66] 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 09/66] 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 10/66] 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 11/66] 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 12/66] 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 13/66] 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 14/66] 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 15/66] 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 16/66] 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 17/66] 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 18/66] 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 19/66] 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 20/66] 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 21/66] 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 22/66] 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 23/66] 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 24/66] 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 25/66] 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 26/66] 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 27/66] 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 28/66] 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 29/66] 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 30/66] 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 31/66] 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 32/66] 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 33/66] 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 34/66] 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 35/66] 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 36/66] 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 37/66] 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 38/66] 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 39/66] 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 40/66] 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 41/66] 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 42/66] 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 43/66] 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 44/66] 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 45/66] 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 46/66] 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 47/66] 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 48/66] 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 49/66] 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 50/66] 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 51/66] 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 52/66] 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 53/66] 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 54/66] 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 55/66] 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 56/66] 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 57/66] 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 58/66] 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 59/66] 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 60/66] 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 61/66] 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 62/66] 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 63/66] 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 64/66] 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 65/66] 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 66/66] 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