Skip to content

Commit 7bf8fda

Browse files
glennmichael123glennmichael123
committed
chore: wip
1 parent b045899 commit 7bf8fda

35 files changed

+613
-614
lines changed

‎storage/framework/core/database/src/utils.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import type { Database } from '@stacksjs/orm'
22
import type { RawBuilder } from 'kysely'
3-
// Import config directly, but gracefully handle potential issues
4-
import * as config from '@stacksjs/config'
3+
import { config } from '@stacksjs/config'
54
import { log } from '@stacksjs/logging'
65
import { projectPath } from '@stacksjs/path'
76
import { Kysely, MysqlDialect, PostgresDialect, sql } from 'kysely'

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

+18-18
Original file line numberDiff line numberDiff line change
@@ -1372,17 +1372,17 @@ export async function generateModelString(
13721372
.values(filteredValues)
13731373
.executeTakeFirst()
13741374
1375-
const modelData = await DB.instance.selectFrom('${tableName}')
1375+
const model = await DB.instance.selectFrom('${tableName}')
13761376
.where('id', '=', Number(result.insertId || result.numInsertedOrUpdatedRows))
13771377
.selectAll()
13781378
.executeTakeFirst()
13791379
1380-
if (!modelData) {
1380+
if (!model) {
13811381
throw new HttpError(500, 'Failed to retrieve created ${modelName}')
13821382
}
13831383
13841384
${mittCreateStatement}
1385-
return this.createInstance(modelData)
1385+
return this.createInstance(model)
13861386
}
13871387
13881388
async create(new${modelName}: New${modelName}): Promise<${modelName}Model> {
@@ -1455,17 +1455,17 @@ export async function generateModelString(
14551455
14561456
if (this.id) {
14571457
// Get the updated data
1458-
const modelData = await DB.instance.selectFrom('${tableName}')
1458+
const model = await DB.instance.selectFrom('${tableName}')
14591459
.where('id', '=', this.id)
14601460
.selectAll()
14611461
.executeTakeFirst()
14621462
1463-
if (!modelData) {
1463+
if (!model) {
14641464
throw new HttpError(500, 'Failed to retrieve updated ${modelName}')
14651465
}
14661466
14671467
${mittUpdateStatement}
1468-
return this.createInstance(modelData)
1468+
return this.createInstance(model)
14691469
}
14701470
14711471
this.hasSaved = true
@@ -1481,17 +1481,17 @@ export async function generateModelString(
14811481
14821482
if (this.id) {
14831483
// Get the updated data
1484-
const modelData = await DB.instance.selectFrom('${tableName}')
1484+
const model = await DB.instance.selectFrom('${tableName}')
14851485
.where('id', '=', this.id)
14861486
.selectAll()
14871487
.executeTakeFirst()
14881488
1489-
if (!modelData) {
1489+
if (!model) {
14901490
throw new HttpError(500, 'Failed to retrieve updated ${modelName}')
14911491
}
14921492
14931493
${mittUpdateStatement.replace('model', 'this')}
1494-
return this.createInstance(modelData)
1494+
return this.createInstance(model)
14951495
}
14961496
14971497
return undefined
@@ -1507,35 +1507,35 @@ export async function generateModelString(
15071507
.executeTakeFirst()
15081508
15091509
// Get the updated data
1510-
const modelData = await DB.instance.selectFrom('${tableName}')
1510+
const model = await DB.instance.selectFrom('${tableName}')
15111511
.where('id', '=', this.id)
15121512
.selectAll()
15131513
.executeTakeFirst()
15141514
1515-
if (!modelData) {
1515+
if (!model) {
15161516
throw new HttpError(500, 'Failed to retrieve updated ${modelName}')
15171517
}
15181518
15191519
${mittUpdateStatement.replace('model', 'this')}
1520-
return this.createInstance(modelData)
1520+
return this.createInstance(model)
15211521
} else {
15221522
// Create new record
15231523
const result = await DB.instance.insertInto('${tableName}')
15241524
.values(this.attributes as New${modelName})
15251525
.executeTakeFirst()
15261526
15271527
// Get the created data
1528-
const modelData = await DB.instance.selectFrom('${tableName}')
1528+
const model = await DB.instance.selectFrom('${tableName}')
15291529
.where('id', '=', Number(result.insertId || result.numInsertedOrUpdatedRows))
15301530
.selectAll()
15311531
.executeTakeFirst()
15321532
1533-
if (!modelData) {
1533+
if (!model) {
15341534
throw new HttpError(500, 'Failed to retrieve created ${modelName}')
15351535
}
15361536
15371537
${mittCreateStatement.replace('model', 'this')}
1538-
return this.createInstance(modelData)
1538+
return this.createInstance(model)
15391539
}
15401540
}
15411541
@@ -1565,18 +1565,18 @@ export async function generateModelString(
15651565
.executeTakeFirst()
15661566
15671567
const instance = new ${modelName}Model(undefined)
1568-
const modelData = await DB.instance.selectFrom('${tableName}')
1568+
const model = await DB.instance.selectFrom('${tableName}')
15691569
.where('id', '=', Number(result.insertId || result.numInsertedOrUpdatedRows))
15701570
.selectAll()
15711571
.executeTakeFirst()
15721572
1573-
if (!modelData) {
1573+
if (!model) {
15741574
throw new HttpError(500, 'Failed to retrieve created ${modelName}')
15751575
}
15761576
15771577
${mittCreateStatement}
15781578
1579-
return instance.createInstance(modelData)
1579+
return instance.createInstance(model)
15801580
}
15811581
15821582
// Method to remove a ${modelName}

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

+18-18
Original file line numberDiff line numberDiff line change
@@ -589,16 +589,16 @@ export class AccessTokenModel extends BaseOrm<AccessTokenModel, PersonalAccessTo
589589
.values(filteredValues)
590590
.executeTakeFirst()
591591

592-
const modelData = await DB.instance.selectFrom('personal_access_tokens')
592+
const model = await DB.instance.selectFrom('personal_access_tokens')
593593
.where('id', '=', Number(result.insertId || result.numInsertedOrUpdatedRows))
594594
.selectAll()
595595
.executeTakeFirst()
596596

597-
if (!modelData) {
597+
if (!model) {
598598
throw new HttpError(500, 'Failed to retrieve created AccessToken')
599599
}
600600

601-
return this.createInstance(modelData)
601+
return this.createInstance(model)
602602
}
603603

604604
async create(newAccessToken: NewAccessToken): Promise<AccessTokenModel> {
@@ -671,16 +671,16 @@ export class AccessTokenModel extends BaseOrm<AccessTokenModel, PersonalAccessTo
671671

672672
if (this.id) {
673673
// Get the updated data
674-
const modelData = await DB.instance.selectFrom('personal_access_tokens')
674+
const model = await DB.instance.selectFrom('personal_access_tokens')
675675
.where('id', '=', this.id)
676676
.selectAll()
677677
.executeTakeFirst()
678678

679-
if (!modelData) {
679+
if (!model) {
680680
throw new HttpError(500, 'Failed to retrieve updated AccessToken')
681681
}
682682

683-
return this.createInstance(modelData)
683+
return this.createInstance(model)
684684
}
685685

686686
this.hasSaved = true
@@ -696,16 +696,16 @@ export class AccessTokenModel extends BaseOrm<AccessTokenModel, PersonalAccessTo
696696

697697
if (this.id) {
698698
// Get the updated data
699-
const modelData = await DB.instance.selectFrom('personal_access_tokens')
699+
const model = await DB.instance.selectFrom('personal_access_tokens')
700700
.where('id', '=', this.id)
701701
.selectAll()
702702
.executeTakeFirst()
703703

704-
if (!modelData) {
704+
if (!model) {
705705
throw new HttpError(500, 'Failed to retrieve updated AccessToken')
706706
}
707707

708-
return this.createInstance(modelData)
708+
return this.createInstance(model)
709709
}
710710

711711
return undefined
@@ -721,16 +721,16 @@ export class AccessTokenModel extends BaseOrm<AccessTokenModel, PersonalAccessTo
721721
.executeTakeFirst()
722722

723723
// Get the updated data
724-
const modelData = await DB.instance.selectFrom('personal_access_tokens')
724+
const model = await DB.instance.selectFrom('personal_access_tokens')
725725
.where('id', '=', this.id)
726726
.selectAll()
727727
.executeTakeFirst()
728728

729-
if (!modelData) {
729+
if (!model) {
730730
throw new HttpError(500, 'Failed to retrieve updated AccessToken')
731731
}
732732

733-
return this.createInstance(modelData)
733+
return this.createInstance(model)
734734
}
735735
else {
736736
// Create new record
@@ -739,16 +739,16 @@ export class AccessTokenModel extends BaseOrm<AccessTokenModel, PersonalAccessTo
739739
.executeTakeFirst()
740740

741741
// Get the created data
742-
const modelData = await DB.instance.selectFrom('personal_access_tokens')
742+
const model = await DB.instance.selectFrom('personal_access_tokens')
743743
.where('id', '=', Number(result.insertId || result.numInsertedOrUpdatedRows))
744744
.selectAll()
745745
.executeTakeFirst()
746746

747-
if (!modelData) {
747+
if (!model) {
748748
throw new HttpError(500, 'Failed to retrieve created AccessToken')
749749
}
750750

751-
return this.createInstance(modelData)
751+
return this.createInstance(model)
752752
}
753753
}
754754

@@ -776,16 +776,16 @@ export class AccessTokenModel extends BaseOrm<AccessTokenModel, PersonalAccessTo
776776
.executeTakeFirst()
777777

778778
const instance = new AccessTokenModel(undefined)
779-
const modelData = await DB.instance.selectFrom('personal_access_tokens')
779+
const model = await DB.instance.selectFrom('personal_access_tokens')
780780
.where('id', '=', Number(result.insertId || result.numInsertedOrUpdatedRows))
781781
.selectAll()
782782
.executeTakeFirst()
783783

784-
if (!modelData) {
784+
if (!model) {
785785
throw new HttpError(500, 'Failed to retrieve created AccessToken')
786786
}
787787

788-
return instance.createInstance(modelData)
788+
return instance.createInstance(model)
789789
}
790790

791791
// Method to remove a AccessToken

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

+18-18
Original file line numberDiff line numberDiff line change
@@ -633,18 +633,18 @@ export class CouponModel extends BaseOrm<CouponModel, CouponsTable, CouponJsonRe
633633
.values(filteredValues)
634634
.executeTakeFirst()
635635

636-
const modelData = await DB.instance.selectFrom('coupons')
636+
const model = await DB.instance.selectFrom('coupons')
637637
.where('id', '=', Number(result.insertId || result.numInsertedOrUpdatedRows))
638638
.selectAll()
639639
.executeTakeFirst()
640640

641-
if (!modelData) {
641+
if (!model) {
642642
throw new HttpError(500, 'Failed to retrieve created Coupon')
643643
}
644644

645645
if (model)
646646
dispatch('coupon:created', model)
647-
return this.createInstance(modelData)
647+
return this.createInstance(model)
648648
}
649649

650650
async create(newCoupon: NewCoupon): Promise<CouponModel> {
@@ -717,18 +717,18 @@ export class CouponModel extends BaseOrm<CouponModel, CouponsTable, CouponJsonRe
717717

718718
if (this.id) {
719719
// Get the updated data
720-
const modelData = await DB.instance.selectFrom('coupons')
720+
const model = await DB.instance.selectFrom('coupons')
721721
.where('id', '=', this.id)
722722
.selectAll()
723723
.executeTakeFirst()
724724

725-
if (!modelData) {
725+
if (!model) {
726726
throw new HttpError(500, 'Failed to retrieve updated Coupon')
727727
}
728728

729729
if (model)
730730
dispatch('coupon:updated', model)
731-
return this.createInstance(modelData)
731+
return this.createInstance(model)
732732
}
733733

734734
this.hasSaved = true
@@ -744,18 +744,18 @@ export class CouponModel extends BaseOrm<CouponModel, CouponsTable, CouponJsonRe
744744

745745
if (this.id) {
746746
// Get the updated data
747-
const modelData = await DB.instance.selectFrom('coupons')
747+
const model = await DB.instance.selectFrom('coupons')
748748
.where('id', '=', this.id)
749749
.selectAll()
750750
.executeTakeFirst()
751751

752-
if (!modelData) {
752+
if (!model) {
753753
throw new HttpError(500, 'Failed to retrieve updated Coupon')
754754
}
755755

756756
if (this)
757757
dispatch('coupon:updated', model)
758-
return this.createInstance(modelData)
758+
return this.createInstance(model)
759759
}
760760

761761
return undefined
@@ -771,18 +771,18 @@ export class CouponModel extends BaseOrm<CouponModel, CouponsTable, CouponJsonRe
771771
.executeTakeFirst()
772772

773773
// Get the updated data
774-
const modelData = await DB.instance.selectFrom('coupons')
774+
const model = await DB.instance.selectFrom('coupons')
775775
.where('id', '=', this.id)
776776
.selectAll()
777777
.executeTakeFirst()
778778

779-
if (!modelData) {
779+
if (!model) {
780780
throw new HttpError(500, 'Failed to retrieve updated Coupon')
781781
}
782782

783783
if (this)
784784
dispatch('coupon:updated', model)
785-
return this.createInstance(modelData)
785+
return this.createInstance(model)
786786
}
787787
else {
788788
// Create new record
@@ -791,18 +791,18 @@ export class CouponModel extends BaseOrm<CouponModel, CouponsTable, CouponJsonRe
791791
.executeTakeFirst()
792792

793793
// Get the created data
794-
const modelData = await DB.instance.selectFrom('coupons')
794+
const model = await DB.instance.selectFrom('coupons')
795795
.where('id', '=', Number(result.insertId || result.numInsertedOrUpdatedRows))
796796
.selectAll()
797797
.executeTakeFirst()
798798

799-
if (!modelData) {
799+
if (!model) {
800800
throw new HttpError(500, 'Failed to retrieve created Coupon')
801801
}
802802

803803
if (this)
804804
dispatch('coupon:created', model)
805-
return this.createInstance(modelData)
805+
return this.createInstance(model)
806806
}
807807
}
808808

@@ -832,19 +832,19 @@ export class CouponModel extends BaseOrm<CouponModel, CouponsTable, CouponJsonRe
832832
.executeTakeFirst()
833833

834834
const instance = new CouponModel(undefined)
835-
const modelData = await DB.instance.selectFrom('coupons')
835+
const model = await DB.instance.selectFrom('coupons')
836836
.where('id', '=', Number(result.insertId || result.numInsertedOrUpdatedRows))
837837
.selectAll()
838838
.executeTakeFirst()
839839

840-
if (!modelData) {
840+
if (!model) {
841841
throw new HttpError(500, 'Failed to retrieve created Coupon')
842842
}
843843

844844
if (model)
845845
dispatch('coupon:created', model)
846846

847-
return instance.createInstance(modelData)
847+
return instance.createInstance(model)
848848
}
849849

850850
// Method to remove a Coupon

0 commit comments

Comments
 (0)