From a607abb806ad01595a557300e22146524f73f1f2 Mon Sep 17 00:00:00 2001 From: Harminder virk Date: Tue, 7 Jan 2020 20:39:32 +0530 Subject: [PATCH] refactor(model): update column decorator properties name and behavior serialize now accepts a function. primary is renamed to isPrimary serializeAs = null, prevents the column from being serialized --- ROADMAP.md | 3 +- adonis-typings/model.ts | 12 +- adonis-typings/relations.ts | 2 +- src/Orm/BaseModel/index.ts | 54 +++-- test/orm/adapter.spec.ts | 18 +- test/orm/base-model-options.spec.ts | 112 ++++----- test/orm/base-model.spec.ts | 125 +++++----- test/orm/model-belongs-to.spec.ts | 68 +++--- test/orm/model-has-many-through.spec.ts | 88 +++---- test/orm/model-has-many.spec.ts | 118 +++++----- test/orm/model-has-one.spec.ts | 116 ++++----- test/orm/model-many-to-many.spec.ts | 298 ++++++++++++------------ test/orm/model-query-builder.spec.ts | 20 +- 13 files changed, 538 insertions(+), 496 deletions(-) diff --git a/ROADMAP.md b/ROADMAP.md index e05aef0d..6c857a79 100644 --- a/ROADMAP.md +++ b/ROADMAP.md @@ -6,9 +6,8 @@ The document contains the list of features that must be completed before the alp - [ ] Complete `ManyToMany.sync` method. - [ ] Implement `fetchOrCreateMany`, `updateOrCreateMany`, `firstOrCreate` and `updateOrCreate` for all relationships. -- [ ] Add support for default value for `@columns`. - [ ] Related models aggregrates query. -- [ ] Support for casting columns using a custom function. Both on column and model level. +- [x] Support for serializing columns using a custom function. Both on column and model level. ## Final Release targeting `@adonisjs/core v5` diff --git a/adonis-typings/model.ts b/adonis-typings/model.ts index 58946732..b9560d60 100644 --- a/adonis-typings/model.ts +++ b/adonis-typings/model.ts @@ -81,24 +81,26 @@ declare module '@ioc:Adonis/Lucid/Model' { */ export type ColumnOptions = { castAs: string, - serializeAs: string, - serialize: boolean, - primary: boolean, + serializeAs: string | null, + isPrimary: boolean, hasGetter: boolean, hasSetter: boolean, + serialize?: (value: any, attribute: string, model: ModelContract) => any, } /** * Represents a computed property on the model */ export type ComputedOptions = { - serializeAs: string, + serializeAs: string | null, } /** * Signature for decorator functions */ - export type ColumnDecorator = (options?: Partial) => (target, property) => void + export type ColumnDecorator = ( + options?: Partial>, + ) => (target, property) => void export type ComputedDecorator = (options?: Partial) => (target, property) => void /** diff --git a/adonis-typings/relations.ts b/adonis-typings/relations.ts index 42802f53..f85a7ab0 100644 --- a/adonis-typings/relations.ts +++ b/adonis-typings/relations.ts @@ -34,7 +34,7 @@ declare module '@ioc:Adonis/Lucid/Relations' { relatedModel: (() => ModelConstructorContract), localKey?: string, foreignKey?: string, - serializeAs?: string, + serializeAs?: string | null, } /** diff --git a/src/Orm/BaseModel/index.ts b/src/Orm/BaseModel/index.ts index c8856e4c..0d79b1b2 100644 --- a/src/Orm/BaseModel/index.ts +++ b/src/Orm/BaseModel/index.ts @@ -249,20 +249,20 @@ export class BaseModel implements ModelContract { const descriptor = Object.getOwnPropertyDescriptor(this.prototype, name) const column: ColumnOptions = { - primary: options.primary || false, + isPrimary: options.isPrimary || false, castAs: options.castAs || this.$configurator.getCastAsKey(this, name), hasGetter: !!(descriptor && descriptor.get), hasSetter: !!(descriptor && descriptor.set), - serializeAs: options.serializeAs || this.$configurator.getSerializeAsKey(this, name), - serialize: (options.serialize === undefined || options.serialize === null) - ? this.$configurator.serialize(this, name) - : options.serialize, + serializeAs: options.serializeAs !== undefined + ? options.serializeAs + : this.$configurator.getSerializeAsKey(this, name), + serialize: options.serialize, } /** * Set column as the primary column, when `primary` is to true */ - if (column.primary) { + if (column.isPrimary) { this.$primaryKey = name } @@ -1221,30 +1221,50 @@ export class BaseModel implements ModelContract { * Converting model to it's JSON representation */ public serialize () { - const Model = this.constructor as typeof BaseModel + const Model = this.constructor as ModelConstructorContract const results = {} + /** + * Serializing attributes + */ Object.keys(this.$attributes).forEach((key) => { const column = Model.$getColumn(key)! - if (column.serialize) { - results[column.serializeAs] = this.$attributes[key] + if (!column.serializeAs) { + return + } + + const value = this[key] + results[column.serializeAs] = typeof (column.serialize) === 'function' + ? column.serialize(value, key, this) + : value + }) + + /** + * Serializing relationships + */ + Object.keys(this.$preloaded).forEach((key) => { + const relation = Model.$getRelation(key as any)! as RelationshipsContract + if (!relation.$serializeAs) { + return } + + const value = this.$preloaded[key] + results[relation.$serializeAs] = Array.isArray(value) + ? value.map((one) => one.toJSON()) + : value.toJSON() }) + /** + * Serializing computed properties as last. This gives the option to re-write + * keys which are defined as attributes or relations. + */ Model.$computed.forEach((value, key) => { const computedValue = this[key] - if (computedValue !== undefined) { + if (computedValue !== undefined && value.serializeAs) { results[value.serializeAs] = computedValue } }) - Object.keys(this.$preloaded).forEach((key) => { - const relationValue = this.$preloaded[key] - results[Model.$getRelation(key)!.$serializeAs] = Array.isArray(relationValue) - ? relationValue.map((one) => one.toJSON()) - : relationValue.toJSON() - }) - return results } diff --git a/test/orm/adapter.spec.ts b/test/orm/adapter.spec.ts index b8348dbf..af39ff44 100644 --- a/test/orm/adapter.spec.ts +++ b/test/orm/adapter.spec.ts @@ -36,7 +36,7 @@ test.group('Adapter', (group) => { class User extends BaseModel { public static $table = 'users' - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -59,7 +59,7 @@ test.group('Adapter', (group) => { class User extends BaseModel { public static $table = 'users' - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -87,7 +87,7 @@ test.group('Adapter', (group) => { class User extends BaseModel { public static $table = 'users' - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -115,7 +115,7 @@ test.group('Adapter', (group) => { class User extends BaseModel { public static $table = 'users' - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -144,7 +144,7 @@ test.group('Adapter', (group) => { class User extends BaseModel { public static $table = 'users' - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -174,7 +174,7 @@ test.group('Adapter', (group) => { class User extends BaseModel { public static $table = 'users' - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -204,7 +204,7 @@ test.group('Adapter', (group) => { class User extends BaseModel { public static $table = 'users' - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -229,7 +229,7 @@ test.group('Adapter', (group) => { class User extends BaseModel { public static $table = 'users' - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -261,7 +261,7 @@ test.group('Adapter', (group) => { class User extends BaseModel { public static $table = 'users' - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() diff --git a/test/orm/base-model-options.spec.ts b/test/orm/base-model-options.spec.ts index 27805f97..be692591 100644 --- a/test/orm/base-model-options.spec.ts +++ b/test/orm/base-model-options.spec.ts @@ -39,7 +39,7 @@ test.group('Model options | QueryBuilder', (group) => { class User extends BaseModel { public static $table = 'users' - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -59,7 +59,7 @@ test.group('Model options | QueryBuilder', (group) => { class User extends BaseModel { public static $table = 'users' - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -78,7 +78,7 @@ test.group('Model options | QueryBuilder', (group) => { class User extends BaseModel { public static $table = 'users' - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -104,7 +104,7 @@ test.group('Model options | QueryBuilder', (group) => { class User extends BaseModel { public static $table = 'users' - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -147,7 +147,7 @@ test.group('Model options | Adapter', (group) => { class User extends BaseModel { public static $table = 'users' - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -165,7 +165,7 @@ test.group('Model options | Adapter', (group) => { class User extends BaseModel { public static $table = 'users' - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -184,7 +184,7 @@ test.group('Model options | Adapter', (group) => { class User extends BaseModel { public static $table = 'users' - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -203,7 +203,7 @@ test.group('Model options | Adapter', (group) => { class User extends BaseModel { public static $table = 'users' - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -240,7 +240,7 @@ test.group('Model options | Model.find', (group) => { class User extends BaseModel { public static $table = 'users' - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -258,7 +258,7 @@ test.group('Model options | Model.find', (group) => { class User extends BaseModel { public static $table = 'users' - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -276,7 +276,7 @@ test.group('Model options | Model.find', (group) => { class User extends BaseModel { public static $table = 'users' - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -312,7 +312,7 @@ test.group('Model options | Model.findOrFail', (group) => { class User extends BaseModel { public static $table = 'users' - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -330,7 +330,7 @@ test.group('Model options | Model.findOrFail', (group) => { class User extends BaseModel { public static $table = 'users' - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -349,7 +349,7 @@ test.group('Model options | Model.findOrFail', (group) => { class User extends BaseModel { public static $table = 'users' - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -385,7 +385,7 @@ test.group('Model options | Model.findMany', (group) => { class User extends BaseModel { public static $table = 'users' - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -403,7 +403,7 @@ test.group('Model options | Model.findMany', (group) => { class User extends BaseModel { public static $table = 'users' - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -421,7 +421,7 @@ test.group('Model options | Model.findMany', (group) => { class User extends BaseModel { public static $table = 'users' - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -457,7 +457,7 @@ test.group('Model options | Model.firstOrCreate', (group) => { class User extends BaseModel { public static $table = 'users' - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -478,7 +478,7 @@ test.group('Model options | Model.firstOrCreate', (group) => { class User extends BaseModel { public static $table = 'users' - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -499,7 +499,7 @@ test.group('Model options | Model.firstOrCreate', (group) => { class User extends BaseModel { public static $table = 'users' - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -521,7 +521,7 @@ test.group('Model options | Model.firstOrCreate', (group) => { class User extends BaseModel { public static $table = 'users' - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -542,7 +542,7 @@ test.group('Model options | Model.firstOrCreate', (group) => { class User extends BaseModel { public static $table = 'users' - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -564,7 +564,7 @@ test.group('Model options | Model.firstOrCreate', (group) => { class User extends BaseModel { public static $table = 'users' - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -586,7 +586,7 @@ test.group('Model options | Model.firstOrCreate', (group) => { class User extends BaseModel { public static $table = 'users' - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -610,7 +610,7 @@ test.group('Model options | Model.firstOrCreate', (group) => { class User extends BaseModel { public static $table = 'users' - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -650,7 +650,7 @@ test.group('Model options | Model.fetchOrCreateMany', (group) => { class User extends BaseModel { public static $table = 'users' - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -676,7 +676,7 @@ test.group('Model options | Model.fetchOrCreateMany', (group) => { class User extends BaseModel { public static $table = 'users' - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -700,7 +700,7 @@ test.group('Model options | Model.fetchOrCreateMany', (group) => { class User extends BaseModel { public static $table = 'users' - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -727,7 +727,7 @@ test.group('Model options | Model.fetchOrCreateMany', (group) => { class User extends BaseModel { public static $table = 'users' - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -752,7 +752,7 @@ test.group('Model options | Model.fetchOrCreateMany', (group) => { class User extends BaseModel { public static $table = 'users' - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -779,7 +779,7 @@ test.group('Model options | Model.fetchOrCreateMany', (group) => { class User extends BaseModel { public static $table = 'users' - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -807,7 +807,7 @@ test.group('Model options | Model.fetchOrCreateMany', (group) => { class User extends BaseModel { public static $table = 'users' - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -840,7 +840,7 @@ test.group('Model options | Model.fetchOrCreateMany', (group) => { class User extends BaseModel { public static $table = 'users' - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -873,7 +873,7 @@ test.group('Model options | Model.fetchOrCreateMany', (group) => { class User extends BaseModel { public static $table = 'users' - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -919,7 +919,7 @@ test.group('Model options | Model.fetchOrCreateMany', (group) => { // test('pass query options to preloaded models', async (assert) => { // class Profile extends BaseModel { -// @column({ primary: true }) +// @column({ isPrimary: true }) // public id: number // @column() @@ -930,7 +930,7 @@ test.group('Model options | Model.fetchOrCreateMany', (group) => { // } // class User extends BaseModel { -// @column({ primary: true }) +// @column({ isPrimary: true }) // public id: number // @column() @@ -955,7 +955,7 @@ test.group('Model options | Model.fetchOrCreateMany', (group) => { // test('use transaction client to execute preload queries', async (assert) => { // class Profile extends BaseModel { -// @column({ primary: true }) +// @column({ isPrimary: true }) // public id: number // @column() @@ -966,7 +966,7 @@ test.group('Model options | Model.fetchOrCreateMany', (group) => { // } // class User extends BaseModel { -// @column({ primary: true }) +// @column({ isPrimary: true }) // public id: number // @column() @@ -994,7 +994,7 @@ test.group('Model options | Model.fetchOrCreateMany', (group) => { // test('pass profiler to preload models', async (assert) => { // class Profile extends BaseModel { -// @column({ primary: true }) +// @column({ isPrimary: true }) // public id: number // @column() @@ -1005,7 +1005,7 @@ test.group('Model options | Model.fetchOrCreateMany', (group) => { // } // class User extends BaseModel { -// @column({ primary: true }) +// @column({ isPrimary: true }) // public id: number // @column() @@ -1032,7 +1032,7 @@ test.group('Model options | Model.fetchOrCreateMany', (group) => { // test('pass sideloaded data to preloads', async (assert) => { // class Profile extends BaseModel { -// @column({ primary: true }) +// @column({ isPrimary: true }) // public id: number // @column() @@ -1043,7 +1043,7 @@ test.group('Model options | Model.fetchOrCreateMany', (group) => { // } // class User extends BaseModel { -// @column({ primary: true }) +// @column({ isPrimary: true }) // public id: number // @column() @@ -1067,7 +1067,7 @@ test.group('Model options | Model.fetchOrCreateMany', (group) => { // test('custom sideloaded data on preload query must win', async (assert) => { // class Profile extends BaseModel { -// @column({ primary: true }) +// @column({ isPrimary: true }) // public id: number // @column() @@ -1078,7 +1078,7 @@ test.group('Model options | Model.fetchOrCreateMany', (group) => { // } // class User extends BaseModel { -// @column({ primary: true }) +// @column({ isPrimary: true }) // public id: number // @column() @@ -1104,7 +1104,7 @@ test.group('Model options | Model.fetchOrCreateMany', (group) => { // test('use transaction client to update preloaded rows', async (assert) => { // class Profile extends BaseModel { -// @column({ primary: true }) +// @column({ isPrimary: true }) // public id: number // @column() @@ -1115,7 +1115,7 @@ test.group('Model options | Model.fetchOrCreateMany', (group) => { // } // class User extends BaseModel { -// @column({ primary: true }) +// @column({ isPrimary: true }) // public id: number // @column() @@ -1145,7 +1145,7 @@ test.group('Model options | Model.fetchOrCreateMany', (group) => { // test('cleanup transaction reference after commit or rollback', async (assert) => { // class Profile extends BaseModel { -// @column({ primary: true }) +// @column({ isPrimary: true }) // public id: number // @column() @@ -1156,7 +1156,7 @@ test.group('Model options | Model.fetchOrCreateMany', (group) => { // } // class User extends BaseModel { -// @column({ primary: true }) +// @column({ isPrimary: true }) // public id: number // @column() @@ -1205,7 +1205,7 @@ test.group('Model options | Model.fetchOrCreateMany', (group) => { // test('pass query options to preloaded models', async (assert) => { // class Profile extends BaseModel { -// @column({ primary: true }) +// @column({ isPrimary: true }) // public id: number // @column() @@ -1216,7 +1216,7 @@ test.group('Model options | Model.fetchOrCreateMany', (group) => { // } // class User extends BaseModel { -// @column({ primary: true }) +// @column({ isPrimary: true }) // public id: number // @column() @@ -1240,7 +1240,7 @@ test.group('Model options | Model.fetchOrCreateMany', (group) => { // test('pass profiler to preload models', async (assert) => { // class Profile extends BaseModel { -// @column({ primary: true }) +// @column({ isPrimary: true }) // public id: number // @column() @@ -1251,7 +1251,7 @@ test.group('Model options | Model.fetchOrCreateMany', (group) => { // } // class User extends BaseModel { -// @column({ primary: true }) +// @column({ isPrimary: true }) // public id: number // @column() @@ -1278,7 +1278,7 @@ test.group('Model options | Model.fetchOrCreateMany', (group) => { // test('pass sideloaded data to preloads', async (assert) => { // class Profile extends BaseModel { -// @column({ primary: true }) +// @column({ isPrimary: true }) // public id: number // @column() @@ -1289,7 +1289,7 @@ test.group('Model options | Model.fetchOrCreateMany', (group) => { // } // class User extends BaseModel { -// @column({ primary: true }) +// @column({ isPrimary: true }) // public id: number // @column() @@ -1311,7 +1311,7 @@ test.group('Model options | Model.fetchOrCreateMany', (group) => { // test('custom sideloaded data on preload query must win', async (assert) => { // class Profile extends BaseModel { -// @column({ primary: true }) +// @column({ isPrimary: true }) // public id: number // @column() @@ -1322,7 +1322,7 @@ test.group('Model options | Model.fetchOrCreateMany', (group) => { // } // class User extends BaseModel { -// @column({ primary: true }) +// @column({ isPrimary: true }) // public id: number // @column() diff --git a/test/orm/base-model.spec.ts b/test/orm/base-model.spec.ts index e3a60790..4b33a68e 100644 --- a/test/orm/base-model.spec.ts +++ b/test/orm/base-model.spec.ts @@ -38,7 +38,7 @@ test.group('Base model | boot', (group) => { test('compute table name from model name', async (assert) => { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -53,7 +53,7 @@ test.group('Base model | boot', (group) => { class User extends BaseModel { public static $table = 'my_users' - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -66,7 +66,7 @@ test.group('Base model | boot', (group) => { test('set increments to true by default', async (assert) => { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -81,7 +81,7 @@ test.group('Base model | boot', (group) => { class User extends BaseModel { public static $increments = false - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -107,7 +107,7 @@ test.group('Base model | boot', (group) => { class User extends BaseModel { public static $increments = false - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -206,7 +206,7 @@ test.group('Base Model | getter-setters', (group) => { test('get value for primary key', (assert) => { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -221,7 +221,7 @@ test.group('Base Model | getter-setters', (group) => { test('invoke getter when accessing value using $primaryKeyValue', (assert) => { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public get id () { return String(this.$getAttribute('id')) } @@ -235,6 +235,27 @@ test.group('Base Model | getter-setters', (group) => { assert.deepEqual(user.$primaryKeyValue, '1') }) + + test('invoke column serialize method when serializing model', (assert) => { + class User extends BaseModel { + @column({ isPrimary: true }) + public get id () { + return String(this.$getAttribute('id')) + } + + @column({ + serialize (value) { + return value.toUpperCase() + }, + }) + public username: string + } + + const user = new User() + user.$attributes = { username: 'virk', id: 1 } + assert.equal(user.username, 'virk') + assert.equal(user.toJSON().username, 'VIRK') + }) }) test.group('Base Model | dirty', (group) => { @@ -526,7 +547,7 @@ test.group('Base Model | persist', (group) => { test('refresh model instance', async (assert) => { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -557,7 +578,7 @@ test.group('Base Model | persist', (group) => { assert.plan(4) class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -818,9 +839,9 @@ test.group('Base Model | toJSON', (group) => { assert.deepEqual(user.toJSON(), { theUsername: 'virk' }) }) - test('do not serialize when serialize is set to false', async (assert) => { + test('do not serialize when serializeAs is set to null', async (assert) => { class User extends BaseModel { - @column({ serialize: false }) + @column({ serializeAs: null }) public username: string } @@ -1210,7 +1231,7 @@ test.group('Base Model | relations', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @hasOne(() => Profile) @@ -1236,7 +1257,7 @@ test.group('Base Model | relations', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @hasOne(() => Profile) @@ -1263,7 +1284,7 @@ test.group('Base Model | relations', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @hasOne(() => Profile) @@ -1294,7 +1315,7 @@ test.group('Base Model | relations', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @hasOne(() => Profile, { serializeAs: 'social' }) @@ -1325,7 +1346,7 @@ test.group('Base Model | relations', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @hasMany(() => Profile) @@ -1358,7 +1379,7 @@ test.group('Base Model | relations', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @hasMany(() => Profile) @@ -1395,7 +1416,7 @@ test.group('Base Model | relations', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @hasMany(() => Profile) @@ -1434,7 +1455,7 @@ test.group('Base Model | relations', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @hasOne(() => Profile) @@ -1463,7 +1484,7 @@ test.group('Base Model | relations', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @hasMany(() => Profile) @@ -1499,7 +1520,7 @@ test.group('Base Model | fetch', (group) => { test('find using the primary key', async (assert) => { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -1519,7 +1540,7 @@ test.group('Base Model | fetch', (group) => { test('raise exception when row is not found', async (assert) => { assert.plan(1) class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -1538,7 +1559,7 @@ test.group('Base Model | fetch', (group) => { test('find many using the primary key', async (assert) => { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -1561,7 +1582,7 @@ test.group('Base Model | fetch', (group) => { test('return the existing row when search criteria matches', async (assert) => { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column({ castAs: 'username' }) @@ -1584,7 +1605,7 @@ test.group('Base Model | fetch', (group) => { test('create new row when search criteria doesn\'t match', async (assert) => { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column({ castAs: 'username' }) @@ -1610,7 +1631,7 @@ test.group('Base Model | fetch', (group) => { test('return the existing row when search criteria matches using firstOrNew', async (assert) => { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column({ castAs: 'username' }) @@ -1633,7 +1654,7 @@ test.group('Base Model | fetch', (group) => { test('instantiate new row when search criteria doesn\'t match using firstOrNew', async (assert) => { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column({ castAs: 'username' }) @@ -1659,7 +1680,7 @@ test.group('Base Model | fetch', (group) => { test('update the existing row when search criteria matches', async (assert) => { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column({ castAs: 'username' }) @@ -1686,7 +1707,7 @@ test.group('Base Model | fetch', (group) => { test('execute updateOrCreate update action inside a transaction', async (assert) => { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column({ castAs: 'username' }) @@ -1719,7 +1740,7 @@ test.group('Base Model | fetch', (group) => { test('create a new row when search criteria fails', async (assert) => { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -1751,7 +1772,7 @@ test.group('Base Model | fetch', (group) => { test('execute updateOrCreate create action inside a transaction', async (assert) => { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -1784,7 +1805,7 @@ test.group('Base Model | fetch', (group) => { test('persist records to db when find call returns zero rows', async (assert) => { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -1834,7 +1855,7 @@ test.group('Base Model | fetch', (group) => { test('sync records by avoiding duplicates', async (assert) => { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -1893,7 +1914,7 @@ test.group('Base Model | fetch', (group) => { test('wrap create calls inside a transaction', async (assert) => { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -1942,7 +1963,7 @@ test.group('Base Model | fetch', (group) => { test('handle columns with different cast key name', async (assert) => { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column({ castAs: 'username' }) @@ -2003,7 +2024,7 @@ test.group('Base Model | fetch', (group) => { assert.plan(2) class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -2054,7 +2075,7 @@ test.group('Base Model | fetch', (group) => { assert.plan(2) class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -2098,7 +2119,7 @@ test.group('Base Model | fetch', (group) => { assert.plan(2) class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -2137,7 +2158,7 @@ test.group('Base Model | fetch', (group) => { test('persist records to db when find call returns zero rows', async (assert) => { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -2187,7 +2208,7 @@ test.group('Base Model | fetch', (group) => { test('update records and avoiding duplicates', async (assert) => { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -2247,7 +2268,7 @@ test.group('Base Model | fetch', (group) => { test('wrap create calls inside a transaction using updateOrCreateMany', async (assert) => { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -2296,7 +2317,7 @@ test.group('Base Model | fetch', (group) => { test('wrap update calls inside a transaction using updateOrCreateMany', async (assert) => { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -2366,7 +2387,7 @@ test.group('Base Model | hooks', (group) => { assert.plan(8) class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -2413,7 +2434,7 @@ test.group('Base Model | hooks', (group) => { assert.plan(3) class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -2466,7 +2487,7 @@ test.group('Base Model | hooks', (group) => { assert.plan(1) class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -2506,7 +2527,7 @@ test.group('Base Model | hooks', (group) => { assert.plan(1) class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -2546,7 +2567,7 @@ test.group('Base Model | hooks', (group) => { assert.plan(10) class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -2599,7 +2620,7 @@ test.group('Base Model | hooks', (group) => { assert.plan(5) class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -2658,7 +2679,7 @@ test.group('Base Model | hooks', (group) => { assert.plan(3) class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -2696,7 +2717,7 @@ test.group('Base Model | hooks', (group) => { assert.plan(3) class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -2749,7 +2770,7 @@ test.group('Base model | extend', (group) => { test('extend model query builder', async (assert) => { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -2775,7 +2796,7 @@ test.group('Base model | extend', (group) => { test('extend model insert query builder', async (assert) => { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() diff --git a/test/orm/model-belongs-to.spec.ts b/test/orm/model-belongs-to.spec.ts index 2063bc0f..53b9793d 100644 --- a/test/orm/model-belongs-to.spec.ts +++ b/test/orm/model-belongs-to.spec.ts @@ -52,7 +52,7 @@ test.group('Model | BelongsTo | Options', (group) => { try { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number } @@ -75,7 +75,7 @@ test.group('Model | BelongsTo | Options', (group) => { test('use primary key is as the local key', (assert) => { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number } @@ -95,7 +95,7 @@ test.group('Model | BelongsTo | Options', (group) => { test('use custom defined local key', (assert) => { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column({ castAs: 'user_uid' }) @@ -118,7 +118,7 @@ test.group('Model | BelongsTo | Options', (group) => { test('compute foreign key from model name and primary key', (assert) => { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number } @@ -138,7 +138,7 @@ test.group('Model | BelongsTo | Options', (group) => { test('use pre defined foreign key', (assert) => { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number } @@ -165,7 +165,7 @@ test.group('Model | BelongsTo | Set Relations', (group) => { test('set related model instance', (assert) => { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number } @@ -188,7 +188,7 @@ test.group('Model | BelongsTo | Set Relations', (group) => { test('push related model instance', (assert) => { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number } @@ -214,7 +214,7 @@ test.group('Model | BelongsTo | Set Relations', (group) => { test('set many of related instances', (assert) => { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number } @@ -268,7 +268,7 @@ test.group('Model | BelongsTo | bulk operations', (group) => { test('generate correct sql for selecting related rows', async (assert) => { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number } @@ -298,7 +298,7 @@ test.group('Model | BelongsTo | bulk operations', (group) => { test('generate correct sql for selecting many related rows', async (assert) => { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number } @@ -333,7 +333,7 @@ test.group('Model | BelongsTo | bulk operations', (group) => { test('generate correct sql for updating related row', async (assert) => { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number } @@ -365,7 +365,7 @@ test.group('Model | BelongsTo | bulk operations', (group) => { test('generate correct sql for updating many rows', async (assert) => { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number } @@ -402,7 +402,7 @@ test.group('Model | BelongsTo | bulk operations', (group) => { test('generate correct sql for deleting related row', async (assert) => { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number } @@ -432,7 +432,7 @@ test.group('Model | BelongsTo | bulk operations', (group) => { test('generate correct sql for deleting many rows', async (assert) => { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number } @@ -485,7 +485,7 @@ test.group('Model | BelongsTo | preload', (group) => { test('preload relationship', async (assert) => { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number } @@ -510,7 +510,7 @@ test.group('Model | BelongsTo | preload', (group) => { test('preload relationship for many rows', async (assert) => { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number } @@ -544,7 +544,7 @@ test.group('Model | BelongsTo | preload', (group) => { test('add runtime constraints to related query', async (assert) => { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number } @@ -578,7 +578,7 @@ test.group('Model | BelongsTo | preload', (group) => { test('cherry pick columns during preload', async (assert) => { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -618,7 +618,7 @@ test.group('Model | BelongsTo | preload', (group) => { test('do not repeat fk when already defined', async (assert) => { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -660,7 +660,7 @@ test.group('Model | BelongsTo | preload', (group) => { assert.plan(1) class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -698,12 +698,12 @@ test.group('Model | BelongsTo | preload', (group) => { test('preload using model instance', async (assert) => { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number } class Profile extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -739,12 +739,12 @@ test.group('Model | BelongsTo | preload', (group) => { test('preload nested relations', async (assert) => { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number } class Profile extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -758,7 +758,7 @@ test.group('Model | BelongsTo | preload', (group) => { } class Identity extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -805,12 +805,12 @@ test.group('Model | BelongsTo | preload', (group) => { test('preload nested relations using model instance', async (assert) => { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number } class Profile extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -824,7 +824,7 @@ test.group('Model | BelongsTo | preload', (group) => { } class Identity extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -871,12 +871,12 @@ test.group('Model | BelongsTo | preload', (group) => { test('pass main query options down the chain', async (assert) => { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number } class Profile extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -890,7 +890,7 @@ test.group('Model | BelongsTo | preload', (group) => { } class Identity extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -943,7 +943,7 @@ test.group('Model | BelongsTo | preload', (group) => { assert.plan(1) class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number } @@ -989,7 +989,7 @@ test.group('Model | BelongsTo | persist', (group) => { test('associate related instance', async (assert) => { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -1025,7 +1025,7 @@ test.group('Model | BelongsTo | persist', (group) => { test('dissociate relation', async (assert) => { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() diff --git a/test/orm/model-has-many-through.spec.ts b/test/orm/model-has-many-through.spec.ts index 69f390eb..d387bc9e 100644 --- a/test/orm/model-has-many-through.spec.ts +++ b/test/orm/model-has-many-through.spec.ts @@ -64,7 +64,7 @@ test.group('Model | Has Many Through | Options', (group) => { Post.$boot() class Country extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @hasManyThrough([() => Post, () => User]) @@ -96,7 +96,7 @@ test.group('Model | Has Many Through | Options', (group) => { Post.$boot() class Country extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @hasManyThrough([() => Post, () => User]) @@ -118,7 +118,7 @@ test.group('Model | Has Many Through | Options', (group) => { try { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -131,7 +131,7 @@ test.group('Model | Has Many Through | Options', (group) => { Post.$boot() class Country extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @hasManyThrough([() => Post, () => User]) @@ -150,7 +150,7 @@ test.group('Model | Has Many Through | Options', (group) => { test('compute all required keys', (assert) => { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -165,7 +165,7 @@ test.group('Model | Has Many Through | Options', (group) => { Post.$boot() class Country extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @hasManyThrough([() => Post, () => User]) @@ -192,7 +192,7 @@ test.group('Model | Has Many Through | Options', (group) => { test('compute custom keys', (assert) => { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public uid: number @column() @@ -207,7 +207,7 @@ test.group('Model | Has Many Through | Options', (group) => { Post.$boot() class Country extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public uid: number @hasManyThrough([() => Post, () => User], { @@ -246,7 +246,7 @@ test.group('Model | Has Many Through | Set Relations', (group) => { test('set related model instance', (assert) => { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -261,7 +261,7 @@ test.group('Model | Has Many Through | Set Relations', (group) => { Post.$boot() class Country extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @hasManyThrough([() => Post, () => User]) @@ -280,7 +280,7 @@ test.group('Model | Has Many Through | Set Relations', (group) => { test('push related model instance', (assert) => { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -295,7 +295,7 @@ test.group('Model | Has Many Through | Set Relations', (group) => { Post.$boot() class Country extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @hasManyThrough([() => Post, () => User]) @@ -316,7 +316,7 @@ test.group('Model | Has Many Through | Set Relations', (group) => { test('set many of related instances', (assert) => { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -331,7 +331,7 @@ test.group('Model | Has Many Through | Set Relations', (group) => { Post.$boot() class Country extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @hasManyThrough([() => Post, () => User]) @@ -393,7 +393,7 @@ test.group('Model | Has Many Through | bulk operations', (group) => { test('generate correct sql for selecting related rows', async (assert) => { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -408,7 +408,7 @@ test.group('Model | Has Many Through | bulk operations', (group) => { Post.$boot() class Country extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @hasManyThrough([() => Post, () => User]) @@ -435,7 +435,7 @@ test.group('Model | Has Many Through | bulk operations', (group) => { test('generate correct sql for selecting many related rows', async (assert) => { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -450,7 +450,7 @@ test.group('Model | Has Many Through | bulk operations', (group) => { Post.$boot() class Country extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @hasManyThrough([() => Post, () => User]) @@ -483,7 +483,7 @@ test.group('Model | Has Many Through | bulk operations', (group) => { test('generate correct sql for updating related rows', async (assert) => { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -498,7 +498,7 @@ test.group('Model | Has Many Through | bulk operations', (group) => { Post.$boot() class Country extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @hasManyThrough([() => Post, () => User]) @@ -530,7 +530,7 @@ test.group('Model | Has Many Through | bulk operations', (group) => { test('generate correct sql for updating many related rows', async (assert) => { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -545,7 +545,7 @@ test.group('Model | Has Many Through | bulk operations', (group) => { Post.$boot() class Country extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @hasManyThrough([() => Post, () => User]) @@ -582,7 +582,7 @@ test.group('Model | Has Many Through | bulk operations', (group) => { test('generate correct sql for deleting related rows', async (assert) => { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -597,7 +597,7 @@ test.group('Model | Has Many Through | bulk operations', (group) => { Post.$boot() class Country extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @hasManyThrough([() => Post, () => User]) @@ -625,7 +625,7 @@ test.group('Model | Has Many Through | bulk operations', (group) => { test('generate correct sql for deleting many related rows', async (assert) => { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -640,7 +640,7 @@ test.group('Model | Has Many Through | bulk operations', (group) => { Post.$boot() class Country extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @hasManyThrough([() => Post, () => User]) @@ -691,7 +691,7 @@ test.group('Model | Has Many Through | preload', (group) => { test('preload through relationships', async (assert) => { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -700,7 +700,7 @@ test.group('Model | Has Many Through | preload', (group) => { User.$boot() class Post extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -712,7 +712,7 @@ test.group('Model | Has Many Through | preload', (group) => { Post.$boot() class Country extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @hasManyThrough([() => Post, () => User]) @@ -748,7 +748,7 @@ test.group('Model | Has Many Through | preload', (group) => { test('preload many relationships', async (assert) => { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -757,7 +757,7 @@ test.group('Model | Has Many Through | preload', (group) => { User.$boot() class Post extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -769,7 +769,7 @@ test.group('Model | Has Many Through | preload', (group) => { Post.$boot() class Country extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @hasManyThrough([() => Post, () => User]) @@ -807,7 +807,7 @@ test.group('Model | Has Many Through | preload', (group) => { test('preload many relationships using model instance', async (assert) => { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -816,7 +816,7 @@ test.group('Model | Has Many Through | preload', (group) => { User.$boot() class Post extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -828,7 +828,7 @@ test.group('Model | Has Many Through | preload', (group) => { Post.$boot() class Country extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @hasManyThrough([() => Post, () => User]) @@ -870,7 +870,7 @@ test.group('Model | Has Many Through | preload', (group) => { test('cherry pick columns during preload', async (assert) => { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -879,7 +879,7 @@ test.group('Model | Has Many Through | preload', (group) => { User.$boot() class Post extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -891,7 +891,7 @@ test.group('Model | Has Many Through | preload', (group) => { Post.$boot() class Country extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @hasManyThrough([() => Post, () => User]) @@ -932,7 +932,7 @@ test.group('Model | Has Many Through | preload', (group) => { test('raise error when local key is not selected', async (assert) => { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -941,7 +941,7 @@ test.group('Model | Has Many Through | preload', (group) => { User.$boot() class Post extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -953,7 +953,7 @@ test.group('Model | Has Many Through | preload', (group) => { Post.$boot() class Country extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @hasManyThrough([() => Post, () => User]) @@ -985,7 +985,7 @@ test.group('Model | Has Many Through | preload', (group) => { assert.plan(1) class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -994,7 +994,7 @@ test.group('Model | Has Many Through | preload', (group) => { User.$boot() class Post extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -1006,7 +1006,7 @@ test.group('Model | Has Many Through | preload', (group) => { Post.$boot() class Country extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @hasManyThrough([() => Post, () => User]) diff --git a/test/orm/model-has-many.spec.ts b/test/orm/model-has-many.spec.ts index c3b39fd0..fad0b18b 100644 --- a/test/orm/model-has-many.spec.ts +++ b/test/orm/model-has-many.spec.ts @@ -55,7 +55,7 @@ test.group('Model | HasMany | Options', (group) => { Post.$boot() class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @hasMany(() => Post) @@ -79,7 +79,7 @@ test.group('Model | HasMany | Options', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @hasMany(() => Post) @@ -100,7 +100,7 @@ test.group('Model | HasMany | Options', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column({ castAs: 'user_uid' }) @@ -124,7 +124,7 @@ test.group('Model | HasMany | Options', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @hasMany(() => Post) @@ -145,7 +145,7 @@ test.group('Model | HasMany | Options', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @hasMany(() => Post, { foreignKey: 'userUid' }) @@ -173,7 +173,7 @@ test.group('Model | HasMany | Set Relations', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @hasMany(() => Post) @@ -196,7 +196,7 @@ test.group('Model | HasMany | Set Relations', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @hasMany(() => Post) @@ -223,7 +223,7 @@ test.group('Model | HasMany | Set Relations', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @hasMany(() => Post) @@ -281,7 +281,7 @@ test.group('Model | HasMany | bulk operations', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @hasMany(() => Post) @@ -313,7 +313,7 @@ test.group('Model | HasMany | bulk operations', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @hasMany(() => Post) @@ -350,7 +350,7 @@ test.group('Model | HasMany | bulk operations', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @hasMany(() => Post) @@ -385,7 +385,7 @@ test.group('Model | HasMany | bulk operations', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @hasMany(() => Post) @@ -422,7 +422,7 @@ test.group('Model | HasMany | bulk operations', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @hasMany(() => Post) @@ -452,7 +452,7 @@ test.group('Model | HasMany | bulk operations', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @hasMany(() => Post) @@ -505,7 +505,7 @@ test.group('Model | HasMany | preload', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @hasMany(() => Post) @@ -537,7 +537,7 @@ test.group('Model | HasMany | preload', (group) => { test('preload relationship for many rows', async (assert) => { class Post extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -548,7 +548,7 @@ test.group('Model | HasMany | preload', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @hasMany(() => Post) @@ -587,7 +587,7 @@ test.group('Model | HasMany | preload', (group) => { test('add constraints during preload', async (assert) => { class Post extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -598,7 +598,7 @@ test.group('Model | HasMany | preload', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @hasMany(() => Post) @@ -633,7 +633,7 @@ test.group('Model | HasMany | preload', (group) => { test('cherry pick columns during preload', async (assert) => { class Post extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -644,7 +644,7 @@ test.group('Model | HasMany | preload', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @hasMany(() => Post) @@ -680,7 +680,7 @@ test.group('Model | HasMany | preload', (group) => { test('do not repeat fk when already defined', async (assert) => { class Post extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -691,7 +691,7 @@ test.group('Model | HasMany | preload', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @hasMany(() => Post) @@ -729,7 +729,7 @@ test.group('Model | HasMany | preload', (group) => { assert.plan(1) class Post extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -740,7 +740,7 @@ test.group('Model | HasMany | preload', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @hasMany(() => Post) @@ -772,7 +772,7 @@ test.group('Model | HasMany | preload', (group) => { test('preload nested relations', async (assert) => { class Comment extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -783,7 +783,7 @@ test.group('Model | HasMany | preload', (group) => { } class Post extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -797,7 +797,7 @@ test.group('Model | HasMany | preload', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @hasMany(() => Post) @@ -839,7 +839,7 @@ test.group('Model | HasMany | preload', (group) => { test('preload nested relations using model instance', async (assert) => { class Comment extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -850,7 +850,7 @@ test.group('Model | HasMany | preload', (group) => { } class Post extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -864,7 +864,7 @@ test.group('Model | HasMany | preload', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @hasMany(() => Post) @@ -915,7 +915,7 @@ test.group('Model | HasMany | preload', (group) => { test('pass main query options down the chain', async (assert) => { class Comment extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -926,7 +926,7 @@ test.group('Model | HasMany | preload', (group) => { } class Post extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -940,7 +940,7 @@ test.group('Model | HasMany | preload', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @hasMany(() => Post) @@ -993,7 +993,7 @@ test.group('Model | HasMany | preload', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @hasMany(() => Post) @@ -1047,7 +1047,7 @@ test.group('Model | HasMany | persist', (group) => { test('save related instance', async (assert) => { class Post extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -1058,7 +1058,7 @@ test.group('Model | HasMany | persist', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -1089,7 +1089,7 @@ test.group('Model | HasMany | persist', (group) => { test('save many related instances', async (assert) => { class Post extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -1100,7 +1100,7 @@ test.group('Model | HasMany | persist', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -1139,7 +1139,7 @@ test.group('Model | HasMany | persist', (group) => { assert.plan(6) class Post extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -1150,7 +1150,7 @@ test.group('Model | HasMany | persist', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -1186,7 +1186,7 @@ test.group('Model | HasMany | persist', (group) => { test('wrap save many calls inside a save point when parent is in transaction', async (assert) => { class Post extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -1197,7 +1197,7 @@ test.group('Model | HasMany | persist', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -1230,7 +1230,7 @@ test.group('Model | HasMany | persist', (group) => { test('create related instance', async (assert) => { class Post extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -1241,7 +1241,7 @@ test.group('Model | HasMany | persist', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -1269,7 +1269,7 @@ test.group('Model | HasMany | persist', (group) => { test('create many related instances', async (assert) => { class Post extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -1280,7 +1280,7 @@ test.group('Model | HasMany | persist', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -1320,7 +1320,7 @@ test.group('Model | HasMany | persist', (group) => { assert.plan(4) class Post extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -1331,7 +1331,7 @@ test.group('Model | HasMany | persist', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -1360,7 +1360,7 @@ test.group('Model | HasMany | persist', (group) => { test('wrap create many calls inside a save point when parent is in transaction', async (assert) => { class Post extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -1371,7 +1371,7 @@ test.group('Model | HasMany | persist', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -1418,7 +1418,7 @@ test.group('Model | HasMany | firstOrCreate', (group) => { test('create related instance when there isn\'t any existing row', async (assert) => { class Post extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -1429,7 +1429,7 @@ test.group('Model | HasMany | firstOrCreate', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -1460,7 +1460,7 @@ test.group('Model | HasMany | firstOrCreate', (group) => { test('return existing instance vs creating one', async (assert) => { class Post extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -1471,7 +1471,7 @@ test.group('Model | HasMany | firstOrCreate', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -1519,7 +1519,7 @@ test.group('Model | HasMany | updateOrCreate', (group) => { test('create related instance when there isn\'t any existing row', async (assert) => { class Post extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -1530,7 +1530,7 @@ test.group('Model | HasMany | updateOrCreate', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -1561,7 +1561,7 @@ test.group('Model | HasMany | updateOrCreate', (group) => { test('update existing instance vs creating one', async (assert) => { class Post extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -1572,7 +1572,7 @@ test.group('Model | HasMany | updateOrCreate', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() diff --git a/test/orm/model-has-one.spec.ts b/test/orm/model-has-one.spec.ts index 0c1f8bdf..504ab8d7 100644 --- a/test/orm/model-has-one.spec.ts +++ b/test/orm/model-has-one.spec.ts @@ -55,7 +55,7 @@ test.group('Model | HasOne | Options', (group) => { Profile.$boot() class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @hasOne(() => Profile) @@ -80,7 +80,7 @@ test.group('Model | HasOne | Options', (group) => { Profile.$boot() class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @hasOne(() => Profile) @@ -102,7 +102,7 @@ test.group('Model | HasOne | Options', (group) => { Profile.$boot() class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column({ castAs: 'user_uid' }) @@ -127,7 +127,7 @@ test.group('Model | HasOne | Options', (group) => { Profile.$boot() class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @hasOne(() => Profile) @@ -149,7 +149,7 @@ test.group('Model | HasOne | Options', (group) => { Profile.$boot() class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @hasOne(() => Profile, { foreignKey: 'userUid' }) @@ -273,7 +273,7 @@ test.group('Model | HasOne | bulk operations', (group) => { test('generate correct sql for selecting related rows', async (assert) => { class Profile extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -284,7 +284,7 @@ test.group('Model | HasOne | bulk operations', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -312,7 +312,7 @@ test.group('Model | HasOne | bulk operations', (group) => { test('generate correct sql for selecting related many rows', async (assert) => { class Profile extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -323,7 +323,7 @@ test.group('Model | HasOne | bulk operations', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -356,7 +356,7 @@ test.group('Model | HasOne | bulk operations', (group) => { test('generate correct sql for updating related row', async (assert) => { class Profile extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -367,7 +367,7 @@ test.group('Model | HasOne | bulk operations', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -397,7 +397,7 @@ test.group('Model | HasOne | bulk operations', (group) => { test('generate correct sql for updating many rows', async (assert) => { class Profile extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -408,7 +408,7 @@ test.group('Model | HasOne | bulk operations', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -443,7 +443,7 @@ test.group('Model | HasOne | bulk operations', (group) => { test('generate correct sql for deleting related row', async (assert) => { class Profile extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -454,7 +454,7 @@ test.group('Model | HasOne | bulk operations', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -482,7 +482,7 @@ test.group('Model | HasOne | bulk operations', (group) => { test('generate correct sql for deleting many rows', async (assert) => { class Profile extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -493,7 +493,7 @@ test.group('Model | HasOne | bulk operations', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -544,7 +544,7 @@ test.group('Model | HasOne | preload', (group) => { test('preload relationship', async (assert) => { class Profile extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -555,7 +555,7 @@ test.group('Model | HasOne | preload', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @hasOne(() => Profile) @@ -587,7 +587,7 @@ test.group('Model | HasOne | preload', (group) => { test('preload nested relations', async (assert) => { class Identity extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -598,7 +598,7 @@ test.group('Model | HasOne | preload', (group) => { } class Profile extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -612,7 +612,7 @@ test.group('Model | HasOne | preload', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @hasOne(() => Profile) @@ -655,7 +655,7 @@ test.group('Model | HasOne | preload', (group) => { test('preload self referenced relationship', async (assert) => { class Profile extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -669,7 +669,7 @@ test.group('Model | HasOne | preload', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @hasOne(() => Profile) @@ -701,7 +701,7 @@ test.group('Model | HasOne | preload', (group) => { test('add constraints during preload', async (assert) => { class Profile extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -712,7 +712,7 @@ test.group('Model | HasOne | preload', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @hasOne(() => Profile) @@ -744,7 +744,7 @@ test.group('Model | HasOne | preload', (group) => { test('cherry pick columns during preload', async (assert) => { class Profile extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -755,7 +755,7 @@ test.group('Model | HasOne | preload', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @hasOne(() => Profile) @@ -789,7 +789,7 @@ test.group('Model | HasOne | preload', (group) => { test('do not repeat fk when already defined', async (assert) => { class Profile extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -800,7 +800,7 @@ test.group('Model | HasOne | preload', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @hasOne(() => Profile) @@ -834,7 +834,7 @@ test.group('Model | HasOne | preload', (group) => { test('pass sideloaded attributes to the relationship', async (assert) => { class Profile extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -845,7 +845,7 @@ test.group('Model | HasOne | preload', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @hasOne(() => Profile) @@ -879,7 +879,7 @@ test.group('Model | HasOne | preload', (group) => { test('preload using model instance', async (assert) => { class Profile extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -890,7 +890,7 @@ test.group('Model | HasOne | preload', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @hasOne(() => Profile) @@ -925,7 +925,7 @@ test.group('Model | HasOne | preload', (group) => { assert.plan(1) class Profile extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -936,7 +936,7 @@ test.group('Model | HasOne | preload', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @hasOne(() => Profile) @@ -966,7 +966,7 @@ test.group('Model | HasOne | preload', (group) => { test('preload nested relations using model instance', async (assert) => { class Identity extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -977,7 +977,7 @@ test.group('Model | HasOne | preload', (group) => { } class Profile extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -991,7 +991,7 @@ test.group('Model | HasOne | preload', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @hasOne(() => Profile) @@ -1043,7 +1043,7 @@ test.group('Model | HasOne | preload', (group) => { test('pass main query options down the chain', async (assert) => { class Identity extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -1054,7 +1054,7 @@ test.group('Model | HasOne | preload', (group) => { } class Profile extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -1068,7 +1068,7 @@ test.group('Model | HasOne | preload', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @hasOne(() => Profile) @@ -1117,7 +1117,7 @@ test.group('Model | HasOne | preload', (group) => { assert.plan(1) class Profile extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -1128,7 +1128,7 @@ test.group('Model | HasOne | preload', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @hasOne(() => Profile) @@ -1182,7 +1182,7 @@ test.group('Model | HasOne | persist', (group) => { test('save related instance', async (assert) => { class Profile extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -1193,7 +1193,7 @@ test.group('Model | HasOne | persist', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -1218,7 +1218,7 @@ test.group('Model | HasOne | persist', (group) => { test('create related instance', async (assert) => { class Profile extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -1229,7 +1229,7 @@ test.group('Model | HasOne | persist', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -1253,7 +1253,7 @@ test.group('Model | HasOne | persist', (group) => { test('use parent model transaction during create', async (assert) => { class Profile extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -1264,7 +1264,7 @@ test.group('Model | HasOne | persist', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -1315,7 +1315,7 @@ test.group('Model | HasOne | firstOrCreate', (group) => { test('create related instance when there isn\'t any existing row', async (assert) => { class Profile extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -1326,7 +1326,7 @@ test.group('Model | HasOne | firstOrCreate', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -1352,7 +1352,7 @@ test.group('Model | HasOne | firstOrCreate', (group) => { test('return the existing row vs creating a new one', async (assert) => { class Profile extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -1363,7 +1363,7 @@ test.group('Model | HasOne | firstOrCreate', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -1410,7 +1410,7 @@ test.group('Model | HasOne | updateOrCreate', (group) => { test('create related instance when there isn\'t any existing row', async (assert) => { class Profile extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -1421,7 +1421,7 @@ test.group('Model | HasOne | updateOrCreate', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -1451,7 +1451,7 @@ test.group('Model | HasOne | updateOrCreate', (group) => { test('update the existing row vs creating a new one', async (assert) => { class Profile extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -1462,7 +1462,7 @@ test.group('Model | HasOne | updateOrCreate', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() diff --git a/test/orm/model-many-to-many.spec.ts b/test/orm/model-many-to-many.spec.ts index 18e27252..e49a1ba3 100644 --- a/test/orm/model-many-to-many.spec.ts +++ b/test/orm/model-many-to-many.spec.ts @@ -48,12 +48,12 @@ test.group('Model | ManyToMany | Options', (group) => { test('use primary key as the local key', (assert) => { class Skill extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @manyToMany(() => Skill) @@ -68,12 +68,12 @@ test.group('Model | ManyToMany | Options', (group) => { test('use custom defined local key', (assert) => { class Skill extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -99,7 +99,7 @@ test.group('Model | ManyToMany | Options', (group) => { Skill.$boot() class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @manyToMany(() => Skill) @@ -118,12 +118,12 @@ test.group('Model | ManyToMany | Options', (group) => { test('use related model primary key as the related key', (assert) => { class Skill extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @manyToMany(() => Skill) @@ -138,7 +138,7 @@ test.group('Model | ManyToMany | Options', (group) => { test('use custom defined related key', (assert) => { class Skill extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -146,7 +146,7 @@ test.group('Model | ManyToMany | Options', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @manyToMany(() => Skill, { relatedKey: 'uid' }) @@ -161,12 +161,12 @@ test.group('Model | ManyToMany | Options', (group) => { test('compute pivotForeignKey from table name + primary key', (assert) => { class Skill extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @manyToMany(() => Skill) @@ -180,12 +180,12 @@ test.group('Model | ManyToMany | Options', (group) => { test('use custom defined pivotForeignKey', (assert) => { class Skill extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @manyToMany(() => Skill, { pivotForeignKey: 'user_uid' }) @@ -199,12 +199,12 @@ test.group('Model | ManyToMany | Options', (group) => { test('compute relatedPivotForeignKey from related model name + primary key', (assert) => { class Skill extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @manyToMany(() => Skill) @@ -219,12 +219,12 @@ test.group('Model | ManyToMany | Options', (group) => { test('use custom defined relatedPivotForeignKey', (assert) => { class Skill extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @manyToMany(() => Skill, { pivotRelatedForeignKey: 'skill_uid' }) @@ -246,12 +246,12 @@ test.group('Model | ManyToMany | Set Relations', (group) => { test('set related model instance', (assert) => { class Skill extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @manyToMany(() => Skill) @@ -268,12 +268,12 @@ test.group('Model | ManyToMany | Set Relations', (group) => { test('push related model instance', (assert) => { class Skill extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @manyToMany(() => Skill) @@ -293,7 +293,7 @@ test.group('Model | ManyToMany | Set Relations', (group) => { test('set many of related instances', (assert) => { class Skill extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @manyToMany(() => User) @@ -301,7 +301,7 @@ test.group('Model | ManyToMany | Set Relations', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @manyToMany(() => Skill) @@ -360,12 +360,12 @@ test.group('Model | ManyToMany | bulk operations', (group) => { test('generate correct sql for selecting related rows', async (assert) => { class Skill extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @manyToMany(() => Skill) @@ -391,12 +391,12 @@ test.group('Model | ManyToMany | bulk operations', (group) => { test('generate correct sql for selecting related for many rows', async (assert) => { class Skill extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @manyToMany(() => Skill) @@ -428,12 +428,12 @@ test.group('Model | ManyToMany | bulk operations', (group) => { test('select extra columns', async (assert) => { class Skill extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @manyToMany(() => Skill, { @@ -466,12 +466,12 @@ test.group('Model | ManyToMany | bulk operations', (group) => { test('select extra columns at runtime', async (assert) => { class Skill extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @manyToMany(() => Skill) @@ -502,12 +502,12 @@ test.group('Model | ManyToMany | bulk operations', (group) => { test('generate correct sql for updating rows', async (assert) => { class Skill extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @manyToMany(() => Skill) @@ -534,12 +534,12 @@ test.group('Model | ManyToMany | bulk operations', (group) => { test('generate correct sql for updating many rows', async (assert) => { class Skill extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @manyToMany(() => Skill) @@ -572,12 +572,12 @@ test.group('Model | ManyToMany | bulk operations', (group) => { test('generate correct sql for deleting rows', async (assert) => { class Skill extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @manyToMany(() => Skill) @@ -602,12 +602,12 @@ test.group('Model | ManyToMany | bulk operations', (group) => { test('generate correct sql for deleting many rows', async (assert) => { class Skill extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @manyToMany(() => Skill) @@ -655,7 +655,7 @@ test.group('Model | ManyToMany | preload', (group) => { test('preload relation', async (assert) => { class Skill extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -663,7 +663,7 @@ test.group('Model | ManyToMany | preload', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @manyToMany(() => Skill) @@ -690,7 +690,7 @@ test.group('Model | ManyToMany | preload', (group) => { test('preload relation for many', async (assert) => { class Skill extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -698,7 +698,7 @@ test.group('Model | ManyToMany | preload', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @manyToMany(() => Skill) @@ -744,7 +744,7 @@ test.group('Model | ManyToMany | preload', (group) => { test('preload relation using model instance', async (assert) => { class Skill extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -752,7 +752,7 @@ test.group('Model | ManyToMany | preload', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @manyToMany(() => Skill) @@ -802,7 +802,7 @@ test.group('Model | ManyToMany | preload', (group) => { test('select extra pivot columns', async (assert) => { class Skill extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -813,7 +813,7 @@ test.group('Model | ManyToMany | preload', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @manyToMany(() => Skill, { pivotColumns: ['proficiency'] }) @@ -865,7 +865,7 @@ test.group('Model | ManyToMany | preload', (group) => { test('select extra pivot columns at runtime', async (assert) => { class Skill extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -876,7 +876,7 @@ test.group('Model | ManyToMany | preload', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @manyToMany(() => Skill) @@ -931,7 +931,7 @@ test.group('Model | ManyToMany | preload', (group) => { test('cherry pick columns during preload', async (assert) => { class Skill extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -939,7 +939,7 @@ test.group('Model | ManyToMany | preload', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @manyToMany(() => Skill) @@ -970,7 +970,7 @@ test.group('Model | ManyToMany | preload', (group) => { assert.plan(1) class Skill extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -978,7 +978,7 @@ test.group('Model | ManyToMany | preload', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @manyToMany(() => Skill) @@ -1026,12 +1026,12 @@ test.group('Model | ManyToMany | wherePivot', (group) => { test('add where clause', async (assert) => { class Skill extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @manyToMany(() => Skill) @@ -1059,12 +1059,12 @@ test.group('Model | ManyToMany | wherePivot', (group) => { test('add where wrapped clause', async (assert) => { class Skill extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @manyToMany(() => Skill) @@ -1092,12 +1092,12 @@ test.group('Model | ManyToMany | wherePivot', (group) => { test('add where clause with operator', async (assert) => { class Skill extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @manyToMany(() => Skill) @@ -1125,12 +1125,12 @@ test.group('Model | ManyToMany | wherePivot', (group) => { test('add where clause as a raw query', async (assert) => { class Skill extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @manyToMany(() => Skill) @@ -1162,12 +1162,12 @@ test.group('Model | ManyToMany | wherePivot', (group) => { test('add orWhere clause', async (assert) => { class Skill extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @manyToMany(() => Skill) @@ -1197,12 +1197,12 @@ test.group('Model | ManyToMany | wherePivot', (group) => { test('add orWhere wrapped clause', async (assert) => { class Skill extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @manyToMany(() => Skill) @@ -1238,7 +1238,7 @@ test.group('Model | ManyToMany | wherePivot', (group) => { assert.plan(1) class Skill extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -1246,7 +1246,7 @@ test.group('Model | ManyToMany | wherePivot', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @manyToMany(() => Skill) @@ -1296,12 +1296,12 @@ test.group('Model | ManyToMany | whereNotPivot', (group) => { test('add where no clause', async (assert) => { class Skill extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @manyToMany(() => Skill) @@ -1326,12 +1326,12 @@ test.group('Model | ManyToMany | whereNotPivot', (group) => { test('add where not clause with operator', async (assert) => { class Skill extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @manyToMany(() => Skill) @@ -1359,12 +1359,12 @@ test.group('Model | ManyToMany | whereNotPivot', (group) => { test('add where not clause as a raw query', async (assert) => { class Skill extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @manyToMany(() => Skill) @@ -1396,12 +1396,12 @@ test.group('Model | ManyToMany | whereNotPivot', (group) => { test('add orWhereNot clause', async (assert) => { class Skill extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @manyToMany(() => Skill) @@ -1444,12 +1444,12 @@ test.group('Model | ManyToMany | whereInPivot', (group) => { test('add whereIn clause', async (assert) => { class Skill extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @manyToMany(() => Skill) @@ -1477,12 +1477,12 @@ test.group('Model | ManyToMany | whereInPivot', (group) => { test('add whereIn as a query callback', async (assert) => { class Skill extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @manyToMany(() => Skill) @@ -1514,12 +1514,12 @@ test.group('Model | ManyToMany | whereInPivot', (group) => { test('add whereIn as a subquery', async (assert) => { class Skill extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @manyToMany(() => Skill) @@ -1549,12 +1549,12 @@ test.group('Model | ManyToMany | whereInPivot', (group) => { const ref = db.connection().getWriteClient().ref.bind(db.connection().getWriteClient()) class Skill extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @manyToMany(() => Skill) @@ -1586,12 +1586,12 @@ test.group('Model | ManyToMany | whereInPivot', (group) => { test('add whereIn as a subquery with array of keys', async (assert) => { class Skill extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @manyToMany(() => Skill) @@ -1625,12 +1625,12 @@ test.group('Model | ManyToMany | whereInPivot', (group) => { test('add whereIn as a 2d array', async (assert) => { class Skill extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @manyToMany(() => Skill) @@ -1658,12 +1658,12 @@ test.group('Model | ManyToMany | whereInPivot', (group) => { test('add orWhereIn clause', async (assert) => { class Skill extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @manyToMany(() => Skill) @@ -1693,12 +1693,12 @@ test.group('Model | ManyToMany | whereInPivot', (group) => { test('add orWhereIn as a query callback', async (assert) => { class Skill extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @manyToMany(() => Skill) @@ -1749,12 +1749,12 @@ test.group('Model | ManyToMany | whereNotInPivot', (group) => { test('add whereNotIn clause', async (assert) => { class Skill extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @manyToMany(() => Skill) @@ -1782,12 +1782,12 @@ test.group('Model | ManyToMany | whereNotInPivot', (group) => { test('add whereNotIn as a query callback', async (assert) => { class Skill extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @manyToMany(() => Skill) @@ -1819,12 +1819,12 @@ test.group('Model | ManyToMany | whereNotInPivot', (group) => { test('add whereNotIn as a sub query', async (assert) => { class Skill extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @manyToMany(() => Skill) @@ -1855,12 +1855,12 @@ test.group('Model | ManyToMany | whereNotInPivot', (group) => { test('add whereNotIn as a 2d array', async (assert) => { class Skill extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @manyToMany(() => Skill) @@ -1888,12 +1888,12 @@ test.group('Model | ManyToMany | whereNotInPivot', (group) => { test('add orWhereNotIn clause', async (assert) => { class Skill extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @manyToMany(() => Skill) @@ -1923,12 +1923,12 @@ test.group('Model | ManyToMany | whereNotInPivot', (group) => { test('add orWhereNotIn as a subquery', async (assert) => { class Skill extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @manyToMany(() => Skill) @@ -1983,7 +1983,7 @@ test.group('Model | ManyToMany | persist', (group) => { test('save related instance', async (assert) => { class Skill extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -1991,7 +1991,7 @@ test.group('Model | ManyToMany | persist', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -2029,7 +2029,7 @@ test.group('Model | ManyToMany | persist', (group) => { test('attach duplicates when save is called twice and check existing is false', async (assert) => { class Skill extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -2037,7 +2037,7 @@ test.group('Model | ManyToMany | persist', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -2080,7 +2080,7 @@ test.group('Model | ManyToMany | persist', (group) => { test('do not attach duplicates when checkExisting is true', async (assert) => { class Skill extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -2088,7 +2088,7 @@ test.group('Model | ManyToMany | persist', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -2128,7 +2128,7 @@ test.group('Model | ManyToMany | persist', (group) => { test('attach when related pivot entry exists but for a different parent @sanityCheck', async (assert) => { class Skill extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -2136,7 +2136,7 @@ test.group('Model | ManyToMany | persist', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -2183,7 +2183,7 @@ test.group('Model | ManyToMany | persist', (group) => { test('save many of the related instances', async (assert) => { class Skill extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -2191,7 +2191,7 @@ test.group('Model | ManyToMany | persist', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -2238,7 +2238,7 @@ test.group('Model | ManyToMany | persist', (group) => { test('save many do not add duplicates', async (assert) => { class Skill extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -2246,7 +2246,7 @@ test.group('Model | ManyToMany | persist', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -2294,7 +2294,7 @@ test.group('Model | ManyToMany | persist', (group) => { test('attach ids with extra attributes', async (assert) => { class Skill extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -2302,7 +2302,7 @@ test.group('Model | ManyToMany | persist', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -2339,7 +2339,7 @@ test.group('Model | ManyToMany | persist', (group) => { test('detach related', async (assert) => { class Skill extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -2347,7 +2347,7 @@ test.group('Model | ManyToMany | persist', (group) => { } class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -2383,7 +2383,7 @@ test.group('Model | ManyToMany | persist', (group) => { // test('create related instance', async (assert) => { // class Skill extends BaseModel { -// @column({ primary: true }) +// @column({ isPrimary: true }) // public id: number // @column() @@ -2391,7 +2391,7 @@ test.group('Model | ManyToMany | persist', (group) => { // } // class User extends BaseModel { -// @column({ primary: true }) +// @column({ isPrimary: true }) // public id: number // @column() @@ -2426,7 +2426,7 @@ test.group('Model | ManyToMany | persist', (group) => { // test('create many of related instance', async (assert) => { // class Skill extends BaseModel { -// @column({ primary: true }) +// @column({ isPrimary: true }) // public id: number // @column() @@ -2434,7 +2434,7 @@ test.group('Model | ManyToMany | persist', (group) => { // } // class User extends BaseModel { -// @column({ primary: true }) +// @column({ isPrimary: true }) // public id: number // @column() @@ -2496,7 +2496,7 @@ test.group('Model | ManyToMany | persist', (group) => { // test('attach pivot ids', async (assert) => { // class Skill extends BaseModel { -// @column({ primary: true }) +// @column({ isPrimary: true }) // public id: number // @column() @@ -2504,7 +2504,7 @@ test.group('Model | ManyToMany | persist', (group) => { // } // class User extends BaseModel { -// @column({ primary: true }) +// @column({ isPrimary: true }) // public id: number // @column() @@ -2537,7 +2537,7 @@ test.group('Model | ManyToMany | persist', (group) => { // test('attach pivot ids avoid duplicates', async (assert) => { // class Skill extends BaseModel { -// @column({ primary: true }) +// @column({ isPrimary: true }) // public id: number // @column() @@ -2545,7 +2545,7 @@ test.group('Model | ManyToMany | persist', (group) => { // } // class User extends BaseModel { -// @column({ primary: true }) +// @column({ isPrimary: true }) // public id: number // @column() @@ -2580,7 +2580,7 @@ test.group('Model | ManyToMany | persist', (group) => { // assert.plan(1) // class Skill extends BaseModel { -// @column({ primary: true }) +// @column({ isPrimary: true }) // public id: number // @column() @@ -2588,7 +2588,7 @@ test.group('Model | ManyToMany | persist', (group) => { // } // class User extends BaseModel { -// @column({ primary: true }) +// @column({ isPrimary: true }) // public id: number // @column() @@ -2610,7 +2610,7 @@ test.group('Model | ManyToMany | persist', (group) => { // test('attach with extra data', async (assert) => { // class Skill extends BaseModel { -// @column({ primary: true }) +// @column({ isPrimary: true }) // public id: number // @column() @@ -2618,7 +2618,7 @@ test.group('Model | ManyToMany | persist', (group) => { // } // class User extends BaseModel { -// @column({ primary: true }) +// @column({ isPrimary: true }) // public id: number // @column() @@ -2674,7 +2674,7 @@ test.group('Model | ManyToMany | persist', (group) => { // test('generate correct sql for deleting related rows', async (assert) => { // class Skill extends BaseModel { -// @column({ primary: true }) +// @column({ isPrimary: true }) // public id: number // @column() @@ -2682,7 +2682,7 @@ test.group('Model | ManyToMany | persist', (group) => { // } // class User extends BaseModel { -// @column({ primary: true }) +// @column({ isPrimary: true }) // public id: number // @column() @@ -2710,7 +2710,7 @@ test.group('Model | ManyToMany | persist', (group) => { // test('generate correct sql for updating related rows', async (assert) => { // class Skill extends BaseModel { -// @column({ primary: true }) +// @column({ isPrimary: true }) // public id: number // @column() @@ -2718,7 +2718,7 @@ test.group('Model | ManyToMany | persist', (group) => { // } // class User extends BaseModel { -// @column({ primary: true }) +// @column({ isPrimary: true }) // public id: number // @column() @@ -2763,7 +2763,7 @@ test.group('Model | ManyToMany | persist', (group) => { // test('detach existing pivot ids', async (assert) => { // class Skill extends BaseModel { -// @column({ primary: true }) +// @column({ isPrimary: true }) // public id: number // @column() @@ -2771,7 +2771,7 @@ test.group('Model | ManyToMany | persist', (group) => { // } // class User extends BaseModel { -// @column({ primary: true }) +// @column({ isPrimary: true }) // public id: number // @column() @@ -2804,7 +2804,7 @@ test.group('Model | ManyToMany | persist', (group) => { // assert.plan(1) // class Skill extends BaseModel { -// @column({ primary: true }) +// @column({ isPrimary: true }) // public id: number // @column() @@ -2812,7 +2812,7 @@ test.group('Model | ManyToMany | persist', (group) => { // } // class User extends BaseModel { -// @column({ primary: true }) +// @column({ isPrimary: true }) // public id: number // @column() @@ -2851,7 +2851,7 @@ test.group('Model | ManyToMany | persist', (group) => { // test('do not perform deletes when not removing any ids', async (assert) => { // class Skill extends BaseModel { -// @column({ primary: true }) +// @column({ isPrimary: true }) // public id: number // @column() @@ -2859,7 +2859,7 @@ test.group('Model | ManyToMany | persist', (group) => { // } // class User extends BaseModel { -// @column({ primary: true }) +// @column({ isPrimary: true }) // public id: number // @column() @@ -2885,7 +2885,7 @@ test.group('Model | ManyToMany | persist', (group) => { // test('remove ids except one defined in the sync method', async (assert) => { // class Skill extends BaseModel { -// @column({ primary: true }) +// @column({ isPrimary: true }) // public id: number // @column() @@ -2893,7 +2893,7 @@ test.group('Model | ManyToMany | persist', (group) => { // } // class User extends BaseModel { -// @column({ primary: true }) +// @column({ isPrimary: true }) // public id: number // @column() @@ -2923,7 +2923,7 @@ test.group('Model | ManyToMany | persist', (group) => { // test('insert new ids mentioned in sync', async (assert) => { // class Skill extends BaseModel { -// @column({ primary: true }) +// @column({ isPrimary: true }) // public id: number // @column() @@ -2931,7 +2931,7 @@ test.group('Model | ManyToMany | persist', (group) => { // } // class User extends BaseModel { -// @column({ primary: true }) +// @column({ isPrimary: true }) // public id: number // @column() @@ -2964,7 +2964,7 @@ test.group('Model | ManyToMany | persist', (group) => { // test('sync with extra properties', async (assert) => { // class Skill extends BaseModel { -// @column({ primary: true }) +// @column({ isPrimary: true }) // public id: number // @column() @@ -2972,7 +2972,7 @@ test.group('Model | ManyToMany | persist', (group) => { // } // class User extends BaseModel { -// @column({ primary: true }) +// @column({ isPrimary: true }) // public id: number // @column() @@ -3010,7 +3010,7 @@ test.group('Model | ManyToMany | persist', (group) => { // test('sync update extra properties when rows are same', async (assert) => { // class Skill extends BaseModel { -// @column({ primary: true }) +// @column({ isPrimary: true }) // public id: number // @column() @@ -3018,7 +3018,7 @@ test.group('Model | ManyToMany | persist', (group) => { // } // class User extends BaseModel { -// @column({ primary: true }) +// @column({ isPrimary: true }) // public id: number // @column() diff --git a/test/orm/model-query-builder.spec.ts b/test/orm/model-query-builder.spec.ts index aa9fc41f..158363f6 100644 --- a/test/orm/model-query-builder.spec.ts +++ b/test/orm/model-query-builder.spec.ts @@ -43,7 +43,7 @@ test.group('Model query builder', (group) => { test('get instance of query builder for the given model', async (assert) => { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -56,7 +56,7 @@ test.group('Model query builder', (group) => { test('pre select the table for the query builder instance', async (assert) => { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -69,7 +69,7 @@ test.group('Model query builder', (group) => { test('execute select queries', async (assert) => { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -87,7 +87,7 @@ test.group('Model query builder', (group) => { test('pass custom connection to the model instance', async (assert) => { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -106,7 +106,7 @@ test.group('Model query builder', (group) => { test('pass sideloaded attributes to the model instance', async (assert) => { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -129,7 +129,7 @@ test.group('Model query builder', (group) => { test('pass custom profiler to the model instance', async (assert) => { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -149,7 +149,7 @@ test.group('Model query builder', (group) => { test('perform update using model query builder', async (assert) => { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -169,7 +169,7 @@ test.group('Model query builder', (group) => { test('perform increment using model query builder', async (assert) => { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -189,7 +189,7 @@ test.group('Model query builder', (group) => { test('perform decrement using model query builder', async (assert) => { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column() @@ -209,7 +209,7 @@ test.group('Model query builder', (group) => { test('delete in bulk', async (assert) => { class User extends BaseModel { - @column({ primary: true }) + @column({ isPrimary: true }) public id: number @column()