github/directus
1
1
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-04-03 03:00:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix compatibility with Postgres <= 10 (#10139)

Browse Source 
* Use indnatts instead of indnkeyatts in postgres dialect

* Update knex-schema-inspector

* Add PG10 for debugging

Co-authored-by: rijkvanzanten <rijkvanzanten@me.com>
This commit is contained in:
Oreille
2021-12-01 21:36:46 +01:00
committed by GitHub
parent fd93b850e0
commit 525e2548b4
6 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/package.json
View File

@@ -122,7 +122,7 @@
"jsonwebtoken": "^8.5.1",
"keyv": "^4.0.3",
"knex": "^0.95.11",
"knex-schema-inspector": "1.6.4",
"knex-schema-inspector": "1.6.6",
"ldapjs": "^2.3.1",
"liquidjs": "^9.25.0",
"lodash": "^4.17.21",

8
docker-compose.yml
View File

@@ -141,3 +141,11 @@ services:
ports:
- 5110:8080
postgres10:
image: postgis/postgis:10-3.1-alpine
environment:
POSTGRES_PASSWORD: secret
POSTGRES_DB: directus
ports:
- 5111:5432

21
package-lock.json generated
View File

@@ -109,7 +109,7 @@
"jsonwebtoken": "^8.5.1",
"keyv": "^4.0.3",
"knex": "^0.95.11",
"knex-schema-inspector": "1.6.4",
"knex-schema-inspector": "1.6.6",
"ldapjs": "^2.3.1",
"liquidjs": "^9.25.0",
"lodash": "^4.17.21",
@@ -26767,8 +26767,9 @@
}
},
"node_modules/knex-schema-inspector": {
"version": "1.6.4",
"license": "MIT",
"version": "1.6.6",
"resolved": "https://registry.npmjs.org/knex-schema-inspector/-/knex-schema-inspector-1.6.6.tgz",
"integrity": "sha512-tiG35ttP0g/EwXTb2+vSRYK3++7eetaaojauIHjXwocdQqsRNNhEfouCMdmE+WcaMmM7dm+sJhYD5QHh2lVmxA==",
"dependencies": {
"lodash.flatten": "^4.4.0",
"lodash.isnil": "^4.0.0"
@@ -45559,7 +45560,7 @@
"version": "9.1.2",
"license": "GPL-3.0",
"dependencies": {
"knex-schema-inspector": "1.6.4",
"knex-schema-inspector": "^1.6.6",
"lodash": "^4.17.21"
},
"devDependencies": {
@@ -45607,7 +45608,7 @@
"geojson": "*",
"joi": "17.4.2",
"knex": "*",
"knex-schema-inspector": "*",
"knex-schema-inspector": "^1.6.6",
"lodash": "4.17.21",
"pino": "*",
"vue": "3",
@@ -48367,7 +48368,7 @@
"@directus/schema": {
"version": "file:packages/schema",
"requires": {
"knex-schema-inspector": "1.6.4",
"knex-schema-inspector": "1.6.6",
"lodash": "^4.17.21",
"npm-watch": "0.11.0",
"typescript": "4.5.2"
@@ -48408,7 +48409,7 @@
"geojson": "*",
"joi": "17.4.2",
"knex": "*",
"knex-schema-inspector": "*",
"knex-schema-inspector": "1.6.6",
"lodash": "4.17.21",
"npm-run-all": "4.1.5",
"pino": "*",
@@ -58218,7 +58219,7 @@
"keyv": "^4.0.3",
"keyv-memcache": "^1.2.5",
"knex": "^0.95.11",
"knex-schema-inspector": "1.6.4",
"knex-schema-inspector": "1.6.6",
"ldapjs": "^2.3.1",
"liquidjs": "^9.25.0",
"lodash": "^4.17.21",
@@ -64554,7 +64555,9 @@
}
},
"knex-schema-inspector": {
"version": "1.6.4",
"version": "1.6.6",
"resolved": "https://registry.npmjs.org/knex-schema-inspector/-/knex-schema-inspector-1.6.6.tgz",
"integrity": "sha512-tiG35ttP0g/EwXTb2+vSRYK3++7eetaaojauIHjXwocdQqsRNNhEfouCMdmE+WcaMmM7dm+sJhYD5QHh2lVmxA==",
"requires": {
"lodash.flatten": "^4.4.0",
"lodash.isnil": "^4.0.0"

2
packages/schema/package.json
View File

@@ -46,7 +46,7 @@
"typescript": "4.5.2"
},
"dependencies": {
"knex-schema-inspector": "1.6.4",
"knex-schema-inspector": "^1.6.6",
"lodash": "^4.17.21"
},
"gitHead": "24621f3934dc77eb23441331040ed13c676ceffd"

2
packages/schema/src/dialects/postgres.ts
View File

@@ -61,7 +61,7 @@ export default class Postgres extends KnexPostgres implements SchemaInspector {
AND pg_attribute.attrelid = pg_class.oid
AND pg_attribute.attnum = ANY (pg_index.indkey)
AND indisprimary
AND indnkeyatts = 1
AND indnatts = 1
`,
[this.explodedSchema.join(',')]
),

2
packages/shared/package.json
View File

@@ -56,7 +56,7 @@
"geojson": "*",
"joi": "17.4.2",
"knex": "*",
"knex-schema-inspector": "*",
"knex-schema-inspector": "^1.6.6",
"lodash": "4.17.21",
"pino": "*",
"vue": "3",