Skip to content

Commit 371588b

Browse files
glennmichael123glennmichael123
committed
chore: wip
1 parent 9eb5a28 commit 371588b

File tree

17 files changed

+72
-72
lines changed

17 files changed

+72
-72
lines changed

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

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ export async function generateModelString(
153153
if (this.id === undefined)
154154
throw new HttpError(500, 'Relation Error!')
155155
156-
const firstModel = await Db.instance.selectFrom('${throughTableRelation}')
156+
const firstModel = await DB.instance.selectFrom('${throughTableRelation}')
157157
.where('${foreignKeyRelation}', '=', this.id)
158158
.selectAll()
159159
.executeTakeFirst()
@@ -188,7 +188,7 @@ export async function generateModelString(
188188
if (this.id === undefined)
189189
throw new HttpError(500, 'Relation Error!')
190190
191-
const results = await Db.instance.selectFrom('${tableRelation}')
191+
const results = await DB.instance.selectFrom('${tableRelation}')
192192
.where('${foreignKeyRelation}', '=', this.id)
193193
.limit(5)
194194
.selectAll()
@@ -260,7 +260,7 @@ export async function generateModelString(
260260
if (this.id === undefined)
261261
throw new HttpError(500, 'Relation Error!')
262262
263-
const results = await Db.instance.selectFrom('${pivotTable}')
263+
const results = await DB.instance.selectFrom('${pivotTable}')
264264
.where('${pivotKey}', '=', this.id)
265265
.selectAll()
266266
.execute()
@@ -437,7 +437,7 @@ export async function generateModelString(
437437
}
438438
439439
async activeSubscription() {
440-
const subscription = await Db.instance.selectFrom('subscriptions')
440+
const subscription = await DB.instance.selectFrom('subscriptions')
441441
.where('user_id', '=', this.id)
442442
.where('provider_status', '=', 'active')
443443
.selectAll()
@@ -606,7 +606,7 @@ export async function generateModelString(
606606
} \n\n`
607607

608608
whereFunctionStatements += `export async function where${pascalCase(attribute.field)}(value: ${entity}): Promise<${modelName}Model[]> {
609-
const query = Db.instance.selectFrom('${tableName}').where('${snakeCase(attribute.field)}', '=', value)
609+
const query = DB.instance.selectFrom('${tableName}').where('${snakeCase(attribute.field)}', '=', value)
610610
const results = await query.execute()
611611
612612
return results.map(modelItem => new ${modelName}Model(modelItem))
@@ -681,7 +681,7 @@ export async function generateModelString(
681681

682682
return `import type { Generated, Insertable, RawBuilder, Selectable, Updateable, Sql} from '@stacksjs/database'
683683
import { manageCharge, manageCheckout, manageCustomer, manageInvoice, managePaymentMethod, manageSubscription, manageTransaction, managePrice, manageSetupIntent, type Stripe } from '@stacksjs/payments'
684-
import { db, sql } from '@stacksjs/database'
684+
import { sql } from '@stacksjs/database'
685685
import { DB, SubqueryBuilder } from '@stacksjs/orm'
686686
import type { CheckoutLineItem, CheckoutOptions, StripeCustomerOptions } from '@stacksjs/types'
687687
import { HttpError, ModelNotFoundException } from '@stacksjs/error-handling'
@@ -777,7 +777,7 @@ export async function generateModelString(
777777
778778
// Method to find a ${modelName} by ID
779779
static async find(id: number): Promise<${modelName}Model | undefined> {
780-
const model = await Db.instance.selectFrom('${tableName}').where('id', '=', id).selectAll().executeTakeFirst()
780+
const model = await DB.instance.selectFrom('${tableName}').where('id', '=', id).selectAll().executeTakeFirst()
781781
782782
if (!model)
783783
return undefined
@@ -798,7 +798,7 @@ export async function generateModelString(
798798
}
799799
800800
static async first(): Promise<${modelName}Model | undefined> {
801-
const model = await Db.instance.selectFrom('${tableName}')
801+
const model = await DB.instance.selectFrom('${tableName}')
802802
.selectAll()
803803
.executeTakeFirst()
804804
@@ -841,7 +841,7 @@ export async function generateModelString(
841841
}
842842
843843
static async all(): Promise<${modelName}Model[]> {
844-
const models = await Db.instance.selectFrom('${tableName}').selectAll().execute()
844+
const models = await DB.instance.selectFrom('${tableName}').selectAll().execute()
845845
846846
const data = await Promise.all(models.map(async (model: ${modelName}Type) => {
847847
const instance = new ${modelName}Model(model)
@@ -860,7 +860,7 @@ export async function generateModelString(
860860
}
861861
862862
static async findOrFail(id: number): Promise<${modelName}Model> {
863-
const model = await Db.instance.selectFrom('${tableName}').where('id', '=', id).selectAll().executeTakeFirst()
863+
const model = await DB.instance.selectFrom('${tableName}').where('id', '=', id).selectAll().executeTakeFirst()
864864
865865
const instance = new ${modelName}Model(null)
866866
@@ -879,7 +879,7 @@ export async function generateModelString(
879879
}
880880
881881
static async findMany(ids: number[]): Promise<${modelName}Model[]> {
882-
let query = Db.instance.selectFrom('${tableName}').where('id', 'in', ids)
882+
let query = DB.instance.selectFrom('${tableName}').where('id', 'in', ids)
883883
884884
const instance = new ${modelName}Model(null)
885885
@@ -1176,14 +1176,14 @@ export async function generateModelString(
11761176
11771177
// Method to get all ${tableName}
11781178
static async paginate(options: QueryOptions = { limit: 10, offset: 0, page: 1 }): Promise<${modelName}Response> {
1179-
const totalRecordsResult = await Db.instance.selectFrom('${tableName}')
1179+
const totalRecordsResult = await DB.instance.selectFrom('${tableName}')
11801180
.select(db.fn.count('id').as('total')) // Use 'id' or another actual column name
11811181
.executeTakeFirst()
11821182
11831183
const totalRecords = Number(totalRecordsResult?.total) || 0
11841184
const totalPages = Math.ceil(totalRecords / (options.limit ?? 10))
11851185
1186-
const ${tableName}WithExtra = await Db.instance.selectFrom('${tableName}')
1186+
const ${tableName}WithExtra = await DB.instance.selectFrom('${tableName}')
11871187
.selectAll()
11881188
.orderBy('id', 'asc') // Assuming 'id' is used for cursor-based pagination
11891189
.limit((options.limit ?? 10) + 1) // Fetch one extra record
@@ -1269,7 +1269,7 @@ export async function generateModelString(
12691269
12701270
${mittDeleteStatement}
12711271
1272-
return await Db.instance.deleteFrom('${tableName}')
1272+
return await DB.instance.deleteFrom('${tableName}')
12731273
.where('id', '=', id)
12741274
.execute()
12751275
}
@@ -1436,7 +1436,7 @@ export async function generateModelString(
14361436
}
14371437
14381438
static async latest(): Promise<${modelName}Type | undefined> {
1439-
const model = await Db.instance.selectFrom('${tableName}')
1439+
const model = await DB.instance.selectFrom('${tableName}')
14401440
.selectAll()
14411441
.orderBy('created_at', 'desc')
14421442
.executeTakeFirst()
@@ -1452,7 +1452,7 @@ export async function generateModelString(
14521452
}
14531453
14541454
static async oldest(): Promise<${modelName}Type | undefined> {
1455-
const model = await Db.instance.selectFrom('${tableName}')
1455+
const model = await DB.instance.selectFrom('${tableName}')
14561456
.selectAll()
14571457
.orderBy('created_at', 'asc')
14581458
.executeTakeFirst()
@@ -1481,7 +1481,7 @@ export async function generateModelString(
14811481
const value = condition[key]
14821482
14831483
// Attempt to find the first record matching the condition
1484-
const existing${modelName} = await Db.instance.selectFrom('${tableName}')
1484+
const existing${modelName} = await DB.instance.selectFrom('${tableName}')
14851485
.selectAll()
14861486
.where(key, '=', value)
14871487
.executeTakeFirst()
@@ -1509,7 +1509,7 @@ export async function generateModelString(
15091509
const value = condition[key]
15101510
15111511
// Attempt to find the first record matching the condition
1512-
const existing${modelName} = await Db.instance.selectFrom('${tableName}')
1512+
const existing${modelName} = await DB.instance.selectFrom('${tableName}')
15131513
.selectAll()
15141514
.where(key, '=', value)
15151515
.executeTakeFirst()
@@ -1522,7 +1522,7 @@ export async function generateModelString(
15221522
.executeTakeFirstOrThrow()
15231523
15241524
// Fetch and return the updated record
1525-
const updated${modelName} = await Db.instance.selectFrom('${tableName}')
1525+
const updated${modelName} = await DB.instance.selectFrom('${tableName}')
15261526
.selectAll()
15271527
.where(key, '=', value)
15281528
.executeTakeFirst()
@@ -1553,14 +1553,14 @@ export async function generateModelString(
15531553
}
15541554
15551555
async last(): Promise<${modelName}Type | undefined> {
1556-
return await Db.instance.selectFrom('${tableName}')
1556+
return await DB.instance.selectFrom('${tableName}')
15571557
.selectAll()
15581558
.orderBy('id', 'desc')
15591559
.executeTakeFirst()
15601560
}
15611561
15621562
static async last(): Promise<${modelName}Type | undefined> {
1563-
const model = await Db.instance.selectFrom('${tableName}').selectAll().orderBy('id', 'desc').executeTakeFirst()
1563+
const model = await DB.instance.selectFrom('${tableName}').selectAll().orderBy('id', 'desc').executeTakeFirst()
15641564
15651565
if (!model)
15661566
return undefined
@@ -1713,7 +1713,7 @@ export async function generateModelString(
17131713
${mittDeleteStatement}
17141714
${thisSoftDeleteStatementsUpdateFrom}
17151715
1716-
return await Db.instance.deleteFrom('${tableName}')
1716+
return await DB.instance.deleteFrom('${tableName}')
17171717
.where('id', '=', this.id)
17181718
.execute()
17191719
}
@@ -1772,7 +1772,7 @@ export async function generateModelString(
17721772
}
17731773
17741774
async function find(id: number): Promise<${modelName}Model | undefined> {
1775-
let query = Db.instance.selectFrom('${tableName}').where('id', '=', id).selectAll()
1775+
let query = DB.instance.selectFrom('${tableName}').where('id', '=', id).selectAll()
17761776
17771777
const model = await query.executeTakeFirst()
17781778
@@ -1801,7 +1801,7 @@ export async function generateModelString(
18011801
}
18021802
18031803
export async function remove(id: number): Promise<void> {
1804-
await Db.instance.deleteFrom('${tableName}')
1804+
await DB.instance.deleteFrom('${tableName}')
18051805
.where('id', '=', id)
18061806
.execute()
18071807
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -600,7 +600,7 @@ export class AccessTokenModel {
600600

601601
// Method to remove a AccessToken
602602
static async remove(id: number): Promise<any> {
603-
return await Db.instance.deleteFrom('personal_access_tokens')
603+
return await DB.instance.deleteFrom('personal_access_tokens')
604604
.where('id', '=', id)
605605
.execute()
606606
}
@@ -1066,7 +1066,7 @@ export class AccessTokenModel {
10661066
if (this.id === undefined)
10671067
this.deleteFromQuery.execute()
10681068

1069-
return await Db.instance.deleteFrom('personal_access_tokens')
1069+
return await DB.instance.deleteFrom('personal_access_tokens')
10701070
.where('id', '=', this.id)
10711071
.execute()
10721072
}
@@ -1175,7 +1175,7 @@ export async function rawQuery(rawQuery: string): Promise<any> {
11751175
}
11761176

11771177
export async function remove(id: number): Promise<void> {
1178-
await Db.instance.deleteFrom('personal_access_tokens')
1178+
await DB.instance.deleteFrom('personal_access_tokens')
11791179
.where('id', '=', id)
11801180
.execute()
11811181
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -614,7 +614,7 @@ export class DeploymentModel {
614614

615615
// Method to remove a Deployment
616616
static async remove(id: number): Promise<any> {
617-
return await Db.instance.deleteFrom('deployments')
617+
return await DB.instance.deleteFrom('deployments')
618618
.where('id', '=', id)
619619
.execute()
620620
}
@@ -1104,7 +1104,7 @@ export class DeploymentModel {
11041104
if (this.id === undefined)
11051105
this.deleteFromQuery.execute()
11061106

1107-
return await Db.instance.deleteFrom('deployments')
1107+
return await DB.instance.deleteFrom('deployments')
11081108
.where('id', '=', this.id)
11091109
.execute()
11101110
}
@@ -1216,7 +1216,7 @@ export async function rawQuery(rawQuery: string): Promise<any> {
12161216
}
12171217

12181218
export async function remove(id: number): Promise<void> {
1219-
await Db.instance.deleteFrom('deployments')
1219+
await DB.instance.deleteFrom('deployments')
12201220
.where('id', '=', id)
12211221
.execute()
12221222
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -590,7 +590,7 @@ export class ErrorModel {
590590

591591
// Method to remove a Error
592592
static async remove(id: number): Promise<any> {
593-
return await Db.instance.deleteFrom('errors')
593+
return await DB.instance.deleteFrom('errors')
594594
.where('id', '=', id)
595595
.execute()
596596
}
@@ -1064,7 +1064,7 @@ export class ErrorModel {
10641064
if (this.id === undefined)
10651065
this.deleteFromQuery.execute()
10661066

1067-
return await Db.instance.deleteFrom('errors')
1067+
return await DB.instance.deleteFrom('errors')
10681068
.where('id', '=', this.id)
10691069
.execute()
10701070
}
@@ -1158,7 +1158,7 @@ export async function rawQuery(rawQuery: string): Promise<any> {
11581158
}
11591159

11601160
export async function remove(id: number): Promise<void> {
1161-
await Db.instance.deleteFrom('errors')
1161+
await DB.instance.deleteFrom('errors')
11621162
.where('id', '=', id)
11631163
.execute()
11641164
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -590,7 +590,7 @@ export class FailedJobModel {
590590

591591
// Method to remove a FailedJob
592592
static async remove(id: number): Promise<any> {
593-
return await Db.instance.deleteFrom('failed_jobs')
593+
return await DB.instance.deleteFrom('failed_jobs')
594594
.where('id', '=', id)
595595
.execute()
596596
}
@@ -1064,7 +1064,7 @@ export class FailedJobModel {
10641064
if (this.id === undefined)
10651065
this.deleteFromQuery.execute()
10661066

1067-
return await Db.instance.deleteFrom('failed_jobs')
1067+
return await DB.instance.deleteFrom('failed_jobs')
10681068
.where('id', '=', this.id)
10691069
.execute()
10701070
}
@@ -1158,7 +1158,7 @@ export async function rawQuery(rawQuery: string): Promise<any> {
11581158
}
11591159

11601160
export async function remove(id: number): Promise<void> {
1161-
await Db.instance.deleteFrom('failed_jobs')
1161+
await DB.instance.deleteFrom('failed_jobs')
11621162
.where('id', '=', id)
11631163
.execute()
11641164
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -590,7 +590,7 @@ export class JobModel {
590590

591591
// Method to remove a Job
592592
static async remove(id: number): Promise<any> {
593-
return await Db.instance.deleteFrom('jobs')
593+
return await DB.instance.deleteFrom('jobs')
594594
.where('id', '=', id)
595595
.execute()
596596
}
@@ -1064,7 +1064,7 @@ export class JobModel {
10641064
if (this.id === undefined)
10651065
this.deleteFromQuery.execute()
10661066

1067-
return await Db.instance.deleteFrom('jobs')
1067+
return await DB.instance.deleteFrom('jobs')
10681068
.where('id', '=', this.id)
10691069
.execute()
10701070
}
@@ -1158,7 +1158,7 @@ export async function rawQuery(rawQuery: string): Promise<any> {
11581158
}
11591159

11601160
export async function remove(id: number): Promise<void> {
1161-
await Db.instance.deleteFrom('jobs')
1161+
await DB.instance.deleteFrom('jobs')
11621162
.where('id', '=', id)
11631163
.execute()
11641164
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -625,7 +625,7 @@ export class PaymentMethodModel {
625625

626626
// Method to remove a PaymentMethod
627627
static async remove(id: number): Promise<any> {
628-
return await Db.instance.deleteFrom('payment_methods')
628+
return await DB.instance.deleteFrom('payment_methods')
629629
.where('id', '=', id)
630630
.execute()
631631
}
@@ -1115,7 +1115,7 @@ export class PaymentMethodModel {
11151115
if (this.id === undefined)
11161116
this.deleteFromQuery.execute()
11171117

1118-
return await Db.instance.deleteFrom('payment_methods')
1118+
return await DB.instance.deleteFrom('payment_methods')
11191119
.where('id', '=', this.id)
11201120
.execute()
11211121
}
@@ -1241,7 +1241,7 @@ export async function rawQuery(rawQuery: string): Promise<any> {
12411241
}
12421242

12431243
export async function remove(id: number): Promise<void> {
1244-
await Db.instance.deleteFrom('payment_methods')
1244+
await DB.instance.deleteFrom('payment_methods')
12451245
.where('id', '=', id)
12461246
.execute()
12471247
}

0 commit comments

Comments
 (0)