Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

adding options on refresh() method (Fixing issue #649) #650

Closed
wants to merge 8 commits into from
Closed

adding options on refresh() method (Fixing issue #649) #650

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d69d265
adding options on refresh() method
risgo Feb 11, 2021
525c89e
es lint no shadow
risgo Feb 11, 2021
ca2858c
Refresh method using $trx and test on trx
risgo Feb 13, 2021
19221be
Revert "es lint no shadow"
risgo Feb 13, 2021
4583a8f
refactor: refresh method
urishabh11 Feb 13, 2021
fbb10be
Fixing no shallow(es lint errors) on example and FactoryModel.ts
risgo Feb 13, 2021
1ee6784
Fixing es lint errors on example and FactoryModel.ts
risgo Feb 13, 2021
57c8f66
Merge branch 'develop' of https://github.com/urishabh11/lucid into de…
risgo Feb 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .eslintrc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
"rules": {
"prettier/prettier": [
"error"
]
],
urishabh11 marked this conversation as resolved.
Show resolved Hide resolved
"no-shadow": "off",
"@typescript-eslint/no-shadow": ["error"]
}
}
2 changes: 1 addition & 1 deletion adonis-typings/model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,7 +542,7 @@ declare module '@ioc:Adonis/Lucid/Model' {
merge(value: Partial<ModelAttributes<this>>, allowNonExtraProperties?: boolean): this
save(): Promise<this>
delete(): Promise<void>
refresh(): Promise<this>
refresh(options?: ModelAdapterOptions): Promise<this>
load: LucidRowPreload<this>
preload: LucidRowPreload<this>

Expand Down
4 changes: 2 additions & 2 deletions src/Orm/BaseModel/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1888,7 +1888,7 @@ export class BaseModel implements LucidRow {
/**
* Reload/Refresh the model instance
*/
public async refresh() {
public async refresh(options?: ModelAdapterOptions) {
urishabh11 marked this conversation as resolved.
Show resolved Hide resolved
this.ensureIsntDeleted()
const modelConstructor = this.constructor as typeof BaseModel
const { table } = modelConstructor
Expand All @@ -1908,7 +1908,7 @@ export class BaseModel implements LucidRow {
* This will occur, when some other part of the application removes
* the row
*/
const freshModelInstance = await modelConstructor.find(this.$primaryKeyValue)
const freshModelInstance = await modelConstructor.find(this.$primaryKeyValue, options)
if (!freshModelInstance) {
throw new Exception(
[
Expand Down