objection
Advanced tools
Comparing version 2.1.3 to 2.1.4
@@ -303,2 +303,6 @@ 'use strict'; | ||
clearGroup(...args) { | ||
return this.addOperation(new KnexOperation('clearGroup'), args); | ||
} | ||
orHaving(...args) { | ||
@@ -305,0 +309,0 @@ return this.addOperation(new KnexOperation('orHaving'), args); |
{ | ||
"name": "objection", | ||
"version": "2.1.3", | ||
"version": "2.1.4", | ||
"description": "An SQL-friendly ORM for Node.js", | ||
@@ -64,3 +64,3 @@ "main": "lib/objection.js", | ||
"dependencies": { | ||
"ajv": "^6.10.2", | ||
"ajv": "^6.12.0", | ||
"db-errors": "^0.2.3" | ||
@@ -75,6 +75,6 @@ }, | ||
"chai-subset": "^1.6.0", | ||
"coveralls": "^3.0.8", | ||
"coveralls": "^3.0.9", | ||
"cross-env": "^6.0.3", | ||
"eslint": "^6.7.0", | ||
"eslint-plugin-prettier": "^3.1.1", | ||
"eslint": "^6.8.0", | ||
"eslint-plugin-prettier": "^3.1.2", | ||
"expect.js": "^0.3.1", | ||
@@ -84,11 +84,11 @@ "fs-extra": "^8.1.0", | ||
"husky": "^3.1.0", | ||
"knex": "0.20.4", | ||
"knex": "0.21.1", | ||
"lint-staged": "^9.4.3", | ||
"mocha": "^6.2.2", | ||
"mysql": "^2.17.1", | ||
"mysql": "^2.18.1", | ||
"nyc": "^14.1.1", | ||
"pg": "^7.14.0", | ||
"pg": "^7.18.2", | ||
"prettier": "1.19.1", | ||
"sqlite3": "^4.1.0", | ||
"typescript": "^3.7.4", | ||
"sqlite3": "^4.1.1", | ||
"typescript": "^3.9.2", | ||
"vuepress": "1.2.0" | ||
@@ -95,0 +95,0 @@ }, |
@@ -47,5 +47,5 @@ [![Build Status](https://travis-ci.org/Vincit/objection.js.svg?branch=master)](https://travis-ci.org/Vincit/objection.js) [![Coverage Status](https://coveralls.io/repos/github/Vincit/objection.js/badge.svg?branch=master&service=github)](https://coveralls.io/github/Vincit/objection.js?branch=master) [![Join the chat at https://gitter.im/Vincit/objection.js](https://badges.gitter.im/Vincit/objection.js.svg)](https://gitter.im/Vincit/objection.js?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) | ||
- [Example projects](https://github.com/Vincit/objection.js/tree/master/examples) | ||
- [Changelog](https://vincit.github.io/objection.js/changelog/) | ||
- [v1 -> v2 migration guide](https://vincit.github.io/objection.js/1.x/migration.html) | ||
- [Changelog](https://vincit.github.io/objection.js/release-notes/changelog.html) | ||
- [v1 -> v2 migration guide](https://vincit.github.io/objection.js/release-notes/migration.html) | ||
- [Contribution guide](https://vincit.github.io/objection.js/guide/contributing.html) | ||
- [Plugins](https://vincit.github.io/objection.js/guide/plugins.html) |
@@ -291,3 +291,3 @@ /// <reference types="node" /> | ||
*/ | ||
type QueryBuilderType<M extends Model> = M['QueryBuilderType']; | ||
type QueryBuilderType<T extends { QueryBuilderType: any }> = T['QueryBuilderType']; | ||
@@ -297,3 +297,3 @@ /** | ||
*/ | ||
type ModelType<QB extends AnyQueryBuilder> = QB['ModelType']; | ||
type ModelType<T extends { ModelType: any }> = T['ModelType']; | ||
@@ -303,3 +303,3 @@ /** | ||
*/ | ||
type ResultType<QB extends AnyQueryBuilder> = QB['ResultType']; | ||
type ResultType<T extends { ResultType: any }> = T['ResultType']; | ||
@@ -309,3 +309,3 @@ /** | ||
*/ | ||
type SingleQueryBuilder<QB extends AnyQueryBuilder> = QB['SingleQueryBuilderType']; | ||
type SingleQueryBuilder<T extends { SingleQueryBuilderType: any }> = T['SingleQueryBuilderType']; | ||
@@ -315,3 +315,3 @@ /** | ||
*/ | ||
type ArrayQueryBuilder<QB extends AnyQueryBuilder> = QB['ArrayQueryBuilderType']; | ||
type ArrayQueryBuilder<T extends { ArrayQueryBuilderType: any }> = T['ArrayQueryBuilderType']; | ||
@@ -321,3 +321,3 @@ /** | ||
*/ | ||
type NumberQueryBuilder<QB extends AnyQueryBuilder> = QB['NumberQueryBuilderType']; | ||
type NumberQueryBuilder<T extends { NumberQueryBuilderType: any }> = T['NumberQueryBuilderType']; | ||
@@ -327,3 +327,3 @@ /** | ||
*/ | ||
type PageQueryBuilder<QB extends AnyQueryBuilder> = QB['PageQueryBuilderType']; | ||
type PageQueryBuilder<T extends { PageQueryBuilderType: any }> = T['PageQueryBuilderType']; | ||
@@ -912,2 +912,3 @@ interface ForClassMethod { | ||
with: WithMethod<this>; | ||
withRecursive: WithMethod<this>; | ||
withWrapped: WithMethod<this>; | ||
@@ -914,0 +915,0 @@ |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
638766
19834
Updatedajv@^6.12.0