Skip to content

Updating Postgres/Postgis Call and Postgis to 3.0 #6528

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 69 commits into from
Mar 23, 2020
Merged

Updating Postgres/Postgis Call and Postgis to 3.0 #6528

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
841768c
Attempting to fix Postgres issue
cbaker6 Mar 14, 2020
33da65e
Attempting to fix Postgres issue
cbaker6 Mar 14, 2020
43b714d
Attempting to fix Postgres
cbaker6 Mar 14, 2020
8010633
Attempting to fix Postgres issue
cbaker6 Mar 14, 2020
cc2506a
Attempting to fix postgres
cbaker6 Mar 14, 2020
05181a7
Attempting to fix postgres
cbaker6 Mar 14, 2020
1ff769d
Attempting to fix postgres
cbaker6 Mar 14, 2020
fba1b83
Attempting to fix postgres
cbaker6 Mar 14, 2020
edf60e8
Attempting to fix postgres
cbaker6 Mar 14, 2020
c884e5d
Attempting to fix postgres
cbaker6 Mar 14, 2020
e553200
Attempting to fix postgres
cbaker6 Mar 14, 2020
c7b4411
Attempting to fix postgres
cbaker6 Mar 14, 2020
063dd2f
Attempting to fix postgres
cbaker6 Mar 14, 2020
d357a47
Attempting to fix postgres
cbaker6 Mar 14, 2020
b048966
Attempting to fix postgres
cbaker6 Mar 14, 2020
299b91d
Attempting to fix postgres
cbaker6 Mar 14, 2020
6adf026
Attempting to fix postgres
cbaker6 Mar 14, 2020
87e37a1
Attempting to fix postgres
cbaker6 Mar 14, 2020
c20a82e
Attempting to fix postgres
cbaker6 Mar 14, 2020
76a29d0
Attempting to fix postgres
cbaker6 Mar 14, 2020
b90abc4
Update .travis.yml
cbaker6 Mar 14, 2020
5d4019d
Attempting to fix postgres
cbaker6 Mar 14, 2020
028daee
Attempting to fix postgres
cbaker6 Mar 14, 2020
387258c
Attempting to fix postgres
cbaker6 Mar 14, 2020
dc3afa6
Attempting to fix postgres
cbaker6 Mar 14, 2020
06045a5
Attempting to fix postgres
cbaker6 Mar 14, 2020
ebcbbb0
Attempting to fix postgres
cbaker6 Mar 14, 2020
72f72a1
Attempting to fix postgres
cbaker6 Mar 14, 2020
2047e2e
Attempting to fix postgres
cbaker6 Mar 14, 2020
fa10637
Attempting to fix postgres
cbaker6 Mar 14, 2020
0bdc4f4
Temporary fix: separated mongo and postgres in travis
cbaker6 Mar 14, 2020
d60203d
Allowing all postgres to fail
cbaker6 Mar 14, 2020
a7c964b
Allowing multiple names to fail
cbaker6 Mar 14, 2020
d3e795a
Removing preinstalled versions of postgres from list
cbaker6 Mar 15, 2020
b0e224f
Use postgres made for dist
cbaker6 Mar 15, 2020
98d83e9
Second round
cbaker6 Mar 15, 2020
ddd6f4a
Round 3
cbaker6 Mar 15, 2020
efa17ff
Round 4
cbaker6 Mar 15, 2020
6a98945
Round 5
cbaker6 Mar 15, 2020
a3f72b8
Fixed issue with random postgres fail
cbaker6 Mar 15, 2020
5999aff
Added back postgres 11 and 12 to allow_failures
cbaker6 Mar 15, 2020
579124c
added travis scripts for postgres
cbaker6 Mar 17, 2020
38a2b9e
Setting up before_install and before_script
cbaker6 Mar 17, 2020
8b0f875
make scripts executable
cbaker6 Mar 17, 2020
ac3be67
Merge branch 'master' of https://github.com/netreconlab/parse-server
cbaker6 Mar 17, 2020
0052963
Update .travis.yml
cbaker6 Mar 17, 2020
a375604
add sourcing in script
cbaker6 Mar 17, 2020
8d26cbc
trying to fix source
cbaker6 Mar 17, 2020
dfcbe0d
fixing env var in script
cbaker6 Mar 17, 2020
a5aa417
fixed ; near then
cbaker6 Mar 17, 2020
cc91dc4
Cleaning up travis file
cbaker6 Mar 17, 2020
0e33072
Finishing clean up
cbaker6 Mar 17, 2020
773ca67
Fixing allow_failures since "name" was removed
cbaker6 Mar 17, 2020
fe0077c
Update .travis.yml
cbaker6 Mar 17, 2020
559e0a7
Removed Postgres 11 from allow_failures
cbaker6 Mar 17, 2020
2ceff98
I think using travis default postgres port of 5433 will allow us to n…
cbaker6 Mar 17, 2020
57a81cb
Merge branch 'master' of https://github.com/netreconlab/parse-server
cbaker6 Mar 17, 2020
7776457
Switching travis to postgres port 5433
cbaker6 Mar 17, 2020
59a3e8a
modifying script for test
cbaker6 Mar 17, 2020
3a099c1
modifying script for test
cbaker6 Mar 17, 2020
fc2006d
modifying script for test
cbaker6 Mar 17, 2020
4ffee37
reverting back to working way with removing postgres from image
cbaker6 Mar 17, 2020
8d17b04
Reverted back to removing postgres from image
cbaker6 Mar 17, 2020
84b4a64
removing postgres 12
cbaker6 Mar 18, 2020
839d3e6
removed postgres-12 from allow_failures
cbaker6 Mar 19, 2020
c1173cb
updated postgres method from deprecated. Also updating postgis to 3.0
cbaker6 Mar 23, 2020
648ea74
updated postgis to 3.0
cbaker6 Mar 23, 2020
3842083
Merge branch 'master' into master
cbaker6 Mar 23, 2020
6a6c2d4
Update .travis.yml
cbaker6 Mar 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ jobs:
postgresql: '11'
apt:
packages:
- postgresql-11-postgis-2.5
- postgresql-11-postgis-2.5-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
Expand Down
6 changes: 3 additions & 3 deletions src/Adapters/Storage/Postgres/PostgresStorageAdapter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down