Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-02-03 23:00:14 -05:00
Code Issues Activity

Updated @tryghost/bookshelf-plugins & @nexes/nql (#13212)

Browse source 
refs https://github.com/TryGhost/Team/issues/944

This updates both libraries to include support for custom foreign keys
on relations, as well as relations with a "virtual" table, defined by a
query.

This will allow us to filter members based on aggregates of their
events, as well as on properties of their stripe subscriptions which are
linked not by the `id` column but by thir external stripe id, e.g. `customer_id`.
This commit is contained in:
Fabien 'egg' O'Carroll 2021-08-04 17:01:23 +01:00 • committed by GitHub
parent 424f621414
commit 758497839b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
package.json
View file

@ -48,11 +48,11 @@
"cli": "^1.17.0" "cli": "^1.17.0"
}, },
"dependencies": { "dependencies": {
"@nexes/nql": "0.5.2", "@nexes/nql": "0.6.0",
"@sentry/node": "6.10.0", "@sentry/node": "6.10.0",
"@tryghost/adapter-manager": "0.2.14", "@tryghost/adapter-manager": "0.2.14",
"@tryghost/admin-api-schema": "2.5.0", "@tryghost/admin-api-schema": "2.5.0",
"@tryghost/bookshelf-plugins": "0.2.0", "@tryghost/bookshelf-plugins": "0.3.0",
"@tryghost/bootstrap-socket": "0.2.9", "@tryghost/bootstrap-socket": "0.2.9",
"@tryghost/color-utils": "^0.1.0", "@tryghost/color-utils": "^0.1.0",
"@tryghost/config-url-helpers": "0.1.0", "@tryghost/config-url-helpers": "0.1.0",

38
yarn.lock
View file

@ -316,10 +316,10 @@
url-regex-safe "~2.0.2" url-regex-safe "~2.0.2"
video-extensions "~1.2.0" video-extensions "~1.2.0"
"@nexes/mongo-knex@^0.4.1": "@nexes/mongo-knex@0.5.0":
version "0.4.1" version "0.5.0"
resolved "https://registry.yarnpkg.com/@nexes/mongo-knex/-/mongo-knex-0.4.1.tgz#3eb07e9ac176f525704e56e4cc7522dd26ea7552" resolved "https://registry.yarnpkg.com/@nexes/mongo-knex/-/mongo-knex-0.5.0.tgz#58566614ca240bdf84a270117d72b46511b17743"
integrity sha512-WjkizmhtJRLXQ4LFDMpyYhBjd1UgRX5iSznD1XvPeB5/HsRDptBD3nBMld+oWw7lgVz4UUjpT23wFClSKfLF9A== integrity sha512-6wiTbJpy7I2xsxuvwavuwDEtJfoiaxAy4PGPFEiVziQyH3SjOFbwyqnlrKPvhNHCj2YFQHcE8rnJ3JawJVtXOA==
dependencies: dependencies:
debug "^4.3.1" debug "^4.3.1"
lodash "^4.17.21" lodash "^4.17.21"
@ -336,12 +336,12 @@
resolved "https://registry.yarnpkg.com/@nexes/nql-lang/-/nql-lang-0.0.1.tgz#a13c023873f9bc11b9e4e284449c6cfbeccc8011" resolved "https://registry.yarnpkg.com/@nexes/nql-lang/-/nql-lang-0.0.1.tgz#a13c023873f9bc11b9e4e284449c6cfbeccc8011"
integrity sha1-oTwCOHP5vBG55OKERJxs++zMgBE= integrity sha1-oTwCOHP5vBG55OKERJxs++zMgBE=
"@nexes/nql@0.5.2", "@nexes/nql@^0.5.2": "@nexes/nql@0.6.0":
version "0.5.2" version "0.6.0"
resolved "https://registry.yarnpkg.com/@nexes/nql/-/nql-0.5.2.tgz#64d847d563720d9c3a0f9683dde930fee518e064" resolved "https://registry.yarnpkg.com/@nexes/nql/-/nql-0.6.0.tgz#aec2d36d0ff5300b79e950a37f8c29b195f8152b"
integrity sha512-qGLwtpYkKoHI++b+zgsEHuISDUv7LC1PI/0bWd6X9bOz2zGj1nJUDFJHjwdOuLmV5q6BR60VDBKw51Mvzqkl2g== integrity sha512-iI5fQPVfBAX9iM6P3S35XQhp7z7OS+7Ju7GMJGPxouBSDOkppNKh3zc4QGnrt9oMwbUN4hkZ2dsMwLs9VLmDAQ==
dependencies: dependencies:
"@nexes/mongo-knex" "^0.4.1" "@nexes/mongo-knex" "0.5.0"
"@nexes/mongo-utils" "^0.3.1" "@nexes/mongo-utils" "^0.3.1"
"@nexes/nql-lang" "^0.0.1" "@nexes/nql-lang" "^0.0.1"
mingo "^2.2.2" mingo "^2.2.2"
@ -560,12 +560,12 @@
"@tryghost/debug" "^0.1.4" "@tryghost/debug" "^0.1.4"
lodash "^4.17.21" lodash "^4.17.21"
"@tryghost/bookshelf-filter@^0.2.0": "@tryghost/bookshelf-filter@^0.3.0":
version "0.2.0" version "0.3.0"
resolved "https://registry.yarnpkg.com/@tryghost/bookshelf-filter/-/bookshelf-filter-0.2.0.tgz#c8871504b691c37fae05324110789588c4ee6b8e" resolved "https://registry.yarnpkg.com/@tryghost/bookshelf-filter/-/bookshelf-filter-0.3.0.tgz#2e703f2dda7196bbfad407456d266295c5209b08"
integrity sha512-4q5DPoCXCD1BzkkBeRhkDIwyNHZF0yMaujEdsRD0Ug3Leh8jixgXiOUY3gVyPFwvVOsZFo7/Xz7cXopWX8rN5w== integrity sha512-PGNSUefvOwLcVMVQROY8c/AxgFNoajDS/JUnLaRZC92nE2RV+4Wu1CdqVmZtz5CfJbY9iTGj7DmzH8lNC9t8zw==
dependencies: dependencies:
"@nexes/nql" "^0.5.2" "@nexes/nql" "0.6.0"
"@tryghost/debug" "^0.1.4" "@tryghost/debug" "^0.1.4"
"@tryghost/errors" "^0.2.12" "@tryghost/errors" "^0.2.12"
"@tryghost/tpl" "^0.1.1" "@tryghost/tpl" "^0.1.1"
@ -602,15 +602,15 @@
"@tryghost/tpl" "^0.1.1" "@tryghost/tpl" "^0.1.1"
lodash "^4.17.21" lodash "^4.17.21"
"@tryghost/bookshelf-plugins@0.2.0": "@tryghost/bookshelf-plugins@0.3.0":
version "0.2.0" version "0.3.0"
resolved "https://registry.yarnpkg.com/@tryghost/bookshelf-plugins/-/bookshelf-plugins-0.2.0.tgz#53a558b4692006fb2e3905b4ab46c285230dce2b" resolved "https://registry.yarnpkg.com/@tryghost/bookshelf-plugins/-/bookshelf-plugins-0.3.0.tgz#c2e6d96ff11bd411333b585364626e6969ca39c3"
integrity sha512-/1TiDxCJYZDvZSGI9jNXeUVm9fg6viTl3QT6t7uHt0Q40bDHAh6AJl2Lk/NMvoYMAgktC/5nbHVeySCuFZuimw== integrity sha512-JhUGDMOMtvftNb56+7SnuE181372nXTkt7fgmMSvEVhOYG36a9QHa7yrDC9y/QqppUI39ob9yRuzXFShPRgFbQ==
dependencies: dependencies:
"@tryghost/bookshelf-collision" "^0.1.3" "@tryghost/bookshelf-collision" "^0.1.3"
"@tryghost/bookshelf-custom-query" "^0.1.3" "@tryghost/bookshelf-custom-query" "^0.1.3"
"@tryghost/bookshelf-eager-load" "^0.1.4" "@tryghost/bookshelf-eager-load" "^0.1.4"
"@tryghost/bookshelf-filter" "^0.2.0" "@tryghost/bookshelf-filter" "^0.3.0"
"@tryghost/bookshelf-has-posts" "^0.1.5" "@tryghost/bookshelf-has-posts" "^0.1.5"
"@tryghost/bookshelf-include-count" "^0.1.4" "@tryghost/bookshelf-include-count" "^0.1.4"
"@tryghost/bookshelf-order" "^0.1.3" "@tryghost/bookshelf-order" "^0.1.3"