Skip to content
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.

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

feat: selectively back-port fixes from master #594

Merged
merged 11 commits into from
Jan 17, 2020
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ node8plus
build-turbo
examples
dist
CHANGELOG.md
3 changes: 2 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ module.exports = {
"plugin:prettier/recommended",
"prettier/@typescript-eslint",
],
plugins: ["jest", "flowtype", "graphql"],
plugins: ["jest", "flowtype", "graphql", "tsdoc"],
env: {
jest: true,
node: true,
Expand Down Expand Up @@ -41,6 +41,7 @@ module.exports = {
"no-await-in-loop": 0,
"jest/no-focused-tests": 2,
"jest/no-identical-title": 2,
"tsdoc/syntax": 2,

// Rules that we should enable:
"@typescript-eslint/no-use-before-define": "warn",
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@ node_modules
/.vscode
*.tgz
yarn-error.log
tsconfig.tsbuildinfo
.env
32 changes: 27 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ language: node_js
node_js:
- "8"
- "10"
- "12"

addons:
postgresql: "9.4"
Expand All @@ -11,8 +12,8 @@ addons:
- postgresql-server-dev-9.4

env:
TEST_DATABASE_URL: postgres://localhost:5432/travis
PGVERSION: 9.4
TEST_DATABASE_URL: postgres://localhost:5432/graphileengine_test

cache: yarn

Expand All @@ -26,6 +27,7 @@ before_script:
- sudo service postgresql restart
- git clone https://github.com/eulerto/wal2json.git
- sudo bash -c "cd wal2json && USE_PGXS=1 make && USE_PGXS=1 make install"
- createdb graphileengine_test

script:
- scripts/ci
Expand All @@ -39,10 +41,30 @@ matrix:
- postgresql-client-10
- postgresql-server-dev-10
postgresql: 10
services:
- postgresql
env:
- PGPORT=5433
- TEST_DATABASE_URL=postgres://travis:travis@localhost:5433/travis
- LDS_TEST_DATABASE_URL=postgres://travis:travis@localhost:5433/lds_test
- PGVERSION=10
- TEST_DATABASE_URL=postgres://localhost:5432/graphileengine_test
- LDS_TEST_DATABASE_URL=postgres://travis:travis@localhost:5432/lds_test
- PGVERSION=10
sudo: false
dist: xenial
- node_js: 12
addons:
apt:
packages:
- postgresql-10
- postgresql-client-10
- postgresql-server-dev-10
postgresql: 10
services:
- postgresql
env:
- PGVERSION=10
- TEST_DATABASE_URL=postgres://localhost:5432/graphileengine_test
- LDS_TEST_DATABASE_URL=postgres://travis:travis@localhost:5432/lds_test
- PGVERSION=10
- GRAPHILE_TURBO=1
sudo: false
dist: trusty
dist: xenial
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
"eslint-plugin-graphql": "^3.0.3",
"eslint-plugin-jest": "^22.5.1",
"eslint-plugin-prettier": "^3.0.1",
"eslint-plugin-tsdoc": "^0.2.0",
"eslint_d": "^8.0.0",
"flow-bin": "^0.106.3",
"flow-copy-source": "^1.2.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/graphile-build-pg/src/QueryBuilder.js
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,7 @@ ${sql.join(
orderBy(
exprGen: SQLGen,
ascending: boolean = true,
nullsFirst: boolean | null
nullsFirst: boolean | null = null
) {
this.checkLock("orderBy");
this.data.orderBy.push([exprGen, ascending, nullsFirst]);
Expand Down