Skip to content

Commit f567483

Browse files
glennmichael123glennmichael123
committed
chore: wip
1 parent 654b854 commit f567483

19 files changed

+498
-246
lines changed

‎storage/framework/core/orm/src/generate.ts

+30-16
Original file line numberDiff line numberDiff line change
@@ -1791,20 +1791,24 @@ export async function generateModelString(
17911791
return instance
17921792
}
17931793
1794+
applyWhereNotIn(column: keyof ${modelName}Type, values: any[]): ${modelName}Model {
1795+
this.selectFromQuery = this.selectFromQuery.where(column, 'not in', values)
1796+
1797+
this.updateFromQuery = this.updateFromQuery.where(column, 'not in', values)
1798+
1799+
this.deleteFromQuery = this.deleteFromQuery.where(column, 'not in', values)
1800+
1801+
return this
1802+
}
1803+
17941804
whereNotIn(column: keyof ${modelName}Type, values: any[]): ${modelName}Model {
1795-
return ${modelName}Model.whereNotIn(column, values)
1805+
return this.applyWhereNotIn(column, values)
17961806
}
17971807
17981808
static whereNotIn(column: keyof ${modelName}Type, values: any[]): ${modelName}Model {
17991809
const instance = new ${modelName}Model(null)
18001810
1801-
instance.selectFromQuery = instance.selectFromQuery.where(column, 'not in', values)
1802-
1803-
instance.updateFromQuery = instance.updateFromQuery.where(column, 'not in', values)
1804-
1805-
instance.deleteFromQuery = instance.deleteFromQuery.where(column, 'not in', values)
1806-
1807-
return instance
1811+
return instance.applyWhereNotIn(column, values)
18081812
}
18091813
18101814
async exists(): Promise<boolean> {
@@ -1930,14 +1934,16 @@ export async function generateModelString(
19301934
}
19311935
19321936
with(relations: string[]): ${modelName}Model {
1933-
return ${modelName}Model.with(relations)
1937+
this.withRelations = relations
1938+
1939+
return this
19341940
}
19351941
19361942
static with(relations: string[]): ${modelName}Model {
1937-
const instance = new ${modelName}Model(null)
1938-
1943+
const instance = new ${modelName}Model(null)
1944+
19391945
instance.withRelations = relations
1940-
1946+
19411947
return instance
19421948
}
19431949
@@ -1964,7 +1970,9 @@ export async function generateModelString(
19641970
}
19651971
19661972
orderBy(column: keyof ${modelName}Type, order: 'asc' | 'desc'): ${modelName}Model {
1967-
return ${modelName}Model.orderBy(column, order)
1973+
this.selectFromQuery = this.selectFromQuery.orderBy(column, order)
1974+
1975+
return this
19681976
}
19691977
19701978
static orderBy(column: keyof ${modelName}Type, order: 'asc' | 'desc'): ${modelName}Model {
@@ -1976,7 +1984,9 @@ export async function generateModelString(
19761984
}
19771985
19781986
groupBy(column: keyof ${modelName}Type): ${modelName}Model {
1979-
return ${modelName}Model.groupBy(column)
1987+
this.selectFromQuery = this.selectFromQuery.groupBy(column)
1988+
1989+
return this
19801990
}
19811991
19821992
static groupBy(column: keyof ${modelName}Type): ${modelName}Model {
@@ -2002,7 +2012,9 @@ export async function generateModelString(
20022012
}
20032013
20042014
inRandomOrder(): ${modelName}Model {
2005-
return ${modelName}Model.inRandomOrder()
2015+
this.selectFromQuery = this.selectFromQuery.orderBy(sql\` \${sql.raw('RANDOM()')} \`)
2016+
2017+
return this
20062018
}
20072019
20082020
static inRandomOrder(): ${modelName}Model {
@@ -2028,7 +2040,9 @@ export async function generateModelString(
20282040
}
20292041
20302042
orderByAsc(column: keyof ${modelName}Type): ${modelName}Model {
2031-
return ${modelName}Model.orderByAsc(column)
2043+
this.selectFromQuery = this.selectFromQuery.orderBy(column, 'asc')
2044+
2045+
return this
20322046
}
20332047
20342048
static orderByAsc(column: keyof ${modelName}Type): ${modelName}Model {

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

+27-13
Original file line numberDiff line numberDiff line change
@@ -1038,20 +1038,24 @@ export class AccessTokenModel {
10381038
return instance
10391039
}
10401040

1041+
applyWhereNotIn(column: keyof AccessTokenType, values: any[]): AccessTokenModel {
1042+
this.selectFromQuery = this.selectFromQuery.where(column, 'not in', values)
1043+
1044+
this.updateFromQuery = this.updateFromQuery.where(column, 'not in', values)
1045+
1046+
this.deleteFromQuery = this.deleteFromQuery.where(column, 'not in', values)
1047+
1048+
return this
1049+
}
1050+
10411051
whereNotIn(column: keyof AccessTokenType, values: any[]): AccessTokenModel {
1042-
return AccessTokenModel.whereNotIn(column, values)
1052+
return this.applyWhereNotIn(column, values)
10431053
}
10441054

10451055
static whereNotIn(column: keyof AccessTokenType, values: any[]): AccessTokenModel {
10461056
const instance = new AccessTokenModel(null)
10471057

1048-
instance.selectFromQuery = instance.selectFromQuery.where(column, 'not in', values)
1049-
1050-
instance.updateFromQuery = instance.updateFromQuery.where(column, 'not in', values)
1051-
1052-
instance.deleteFromQuery = instance.deleteFromQuery.where(column, 'not in', values)
1053-
1054-
return instance
1058+
return instance.applyWhereNotIn(column, values)
10551059
}
10561060

10571061
async exists(): Promise<boolean> {
@@ -1178,7 +1182,9 @@ export class AccessTokenModel {
11781182
}
11791183

11801184
with(relations: string[]): AccessTokenModel {
1181-
return AccessTokenModel.with(relations)
1185+
this.withRelations = relations
1186+
1187+
return this
11821188
}
11831189

11841190
static with(relations: string[]): AccessTokenModel {
@@ -1212,7 +1218,9 @@ export class AccessTokenModel {
12121218
}
12131219

12141220
orderBy(column: keyof AccessTokenType, order: 'asc' | 'desc'): AccessTokenModel {
1215-
return AccessTokenModel.orderBy(column, order)
1221+
this.selectFromQuery = this.selectFromQuery.orderBy(column, order)
1222+
1223+
return this
12161224
}
12171225

12181226
static orderBy(column: keyof AccessTokenType, order: 'asc' | 'desc'): AccessTokenModel {
@@ -1224,7 +1232,9 @@ export class AccessTokenModel {
12241232
}
12251233

12261234
groupBy(column: keyof AccessTokenType): AccessTokenModel {
1227-
return AccessTokenModel.groupBy(column)
1235+
this.selectFromQuery = this.selectFromQuery.groupBy(column)
1236+
1237+
return this
12281238
}
12291239

12301240
static groupBy(column: keyof AccessTokenType): AccessTokenModel {
@@ -1250,7 +1260,9 @@ export class AccessTokenModel {
12501260
}
12511261

12521262
inRandomOrder(): AccessTokenModel {
1253-
return AccessTokenModel.inRandomOrder()
1263+
this.selectFromQuery = this.selectFromQuery.orderBy(sql` ${sql.raw('RANDOM()')} `)
1264+
1265+
return this
12541266
}
12551267

12561268
static inRandomOrder(): AccessTokenModel {
@@ -1276,7 +1288,9 @@ export class AccessTokenModel {
12761288
}
12771289

12781290
orderByAsc(column: keyof AccessTokenType): AccessTokenModel {
1279-
return AccessTokenModel.orderByAsc(column)
1291+
this.selectFromQuery = this.selectFromQuery.orderBy(column, 'asc')
1292+
1293+
return this
12801294
}
12811295

12821296
static orderByAsc(column: keyof AccessTokenType): AccessTokenModel {

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

+27-13
Original file line numberDiff line numberDiff line change
@@ -1084,20 +1084,24 @@ export class ActivityModel {
10841084
return instance
10851085
}
10861086

1087+
applyWhereNotIn(column: keyof ActivityType, values: any[]): ActivityModel {
1088+
this.selectFromQuery = this.selectFromQuery.where(column, 'not in', values)
1089+
1090+
this.updateFromQuery = this.updateFromQuery.where(column, 'not in', values)
1091+
1092+
this.deleteFromQuery = this.deleteFromQuery.where(column, 'not in', values)
1093+
1094+
return this
1095+
}
1096+
10871097
whereNotIn(column: keyof ActivityType, values: any[]): ActivityModel {
1088-
return ActivityModel.whereNotIn(column, values)
1098+
return this.applyWhereNotIn(column, values)
10891099
}
10901100

10911101
static whereNotIn(column: keyof ActivityType, values: any[]): ActivityModel {
10921102
const instance = new ActivityModel(null)
10931103

1094-
instance.selectFromQuery = instance.selectFromQuery.where(column, 'not in', values)
1095-
1096-
instance.updateFromQuery = instance.updateFromQuery.where(column, 'not in', values)
1097-
1098-
instance.deleteFromQuery = instance.deleteFromQuery.where(column, 'not in', values)
1099-
1100-
return instance
1104+
return instance.applyWhereNotIn(column, values)
11011105
}
11021106

11031107
async exists(): Promise<boolean> {
@@ -1224,7 +1228,9 @@ export class ActivityModel {
12241228
}
12251229

12261230
with(relations: string[]): ActivityModel {
1227-
return ActivityModel.with(relations)
1231+
this.withRelations = relations
1232+
1233+
return this
12281234
}
12291235

12301236
static with(relations: string[]): ActivityModel {
@@ -1258,7 +1264,9 @@ export class ActivityModel {
12581264
}
12591265

12601266
orderBy(column: keyof ActivityType, order: 'asc' | 'desc'): ActivityModel {
1261-
return ActivityModel.orderBy(column, order)
1267+
this.selectFromQuery = this.selectFromQuery.orderBy(column, order)
1268+
1269+
return this
12621270
}
12631271

12641272
static orderBy(column: keyof ActivityType, order: 'asc' | 'desc'): ActivityModel {
@@ -1270,7 +1278,9 @@ export class ActivityModel {
12701278
}
12711279

12721280
groupBy(column: keyof ActivityType): ActivityModel {
1273-
return ActivityModel.groupBy(column)
1281+
this.selectFromQuery = this.selectFromQuery.groupBy(column)
1282+
1283+
return this
12741284
}
12751285

12761286
static groupBy(column: keyof ActivityType): ActivityModel {
@@ -1296,7 +1306,9 @@ export class ActivityModel {
12961306
}
12971307

12981308
inRandomOrder(): ActivityModel {
1299-
return ActivityModel.inRandomOrder()
1309+
this.selectFromQuery = this.selectFromQuery.orderBy(sql` ${sql.raw('RANDOM()')} `)
1310+
1311+
return this
13001312
}
13011313

13021314
static inRandomOrder(): ActivityModel {
@@ -1322,7 +1334,9 @@ export class ActivityModel {
13221334
}
13231335

13241336
orderByAsc(column: keyof ActivityType): ActivityModel {
1325-
return ActivityModel.orderByAsc(column)
1337+
this.selectFromQuery = this.selectFromQuery.orderBy(column, 'asc')
1338+
1339+
return this
13261340
}
13271341

13281342
static orderByAsc(column: keyof ActivityType): ActivityModel {

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

+27-13
Original file line numberDiff line numberDiff line change
@@ -1103,20 +1103,24 @@ export class DeploymentModel {
11031103
return instance
11041104
}
11051105

1106+
applyWhereNotIn(column: keyof DeploymentType, values: any[]): DeploymentModel {
1107+
this.selectFromQuery = this.selectFromQuery.where(column, 'not in', values)
1108+
1109+
this.updateFromQuery = this.updateFromQuery.where(column, 'not in', values)
1110+
1111+
this.deleteFromQuery = this.deleteFromQuery.where(column, 'not in', values)
1112+
1113+
return this
1114+
}
1115+
11061116
whereNotIn(column: keyof DeploymentType, values: any[]): DeploymentModel {
1107-
return DeploymentModel.whereNotIn(column, values)
1117+
return this.applyWhereNotIn(column, values)
11081118
}
11091119

11101120
static whereNotIn(column: keyof DeploymentType, values: any[]): DeploymentModel {
11111121
const instance = new DeploymentModel(null)
11121122

1113-
instance.selectFromQuery = instance.selectFromQuery.where(column, 'not in', values)
1114-
1115-
instance.updateFromQuery = instance.updateFromQuery.where(column, 'not in', values)
1116-
1117-
instance.deleteFromQuery = instance.deleteFromQuery.where(column, 'not in', values)
1118-
1119-
return instance
1123+
return instance.applyWhereNotIn(column, values)
11201124
}
11211125

11221126
async exists(): Promise<boolean> {
@@ -1243,7 +1247,9 @@ export class DeploymentModel {
12431247
}
12441248

12451249
with(relations: string[]): DeploymentModel {
1246-
return DeploymentModel.with(relations)
1250+
this.withRelations = relations
1251+
1252+
return this
12471253
}
12481254

12491255
static with(relations: string[]): DeploymentModel {
@@ -1277,7 +1283,9 @@ export class DeploymentModel {
12771283
}
12781284

12791285
orderBy(column: keyof DeploymentType, order: 'asc' | 'desc'): DeploymentModel {
1280-
return DeploymentModel.orderBy(column, order)
1286+
this.selectFromQuery = this.selectFromQuery.orderBy(column, order)
1287+
1288+
return this
12811289
}
12821290

12831291
static orderBy(column: keyof DeploymentType, order: 'asc' | 'desc'): DeploymentModel {
@@ -1289,7 +1297,9 @@ export class DeploymentModel {
12891297
}
12901298

12911299
groupBy(column: keyof DeploymentType): DeploymentModel {
1292-
return DeploymentModel.groupBy(column)
1300+
this.selectFromQuery = this.selectFromQuery.groupBy(column)
1301+
1302+
return this
12931303
}
12941304

12951305
static groupBy(column: keyof DeploymentType): DeploymentModel {
@@ -1315,7 +1325,9 @@ export class DeploymentModel {
13151325
}
13161326

13171327
inRandomOrder(): DeploymentModel {
1318-
return DeploymentModel.inRandomOrder()
1328+
this.selectFromQuery = this.selectFromQuery.orderBy(sql` ${sql.raw('RANDOM()')} `)
1329+
1330+
return this
13191331
}
13201332

13211333
static inRandomOrder(): DeploymentModel {
@@ -1341,7 +1353,9 @@ export class DeploymentModel {
13411353
}
13421354

13431355
orderByAsc(column: keyof DeploymentType): DeploymentModel {
1344-
return DeploymentModel.orderByAsc(column)
1356+
this.selectFromQuery = this.selectFromQuery.orderBy(column, 'asc')
1357+
1358+
return this
13451359
}
13461360

13471361
static orderByAsc(column: keyof DeploymentType): DeploymentModel {

0 commit comments

Comments
 (0)