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

adonis-typings/model.ts

@@ -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(options?: ModelAdapterOptions): Promise<this>
+		refresh(): Promise<this>
 		load: LucidRowPreload<this>
 		preload: LucidRowPreload<this>
 

src/Orm/BaseModel/index.ts

@@ -1888,7 +1888,7 @@ export class BaseModel implements LucidRow {
 	/**
 	 * Reload/Refresh the model instance
 	 */
-	public async refresh(options?: ModelAdapterOptions) {
+	public async refresh() {
 		this.ensureIsntDeleted()
 		const modelConstructor = this.constructor as typeof BaseModel
 		const { table } = modelConstructor
@@ -1908,7 +1908,10 @@ 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, options)
+
+		const freshModelInstance = await modelConstructor.find(this.$primaryKeyValue, {
+			client: this.$trx,
+		})
 		if (!freshModelInstance) {
 			throw new Exception(
 				[

test/orm/base-model.spec.ts

@@ -142,6 +142,34 @@ test.group('Base model | boot', (group) => {
 
 		assert.instanceOf(chained, User)
 	})
+	test('ensure refresh works on trx', async (assert) => {
+		class User extends BaseModel {
+			@column({ isPrimary: true })
+			public id: number
+
+			@column()
+			public username: string
+
+			@column()
+			public age: number
+		}
+
+		const user = await User.firstOrCreate({ username: 'virik' })
+
+		const trx = await db.transaction()
+
+		user.useTransaction(trx)
+
+		user.username = 'virik2'
+
+		await user.save()
+
+		await user.refresh()
+
+		await trx.rollback()
+
+		assert.equal(user.username, 'virik2')
+	})
 
 	test('compute table name from model name', async (assert) => {
 		class User extends BaseModel {