Skip to content

Commit 654b854

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

19 files changed

+208
-83
lines changed

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

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1807,16 +1807,23 @@ export async function generateModelString(
18071807
return instance
18081808
}
18091809
1810-
async exists(): Promise<boolean> {
1811-
const model = await this.selectFromQuery.executeTakeFirst()
1812-
1813-
return model !== null || model !== undefined
1810+
async exists(): Promise<boolean> {
1811+
let model
1812+
1813+
if (this.hasSelect) {
1814+
model = await this.selectFromQuery.executeTakeFirst()
1815+
}
1816+
else {
1817+
model = await this.selectFromQuery.selectAll().executeTakeFirst()
1818+
}
1819+
1820+
return model !== null && model !== undefined
18141821
}
18151822
18161823
static async latest(): Promise<${modelName}Type | undefined> {
18171824
const model = await DB.instance.selectFrom('${tableName}')
18181825
.selectAll()
1819-
.orderBy('created_at', 'desc')
1826+
.orderBy('id', 'desc')
18201827
.executeTakeFirst()
18211828
18221829
if (!model)
@@ -1832,7 +1839,7 @@ export async function generateModelString(
18321839
static async oldest(): Promise<${modelName}Type | undefined> {
18331840
const model = await DB.instance.selectFrom('${tableName}')
18341841
.selectAll()
1835-
.orderBy('created_at', 'asc')
1842+
.orderBy('id', 'asc')
18361843
.executeTakeFirst()
18371844
18381845
if (!model)

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

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1055,15 +1055,22 @@ export class AccessTokenModel {
10551055
}
10561056

10571057
async exists(): Promise<boolean> {
1058-
const model = await this.selectFromQuery.executeTakeFirst()
1058+
let model
10591059

1060-
return model !== null || model !== undefined
1060+
if (this.hasSelect) {
1061+
model = await this.selectFromQuery.executeTakeFirst()
1062+
}
1063+
else {
1064+
model = await this.selectFromQuery.selectAll().executeTakeFirst()
1065+
}
1066+
1067+
return model !== null && model !== undefined
10611068
}
10621069

10631070
static async latest(): Promise<AccessTokenType | undefined> {
10641071
const model = await DB.instance.selectFrom('personal_access_tokens')
10651072
.selectAll()
1066-
.orderBy('created_at', 'desc')
1073+
.orderBy('id', 'desc')
10671074
.executeTakeFirst()
10681075

10691076
if (!model)
@@ -1079,7 +1086,7 @@ export class AccessTokenModel {
10791086
static async oldest(): Promise<AccessTokenType | undefined> {
10801087
const model = await DB.instance.selectFrom('personal_access_tokens')
10811088
.selectAll()
1082-
.orderBy('created_at', 'asc')
1089+
.orderBy('id', 'asc')
10831090
.executeTakeFirst()
10841091

10851092
if (!model)

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

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1101,15 +1101,22 @@ export class ActivityModel {
11011101
}
11021102

11031103
async exists(): Promise<boolean> {
1104-
const model = await this.selectFromQuery.executeTakeFirst()
1104+
let model
11051105

1106-
return model !== null || model !== undefined
1106+
if (this.hasSelect) {
1107+
model = await this.selectFromQuery.executeTakeFirst()
1108+
}
1109+
else {
1110+
model = await this.selectFromQuery.selectAll().executeTakeFirst()
1111+
}
1112+
1113+
return model !== null && model !== undefined
11071114
}
11081115

11091116
static async latest(): Promise<ActivityType | undefined> {
11101117
const model = await DB.instance.selectFrom('activities')
11111118
.selectAll()
1112-
.orderBy('created_at', 'desc')
1119+
.orderBy('id', 'desc')
11131120
.executeTakeFirst()
11141121

11151122
if (!model)
@@ -1125,7 +1132,7 @@ export class ActivityModel {
11251132
static async oldest(): Promise<ActivityType | undefined> {
11261133
const model = await DB.instance.selectFrom('activities')
11271134
.selectAll()
1128-
.orderBy('created_at', 'asc')
1135+
.orderBy('id', 'asc')
11291136
.executeTakeFirst()
11301137

11311138
if (!model)

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

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1120,15 +1120,22 @@ export class DeploymentModel {
11201120
}
11211121

11221122
async exists(): Promise<boolean> {
1123-
const model = await this.selectFromQuery.executeTakeFirst()
1123+
let model
11241124

1125-
return model !== null || model !== undefined
1125+
if (this.hasSelect) {
1126+
model = await this.selectFromQuery.executeTakeFirst()
1127+
}
1128+
else {
1129+
model = await this.selectFromQuery.selectAll().executeTakeFirst()
1130+
}
1131+
1132+
return model !== null && model !== undefined
11261133
}
11271134

11281135
static async latest(): Promise<DeploymentType | undefined> {
11291136
const model = await DB.instance.selectFrom('deployments')
11301137
.selectAll()
1131-
.orderBy('created_at', 'desc')
1138+
.orderBy('id', 'desc')
11321139
.executeTakeFirst()
11331140

11341141
if (!model)
@@ -1144,7 +1151,7 @@ export class DeploymentModel {
11441151
static async oldest(): Promise<DeploymentType | undefined> {
11451152
const model = await DB.instance.selectFrom('deployments')
11461153
.selectAll()
1147-
.orderBy('created_at', 'asc')
1154+
.orderBy('id', 'asc')
11481155
.executeTakeFirst()
11491156

11501157
if (!model)

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

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1055,15 +1055,22 @@ export class ErrorModel {
10551055
}
10561056

10571057
async exists(): Promise<boolean> {
1058-
const model = await this.selectFromQuery.executeTakeFirst()
1058+
let model
10591059

1060-
return model !== null || model !== undefined
1060+
if (this.hasSelect) {
1061+
model = await this.selectFromQuery.executeTakeFirst()
1062+
}
1063+
else {
1064+
model = await this.selectFromQuery.selectAll().executeTakeFirst()
1065+
}
1066+
1067+
return model !== null && model !== undefined
10611068
}
10621069

10631070
static async latest(): Promise<ErrorType | undefined> {
10641071
const model = await DB.instance.selectFrom('errors')
10651072
.selectAll()
1066-
.orderBy('created_at', 'desc')
1073+
.orderBy('id', 'desc')
10671074
.executeTakeFirst()
10681075

10691076
if (!model)
@@ -1079,7 +1086,7 @@ export class ErrorModel {
10791086
static async oldest(): Promise<ErrorType | undefined> {
10801087
const model = await DB.instance.selectFrom('errors')
10811088
.selectAll()
1082-
.orderBy('created_at', 'asc')
1089+
.orderBy('id', 'asc')
10831090
.executeTakeFirst()
10841091

10851092
if (!model)

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

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1055,15 +1055,22 @@ export class FailedJobModel {
10551055
}
10561056

10571057
async exists(): Promise<boolean> {
1058-
const model = await this.selectFromQuery.executeTakeFirst()
1058+
let model
10591059

1060-
return model !== null || model !== undefined
1060+
if (this.hasSelect) {
1061+
model = await this.selectFromQuery.executeTakeFirst()
1062+
}
1063+
else {
1064+
model = await this.selectFromQuery.selectAll().executeTakeFirst()
1065+
}
1066+
1067+
return model !== null && model !== undefined
10611068
}
10621069

10631070
static async latest(): Promise<FailedJobType | undefined> {
10641071
const model = await DB.instance.selectFrom('failed_jobs')
10651072
.selectAll()
1066-
.orderBy('created_at', 'desc')
1073+
.orderBy('id', 'desc')
10671074
.executeTakeFirst()
10681075

10691076
if (!model)
@@ -1079,7 +1086,7 @@ export class FailedJobModel {
10791086
static async oldest(): Promise<FailedJobType | undefined> {
10801087
const model = await DB.instance.selectFrom('failed_jobs')
10811088
.selectAll()
1082-
.orderBy('created_at', 'asc')
1089+
.orderBy('id', 'asc')
10831090
.executeTakeFirst()
10841091

10851092
if (!model)

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

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1055,15 +1055,22 @@ export class JobModel {
10551055
}
10561056

10571057
async exists(): Promise<boolean> {
1058-
const model = await this.selectFromQuery.executeTakeFirst()
1058+
let model
10591059

1060-
return model !== null || model !== undefined
1060+
if (this.hasSelect) {
1061+
model = await this.selectFromQuery.executeTakeFirst()
1062+
}
1063+
else {
1064+
model = await this.selectFromQuery.selectAll().executeTakeFirst()
1065+
}
1066+
1067+
return model !== null && model !== undefined
10611068
}
10621069

10631070
static async latest(): Promise<JobType | undefined> {
10641071
const model = await DB.instance.selectFrom('jobs')
10651072
.selectAll()
1066-
.orderBy('created_at', 'desc')
1073+
.orderBy('id', 'desc')
10671074
.executeTakeFirst()
10681075

10691076
if (!model)
@@ -1079,7 +1086,7 @@ export class JobModel {
10791086
static async oldest(): Promise<JobType | undefined> {
10801087
const model = await DB.instance.selectFrom('jobs')
10811088
.selectAll()
1082-
.orderBy('created_at', 'asc')
1089+
.orderBy('id', 'asc')
10831090
.executeTakeFirst()
10841091

10851092
if (!model)

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

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1133,15 +1133,22 @@ export class PaymentMethodModel {
11331133
}
11341134

11351135
async exists(): Promise<boolean> {
1136-
const model = await this.selectFromQuery.executeTakeFirst()
1136+
let model
11371137

1138-
return model !== null || model !== undefined
1138+
if (this.hasSelect) {
1139+
model = await this.selectFromQuery.executeTakeFirst()
1140+
}
1141+
else {
1142+
model = await this.selectFromQuery.selectAll().executeTakeFirst()
1143+
}
1144+
1145+
return model !== null && model !== undefined
11391146
}
11401147

11411148
static async latest(): Promise<PaymentMethodType | undefined> {
11421149
const model = await DB.instance.selectFrom('payment_methods')
11431150
.selectAll()
1144-
.orderBy('created_at', 'desc')
1151+
.orderBy('id', 'desc')
11451152
.executeTakeFirst()
11461153

11471154
if (!model)
@@ -1157,7 +1164,7 @@ export class PaymentMethodModel {
11571164
static async oldest(): Promise<PaymentMethodType | undefined> {
11581165
const model = await DB.instance.selectFrom('payment_methods')
11591166
.selectAll()
1160-
.orderBy('created_at', 'asc')
1167+
.orderBy('id', 'asc')
11611168
.executeTakeFirst()
11621169

11631170
if (!model)

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

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1021,15 +1021,22 @@ export class PostModel {
10211021
}
10221022

10231023
async exists(): Promise<boolean> {
1024-
const model = await this.selectFromQuery.executeTakeFirst()
1024+
let model
10251025

1026-
return model !== null || model !== undefined
1026+
if (this.hasSelect) {
1027+
model = await this.selectFromQuery.executeTakeFirst()
1028+
}
1029+
else {
1030+
model = await this.selectFromQuery.selectAll().executeTakeFirst()
1031+
}
1032+
1033+
return model !== null && model !== undefined
10271034
}
10281035

10291036
static async latest(): Promise<PostType | undefined> {
10301037
const model = await DB.instance.selectFrom('posts')
10311038
.selectAll()
1032-
.orderBy('created_at', 'desc')
1039+
.orderBy('id', 'desc')
10331040
.executeTakeFirst()
10341041

10351042
if (!model)
@@ -1045,7 +1052,7 @@ export class PostModel {
10451052
static async oldest(): Promise<PostType | undefined> {
10461053
const model = await DB.instance.selectFrom('posts')
10471054
.selectAll()
1048-
.orderBy('created_at', 'asc')
1055+
.orderBy('id', 'asc')
10491056
.executeTakeFirst()
10501057

10511058
if (!model)

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

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1103,15 +1103,22 @@ export class ProductModel {
11031103
}
11041104

11051105
async exists(): Promise<boolean> {
1106-
const model = await this.selectFromQuery.executeTakeFirst()
1106+
let model
11071107

1108-
return model !== null || model !== undefined
1108+
if (this.hasSelect) {
1109+
model = await this.selectFromQuery.executeTakeFirst()
1110+
}
1111+
else {
1112+
model = await this.selectFromQuery.selectAll().executeTakeFirst()
1113+
}
1114+
1115+
return model !== null && model !== undefined
11091116
}
11101117

11111118
static async latest(): Promise<ProductType | undefined> {
11121119
const model = await DB.instance.selectFrom('products')
11131120
.selectAll()
1114-
.orderBy('created_at', 'desc')
1121+
.orderBy('id', 'desc')
11151122
.executeTakeFirst()
11161123

11171124
if (!model)
@@ -1127,7 +1134,7 @@ export class ProductModel {
11271134
static async oldest(): Promise<ProductType | undefined> {
11281135
const model = await DB.instance.selectFrom('products')
11291136
.selectAll()
1130-
.orderBy('created_at', 'asc')
1137+
.orderBy('id', 'asc')
11311138
.executeTakeFirst()
11321139

11331140
if (!model)

0 commit comments

Comments
 (0)