Skip to content

Commit 94460de

Browse files
glennmichael123glennmichael123
committed
chore: wip
1 parent 70293e0 commit 94460de

File tree

18 files changed

+36
-72
lines changed

18 files changed

+36
-72
lines changed

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1936,19 +1936,17 @@ export async function generateModelString(
19361936
.execute()
19371937
19381938
if (Array.isArray(models)) {
1939-
// If array, map through all models
19401939
models.map((model: ${modelName}Model) => {
19411940
const records = relatedRecords.filter((record: any) => {
1942-
return record.${formattedModelName}__id === model.id
1941+
return record.${formattedModelName}_id === model.id
19431942
})
19441943
19451944
model[relation] = records.length === 1 ? records[0] : records
19461945
return model
19471946
})
19481947
} else {
1949-
// If single model, just filter once
19501948
const records = relatedRecords.filter((record: any) => {
1951-
return record.${formattedModelName}__id === models.id
1949+
return record.${formattedModelName}_id === models.id
19521950
})
19531951
19541952
models[relation] = records.length === 1 ? records[0] : records

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1192,20 +1192,18 @@ export class AccessTokenModel {
11921192
.execute()
11931193

11941194
if (Array.isArray(models)) {
1195-
// If array, map through all models
11961195
models.map((model: AccessTokenModel) => {
11971196
const records = relatedRecords.filter((record: any) => {
1198-
return record.accesstoken__id === model.id
1197+
return record.accesstoken_id === model.id
11991198
})
12001199

12011200
model[relation] = records.length === 1 ? records[0] : records
12021201
return model
12031202
})
12041203
}
12051204
else {
1206-
// If single model, just filter once
12071205
const records = relatedRecords.filter((record: any) => {
1208-
return record.accesstoken__id === models.id
1206+
return record.accesstoken_id === models.id
12091207
})
12101208

12111209
models[relation] = records.length === 1 ? records[0] : records

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1242,20 +1242,18 @@ export class ActivityModel {
12421242
.execute()
12431243

12441244
if (Array.isArray(models)) {
1245-
// If array, map through all models
12461245
models.map((model: ActivityModel) => {
12471246
const records = relatedRecords.filter((record: any) => {
1248-
return record.activity__id === model.id
1247+
return record.activity_id === model.id
12491248
})
12501249

12511250
model[relation] = records.length === 1 ? records[0] : records
12521251
return model
12531252
})
12541253
}
12551254
else {
1256-
// If single model, just filter once
12571255
const records = relatedRecords.filter((record: any) => {
1258-
return record.activity__id === models.id
1256+
return record.activity_id === models.id
12591257
})
12601258

12611259
models[relation] = records.length === 1 ? records[0] : records

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1257,20 +1257,18 @@ export class DeploymentModel {
12571257
.execute()
12581258

12591259
if (Array.isArray(models)) {
1260-
// If array, map through all models
12611260
models.map((model: DeploymentModel) => {
12621261
const records = relatedRecords.filter((record: any) => {
1263-
return record.deployment__id === model.id
1262+
return record.deployment_id === model.id
12641263
})
12651264

12661265
model[relation] = records.length === 1 ? records[0] : records
12671266
return model
12681267
})
12691268
}
12701269
else {
1271-
// If single model, just filter once
12721270
const records = relatedRecords.filter((record: any) => {
1273-
return record.deployment__id === models.id
1271+
return record.deployment_id === models.id
12741272
})
12751273

12761274
models[relation] = records.length === 1 ? records[0] : records

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1196,20 +1196,18 @@ export class ErrorModel {
11961196
.execute()
11971197

11981198
if (Array.isArray(models)) {
1199-
// If array, map through all models
12001199
models.map((model: ErrorModel) => {
12011200
const records = relatedRecords.filter((record: any) => {
1202-
return record.error__id === model.id
1201+
return record.error_id === model.id
12031202
})
12041203

12051204
model[relation] = records.length === 1 ? records[0] : records
12061205
return model
12071206
})
12081207
}
12091208
else {
1210-
// If single model, just filter once
12111209
const records = relatedRecords.filter((record: any) => {
1212-
return record.error__id === models.id
1210+
return record.error_id === models.id
12131211
})
12141212

12151213
models[relation] = records.length === 1 ? records[0] : records

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1196,20 +1196,18 @@ export class FailedJobModel {
11961196
.execute()
11971197

11981198
if (Array.isArray(models)) {
1199-
// If array, map through all models
12001199
models.map((model: FailedJobModel) => {
12011200
const records = relatedRecords.filter((record: any) => {
1202-
return record.failedjob__id === model.id
1201+
return record.failedjob_id === model.id
12031202
})
12041203

12051204
model[relation] = records.length === 1 ? records[0] : records
12061205
return model
12071206
})
12081207
}
12091208
else {
1210-
// If single model, just filter once
12111209
const records = relatedRecords.filter((record: any) => {
1212-
return record.failedjob__id === models.id
1210+
return record.failedjob_id === models.id
12131211
})
12141212

12151213
models[relation] = records.length === 1 ? records[0] : records

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1196,20 +1196,18 @@ export class JobModel {
11961196
.execute()
11971197

11981198
if (Array.isArray(models)) {
1199-
// If array, map through all models
12001199
models.map((model: JobModel) => {
12011200
const records = relatedRecords.filter((record: any) => {
1202-
return record.job__id === model.id
1201+
return record.job_id === model.id
12031202
})
12041203

12051204
model[relation] = records.length === 1 ? records[0] : records
12061205
return model
12071206
})
12081207
}
12091208
else {
1210-
// If single model, just filter once
12111209
const records = relatedRecords.filter((record: any) => {
1212-
return record.job__id === models.id
1210+
return record.job_id === models.id
12131211
})
12141212

12151213
models[relation] = records.length === 1 ? records[0] : records

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1266,20 +1266,18 @@ export class PaymentMethodModel {
12661266
.execute()
12671267

12681268
if (Array.isArray(models)) {
1269-
// If array, map through all models
12701269
models.map((model: PaymentMethodModel) => {
12711270
const records = relatedRecords.filter((record: any) => {
1272-
return record.paymentmethod__id === model.id
1271+
return record.paymentmethod_id === model.id
12731272
})
12741273

12751274
model[relation] = records.length === 1 ? records[0] : records
12761275
return model
12771276
})
12781277
}
12791278
else {
1280-
// If single model, just filter once
12811279
const records = relatedRecords.filter((record: any) => {
1282-
return record.paymentmethod__id === models.id
1280+
return record.paymentmethod_id === models.id
12831281
})
12841282

12851283
models[relation] = records.length === 1 ? records[0] : records

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1158,20 +1158,18 @@ export class PostModel {
11581158
.execute()
11591159

11601160
if (Array.isArray(models)) {
1161-
// If array, map through all models
11621161
models.map((model: PostModel) => {
11631162
const records = relatedRecords.filter((record: any) => {
1164-
return record.post__id === model.id
1163+
return record.post_id === model.id
11651164
})
11661165

11671166
model[relation] = records.length === 1 ? records[0] : records
11681167
return model
11691168
})
11701169
}
11711170
else {
1172-
// If single model, just filter once
11731171
const records = relatedRecords.filter((record: any) => {
1174-
return record.post__id === models.id
1172+
return record.post_id === models.id
11751173
})
11761174

11771175
models[relation] = records.length === 1 ? records[0] : records

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1244,20 +1244,18 @@ export class ProductModel {
12441244
.execute()
12451245

12461246
if (Array.isArray(models)) {
1247-
// If array, map through all models
12481247
models.map((model: ProductModel) => {
12491248
const records = relatedRecords.filter((record: any) => {
1250-
return record.product__id === model.id
1249+
return record.product_id === model.id
12511250
})
12521251

12531252
model[relation] = records.length === 1 ? records[0] : records
12541253
return model
12551254
})
12561255
}
12571256
else {
1258-
// If single model, just filter once
12591257
const records = relatedRecords.filter((record: any) => {
1260-
return record.product__id === models.id
1258+
return record.product_id === models.id
12611259
})
12621260

12631261
models[relation] = records.length === 1 ? records[0] : records

0 commit comments

Comments
 (0)