Skip to content

Commit e9a952d

Browse files
glennmichael123glennmichael123
committed
chore: wip
1 parent 8038ed6 commit e9a952d

File tree

10 files changed

+53
-77
lines changed

10 files changed

+53
-77
lines changed

‎storage/framework/core/actions/src/orm/generate-model.ts

Lines changed: 16 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -669,17 +669,16 @@ async function generateModelString(
669669
throw new Error('Relation Error!')
670670
671671
const firstModel = await db.selectFrom('${throughTableRelation}')
672-
.where('${foreignKeyRelation}', '=', this.id)
673-
.selectAll()
674-
.executeTakeFirst()
672+
.where('${foreignKeyRelation}', '=', this.id)
673+
.selectAll()
674+
.executeTakeFirst()
675675
676676
if (! firstModel)
677677
throw new Error('Model Relation Not Found!')
678678
679-
const finalModel = await db.selectFrom('${tableRelation}')
680-
.where('${foreignKeyThroughRelation}', '=', firstModel.id)
681-
.selectAll()
682-
.executeTakeFirst()
679+
const finalModel = ${modelRelation}
680+
.where('${foreignKeyThroughRelation}', '=', firstModel.id)
681+
.first()
683682
684683
return new ${modelRelation}.modelInstance(finalModel)
685684
}\n\n`
@@ -709,15 +708,13 @@ async function generateModelString(
709708
if (this.id === undefined)
710709
throw new Error('Relation Error!')
711710
712-
const model = await db.selectFrom('${tableRelation}')
713-
.where('${foreignKeyRelation}', '=', this.id)
714-
.selectAll()
715-
.executeTakeFirst()
711+
const model = ${modelRelation}
712+
.where('${foreignKeyRelation}', '=', this.id).first()
716713
717714
if (! model)
718715
throw new Error('Model Relation Not Found!')
719716
720-
return new ${modelRelation}.modelInstance(model)
717+
return model
721718
}\n\n`
722719
}
723720

@@ -729,15 +726,14 @@ async function generateModelString(
729726
if (this.${foreignKeyRelation} === undefined)
730727
throw new Error('Relation Error!')
731728
732-
const model = await db.selectFrom('${tableRelation}')
733-
.where('id', '=', ${foreignKeyRelation})
734-
.selectAll()
735-
.executeTakeFirst()
729+
const model = await ${modelRelation}
730+
.where('id', '=', ${foreignKeyRelation})
731+
.first()
736732
737733
if (! model)
738734
throw new Error('Model Relation Not Found!')
739735
740-
return new ${modelRelation}.modelInstance(model)
736+
return model
741737
}\n\n`
742738
}
743739

@@ -985,7 +981,7 @@ async function generateModelString(
985981
.execute()
986982
}
987983
988-
async where(...args: (string | number)[]): Promise<${modelName}Type[]> {
984+
where(...args: (string | number)[]): ${modelName}Model {
989985
let column: any
990986
let operator: any
991987
let value: any
@@ -999,11 +995,9 @@ async function generateModelString(
999995
throw new Error("Invalid number of arguments")
1000996
}
1001997
1002-
let query = db.selectFrom('${tableName}')
1003-
1004-
query = query.where(column, operator, value)
998+
this.query = this.query.where(column, operator, value)
1005999
1006-
return await query.selectAll()
1000+
return this
10071001
}
10081002
10091003
static where(...args: (string | number)[]): ${modelName}Model {

‎storage/framework/orm/src/models/AccessToken.ts

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ export class AccessTokenModel {
203203
await db.deleteFrom('personal_access_tokens').where('id', '=', id).execute()
204204
}
205205

206-
async where(...args: (string | number)[]): Promise<AccessTokenType[]> {
206+
where(...args: (string | number)[]): AccessTokenModel {
207207
let column: any
208208
let operator: any
209209
let value: any
@@ -217,11 +217,9 @@ export class AccessTokenModel {
217217
throw new Error('Invalid number of arguments')
218218
}
219219

220-
let query = db.selectFrom('personal_access_tokens')
221-
222-
query = query.where(column, operator, value)
220+
this.query = this.query.where(column, operator, value)
223221

224-
return await query.selectAll()
222+
return this
225223
}
226224

227225
static where(...args: (string | number)[]): AccessTokenModel {
@@ -348,11 +346,11 @@ export class AccessTokenModel {
348346
async team() {
349347
if (this.id === undefined) throw new Error('Relation Error!')
350348

351-
const model = await db.selectFrom('teams').where('accesstoken_id', '=', this.id).selectAll().executeTakeFirst()
349+
const model = Team.where('accesstoken_id', '=', this.id).first()
352350

353351
if (!model) throw new Error('Model Relation Not Found!')
354352

355-
return new Team.modelInstance(model)
353+
return model
356354
}
357355

358356
toJSON() {

‎storage/framework/orm/src/models/Deployment.ts

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ export class DeploymentModel {
211211
await db.deleteFrom('deployments').where('id', '=', id).execute()
212212
}
213213

214-
async where(...args: (string | number)[]): Promise<DeploymentType[]> {
214+
where(...args: (string | number)[]): DeploymentModel {
215215
let column: any
216216
let operator: any
217217
let value: any
@@ -225,11 +225,9 @@ export class DeploymentModel {
225225
throw new Error('Invalid number of arguments')
226226
}
227227

228-
let query = db.selectFrom('deployments')
229-
230-
query = query.where(column, operator, value)
228+
this.query = this.query.where(column, operator, value)
231229

232-
return await query.selectAll()
230+
return this
233231
}
234232

235233
static where(...args: (string | number)[]): DeploymentModel {
@@ -356,11 +354,11 @@ export class DeploymentModel {
356354
async user() {
357355
if (this.deployment_id === undefined) throw new Error('Relation Error!')
358356

359-
const model = await db.selectFrom('users').where('id', '=', deployment_id).selectAll().executeTakeFirst()
357+
const model = await User.where('id', '=', deployment_id).first()
360358

361359
if (!model) throw new Error('Model Relation Not Found!')
362360

363-
return new User.modelInstance(model)
361+
return model
364362
}
365363

366364
toJSON() {

‎storage/framework/orm/src/models/Post.ts

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ export class PostModel {
196196
await db.deleteFrom('posts').where('id', '=', id).execute()
197197
}
198198

199-
async where(...args: (string | number)[]): Promise<PostType[]> {
199+
where(...args: (string | number)[]): PostModel {
200200
let column: any
201201
let operator: any
202202
let value: any
@@ -210,11 +210,9 @@ export class PostModel {
210210
throw new Error('Invalid number of arguments')
211211
}
212212

213-
let query = db.selectFrom('posts')
214-
215-
query = query.where(column, operator, value)
213+
this.query = this.query.where(column, operator, value)
216214

217-
return await query.selectAll()
215+
return this
218216
}
219217

220218
static where(...args: (string | number)[]): PostModel {
@@ -337,11 +335,11 @@ export class PostModel {
337335
async user() {
338336
if (this.post_id === undefined) throw new Error('Relation Error!')
339337

340-
const model = await db.selectFrom('users').where('id', '=', post_id).selectAll().executeTakeFirst()
338+
const model = await User.where('id', '=', post_id).first()
341339

342340
if (!model) throw new Error('Model Relation Not Found!')
343341

344-
return new User.modelInstance(model)
342+
return model
345343
}
346344

347345
toJSON() {

‎storage/framework/orm/src/models/Project.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ export class ProjectModel {
198198
await db.deleteFrom('projects').where('id', '=', id).execute()
199199
}
200200

201-
async where(...args: (string | number)[]): Promise<ProjectType[]> {
201+
where(...args: (string | number)[]): ProjectModel {
202202
let column: any
203203
let operator: any
204204
let value: any
@@ -212,11 +212,9 @@ export class ProjectModel {
212212
throw new Error('Invalid number of arguments')
213213
}
214214

215-
let query = db.selectFrom('projects')
216-
217-
query = query.where(column, operator, value)
215+
this.query = this.query.where(column, operator, value)
218216

219-
return await query.selectAll()
217+
return this
220218
}
221219

222220
static where(...args: (string | number)[]): ProjectModel {

‎storage/framework/orm/src/models/Release.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ export class ReleaseModel {
189189
await db.deleteFrom('releases').where('id', '=', id).execute()
190190
}
191191

192-
async where(...args: (string | number)[]): Promise<ReleaseType[]> {
192+
where(...args: (string | number)[]): ReleaseModel {
193193
let column: any
194194
let operator: any
195195
let value: any
@@ -203,11 +203,9 @@ export class ReleaseModel {
203203
throw new Error('Invalid number of arguments')
204204
}
205205

206-
let query = db.selectFrom('releases')
207-
208-
query = query.where(column, operator, value)
206+
this.query = this.query.where(column, operator, value)
209207

210-
return await query.selectAll()
208+
return this
211209
}
212210

213211
static where(...args: (string | number)[]): ReleaseModel {

‎storage/framework/orm/src/models/Subscriber.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ export class SubscriberModel {
192192
await db.deleteFrom('subscribers').where('id', '=', id).execute()
193193
}
194194

195-
async where(...args: (string | number)[]): Promise<SubscriberType[]> {
195+
where(...args: (string | number)[]): SubscriberModel {
196196
let column: any
197197
let operator: any
198198
let value: any
@@ -206,11 +206,9 @@ export class SubscriberModel {
206206
throw new Error('Invalid number of arguments')
207207
}
208208

209-
let query = db.selectFrom('subscribers')
210-
211-
query = query.where(column, operator, value)
209+
this.query = this.query.where(column, operator, value)
212210

213-
return await query.selectAll()
211+
return this
214212
}
215213

216214
static where(...args: (string | number)[]): SubscriberModel {

‎storage/framework/orm/src/models/SubscriberEmail.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ export class SubscriberEmailModel {
189189
await db.deleteFrom('subscriber_emails').where('id', '=', id).execute()
190190
}
191191

192-
async where(...args: (string | number)[]): Promise<SubscriberEmailType[]> {
192+
where(...args: (string | number)[]): SubscriberEmailModel {
193193
let column: any
194194
let operator: any
195195
let value: any
@@ -203,11 +203,9 @@ export class SubscriberEmailModel {
203203
throw new Error('Invalid number of arguments')
204204
}
205205

206-
let query = db.selectFrom('subscriber_emails')
207-
208-
query = query.where(column, operator, value)
206+
this.query = this.query.where(column, operator, value)
209207

210-
return await query.selectAll()
208+
return this
211209
}
212210

213211
static where(...args: (string | number)[]): SubscriberEmailModel {

‎storage/framework/orm/src/models/Team.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ export class TeamModel {
214214
await db.deleteFrom('teams').where('id', '=', id).execute()
215215
}
216216

217-
async where(...args: (string | number)[]): Promise<TeamType[]> {
217+
where(...args: (string | number)[]): TeamModel {
218218
let column: any
219219
let operator: any
220220
let value: any
@@ -228,11 +228,9 @@ export class TeamModel {
228228
throw new Error('Invalid number of arguments')
229229
}
230230

231-
let query = db.selectFrom('teams')
232-
233-
query = query.where(column, operator, value)
231+
this.query = this.query.where(column, operator, value)
234232

235-
return await query.selectAll()
233+
return this
236234
}
237235

238236
static where(...args: (string | number)[]): TeamModel {

‎storage/framework/orm/src/models/User.ts

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ export class UserModel {
209209
await db.deleteFrom('users').where('id', '=', id).execute()
210210
}
211211

212-
async where(...args: (string | number)[]): Promise<UserType[]> {
212+
where(...args: (string | number)[]): UserModel {
213213
let column: any
214214
let operator: any
215215
let value: any
@@ -223,11 +223,9 @@ export class UserModel {
223223
throw new Error('Invalid number of arguments')
224224
}
225225

226-
let query = db.selectFrom('users')
227-
228-
query = query.where(column, operator, value)
226+
this.query = this.query.where(column, operator, value)
229227

230-
return await query.selectAll()
228+
return this
231229
}
232230

233231
static where(...args: (string | number)[]): UserModel {
@@ -350,21 +348,21 @@ export class UserModel {
350348
async post() {
351349
if (this.id === undefined) throw new Error('Relation Error!')
352350

353-
const model = await db.selectFrom('posts').where('user_id', '=', this.id).selectAll().executeTakeFirst()
351+
const model = Post.where('user_id', '=', this.id).first()
354352

355353
if (!model) throw new Error('Model Relation Not Found!')
356354

357-
return new Post.modelInstance(model)
355+
return model
358356
}
359357

360358
async subscriber() {
361359
if (this.id === undefined) throw new Error('Relation Error!')
362360

363-
const model = await db.selectFrom('subscribers').where('user_id', '=', this.id).selectAll().executeTakeFirst()
361+
const model = Subscriber.where('user_id', '=', this.id).first()
364362

365363
if (!model) throw new Error('Model Relation Not Found!')
366364

367-
return new Subscriber.modelInstance(model)
365+
return model
368366
}
369367

370368
async deployments() {

0 commit comments

Comments
 (0)