Skip to content

Commit 0193034

Browse files
glennmichael123glennmichael123
committed
chore: wip
1 parent bac27e2 commit 0193034

20 files changed

+136
-136
lines changed

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1445,9 +1445,9 @@ export async function generateModelString(
14451445
14461446
case 'whereIn':
14471447
if (condition.operator === 'is not') {
1448-
subquery = subquery.whereNotIn(condition.column, condition.values!)
1448+
subquery = subquery.whereNotIn(condition.column, condition.values)
14491449
} else {
1450-
subquery = subquery.whereIn(condition.column, condition.values!)
1450+
subquery = subquery.whereIn(condition.column, condition.values)
14511451
}
14521452
14531453
break
@@ -1461,7 +1461,7 @@ export async function generateModelString(
14611461
break
14621462
14631463
case 'whereBetween':
1464-
subquery = subquery.whereBetween(condition.column, condition.values!)
1464+
subquery = subquery.whereBetween(condition.column, condition.values)
14651465
break
14661466
14671467
case 'whereExists': {
@@ -1543,10 +1543,10 @@ export async function generateModelString(
15431543
15441544
case 'whereIn':
15451545
if (condition.operator === 'is not') {
1546-
this.whereNotIn(condition.column, condition.values!)
1546+
this.whereNotIn(condition.column, condition.values)
15471547
}
15481548
else {
1549-
this.whereIn(condition.column, condition.values!)
1549+
this.whereIn(condition.column, condition.values)
15501550
}
15511551
15521552
break
@@ -1560,7 +1560,7 @@ export async function generateModelString(
15601560
break
15611561
15621562
case 'whereBetween':
1563-
this.whereBetween(condition.column, condition.values!)
1563+
this.whereBetween(condition.column, condition.values)
15641564
break
15651565
15661566
case 'whereExists': {
@@ -1978,7 +1978,7 @@ export async function generateModelString(
19781978
}
19791979
19801980
whereNotIn<V>(column: keyof ${formattedTableName}Table, values: V[]): ${modelName}Model {
1981-
return this.applyWhereNotIn(column, values)
1981+
return this.applyWhereNotIn<V>(column, values)
19821982
}
19831983
19841984
static whereNotIn<V = number>(column: keyof ${formattedTableName}Table, values: V[]): ${modelName}Model {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
export type Operator = '=' | '<' | '>' | '<=' | '>=' | '<>' | '!=' | 'like' | 'not like' | 'in' | 'not in' | 'between' | 'not between' | 'is' | 'is not'
22

3-
interface WhereCondition<T = any, V = any> {
3+
interface WhereCondition<T, V = any> {
44
type: 'and' | 'or'
55
method: 'where' | 'whereIn' | 'whereNull' | 'whereNotNull' | 'whereBetween' | 'whereExists'
66
column: keyof T
@@ -35,7 +35,7 @@ export class SubqueryBuilder<T> {
3535
method: 'whereIn',
3636
column,
3737
values,
38-
})
38+
} as WhereCondition<T, V>)
3939
}
4040

4141
whereNotIn<V>(column: keyof T, values: V[]): void {
@@ -45,7 +45,7 @@ export class SubqueryBuilder<T> {
4545
column,
4646
values,
4747
operator: 'not in',
48-
})
48+
} as WhereCondition<T, V>)
4949
}
5050

5151
whereNull(column: keyof T): void {

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -664,10 +664,10 @@ export class AccessTokenModel {
664664

665665
case 'whereIn':
666666
if (condition.operator === 'is not') {
667-
subquery = subquery.whereNotIn(condition.column, condition.values!)
667+
subquery = subquery.whereNotIn(condition.column, condition.values)
668668
}
669669
else {
670-
subquery = subquery.whereIn(condition.column, condition.values!)
670+
subquery = subquery.whereIn(condition.column, condition.values)
671671
}
672672

673673
break
@@ -681,7 +681,7 @@ export class AccessTokenModel {
681681
break
682682

683683
case 'whereBetween':
684-
subquery = subquery.whereBetween(condition.column, condition.values!)
684+
subquery = subquery.whereBetween(condition.column, condition.values)
685685
break
686686

687687
case 'whereExists': {
@@ -763,10 +763,10 @@ export class AccessTokenModel {
763763

764764
case 'whereIn':
765765
if (condition.operator === 'is not') {
766-
this.whereNotIn(condition.column, condition.values!)
766+
this.whereNotIn(condition.column, condition.values)
767767
}
768768
else {
769-
this.whereIn(condition.column, condition.values!)
769+
this.whereIn(condition.column, condition.values)
770770
}
771771

772772
break
@@ -780,7 +780,7 @@ export class AccessTokenModel {
780780
break
781781

782782
case 'whereBetween':
783-
this.whereBetween(condition.column, condition.values!)
783+
this.whereBetween(condition.column, condition.values)
784784
break
785785

786786
case 'whereExists': {
@@ -1213,7 +1213,7 @@ export class AccessTokenModel {
12131213
}
12141214

12151215
whereNotIn<V>(column: keyof PersonalAccessTokensTable, values: V[]): AccessTokenModel {
1216-
return this.applyWhereNotIn(column, values)
1216+
return this.applyWhereNotIn<V>(column, values)
12171217
}
12181218

12191219
static whereNotIn<V = number>(column: keyof PersonalAccessTokensTable, values: V[]): AccessTokenModel {

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -687,10 +687,10 @@ export class ActivityModel {
687687

688688
case 'whereIn':
689689
if (condition.operator === 'is not') {
690-
subquery = subquery.whereNotIn(condition.column, condition.values!)
690+
subquery = subquery.whereNotIn(condition.column, condition.values)
691691
}
692692
else {
693-
subquery = subquery.whereIn(condition.column, condition.values!)
693+
subquery = subquery.whereIn(condition.column, condition.values)
694694
}
695695

696696
break
@@ -704,7 +704,7 @@ export class ActivityModel {
704704
break
705705

706706
case 'whereBetween':
707-
subquery = subquery.whereBetween(condition.column, condition.values!)
707+
subquery = subquery.whereBetween(condition.column, condition.values)
708708
break
709709

710710
case 'whereExists': {
@@ -786,10 +786,10 @@ export class ActivityModel {
786786

787787
case 'whereIn':
788788
if (condition.operator === 'is not') {
789-
this.whereNotIn(condition.column, condition.values!)
789+
this.whereNotIn(condition.column, condition.values)
790790
}
791791
else {
792-
this.whereIn(condition.column, condition.values!)
792+
this.whereIn(condition.column, condition.values)
793793
}
794794

795795
break
@@ -803,7 +803,7 @@ export class ActivityModel {
803803
break
804804

805805
case 'whereBetween':
806-
this.whereBetween(condition.column, condition.values!)
806+
this.whereBetween(condition.column, condition.values)
807807
break
808808

809809
case 'whereExists': {
@@ -1263,7 +1263,7 @@ export class ActivityModel {
12631263
}
12641264

12651265
whereNotIn<V>(column: keyof ActivitiesTable, values: V[]): ActivityModel {
1266-
return this.applyWhereNotIn(column, values)
1266+
return this.applyWhereNotIn<V>(column, values)
12671267
}
12681268

12691269
static whereNotIn<V = number>(column: keyof ActivitiesTable, values: V[]): ActivityModel {

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -701,10 +701,10 @@ export class DeploymentModel {
701701

702702
case 'whereIn':
703703
if (condition.operator === 'is not') {
704-
subquery = subquery.whereNotIn(condition.column, condition.values!)
704+
subquery = subquery.whereNotIn(condition.column, condition.values)
705705
}
706706
else {
707-
subquery = subquery.whereIn(condition.column, condition.values!)
707+
subquery = subquery.whereIn(condition.column, condition.values)
708708
}
709709

710710
break
@@ -718,7 +718,7 @@ export class DeploymentModel {
718718
break
719719

720720
case 'whereBetween':
721-
subquery = subquery.whereBetween(condition.column, condition.values!)
721+
subquery = subquery.whereBetween(condition.column, condition.values)
722722
break
723723

724724
case 'whereExists': {
@@ -800,10 +800,10 @@ export class DeploymentModel {
800800

801801
case 'whereIn':
802802
if (condition.operator === 'is not') {
803-
this.whereNotIn(condition.column, condition.values!)
803+
this.whereNotIn(condition.column, condition.values)
804804
}
805805
else {
806-
this.whereIn(condition.column, condition.values!)
806+
this.whereIn(condition.column, condition.values)
807807
}
808808

809809
break
@@ -817,7 +817,7 @@ export class DeploymentModel {
817817
break
818818

819819
case 'whereBetween':
820-
this.whereBetween(condition.column, condition.values!)
820+
this.whereBetween(condition.column, condition.values)
821821
break
822822

823823
case 'whereExists': {
@@ -1278,7 +1278,7 @@ export class DeploymentModel {
12781278
}
12791279

12801280
whereNotIn<V>(column: keyof DeploymentsTable, values: V[]): DeploymentModel {
1281-
return this.applyWhereNotIn(column, values)
1281+
return this.applyWhereNotIn<V>(column, values)
12821282
}
12831283

12841284
static whereNotIn<V = number>(column: keyof DeploymentsTable, values: V[]): DeploymentModel {

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -660,10 +660,10 @@ export class ErrorModel {
660660

661661
case 'whereIn':
662662
if (condition.operator === 'is not') {
663-
subquery = subquery.whereNotIn(condition.column, condition.values!)
663+
subquery = subquery.whereNotIn(condition.column, condition.values)
664664
}
665665
else {
666-
subquery = subquery.whereIn(condition.column, condition.values!)
666+
subquery = subquery.whereIn(condition.column, condition.values)
667667
}
668668

669669
break
@@ -677,7 +677,7 @@ export class ErrorModel {
677677
break
678678

679679
case 'whereBetween':
680-
subquery = subquery.whereBetween(condition.column, condition.values!)
680+
subquery = subquery.whereBetween(condition.column, condition.values)
681681
break
682682

683683
case 'whereExists': {
@@ -759,10 +759,10 @@ export class ErrorModel {
759759

760760
case 'whereIn':
761761
if (condition.operator === 'is not') {
762-
this.whereNotIn(condition.column, condition.values!)
762+
this.whereNotIn(condition.column, condition.values)
763763
}
764764
else {
765-
this.whereIn(condition.column, condition.values!)
765+
this.whereIn(condition.column, condition.values)
766766
}
767767

768768
break
@@ -776,7 +776,7 @@ export class ErrorModel {
776776
break
777777

778778
case 'whereBetween':
779-
this.whereBetween(condition.column, condition.values!)
779+
this.whereBetween(condition.column, condition.values)
780780
break
781781

782782
case 'whereExists': {
@@ -1217,7 +1217,7 @@ export class ErrorModel {
12171217
}
12181218

12191219
whereNotIn<V>(column: keyof ErrorsTable, values: V[]): ErrorModel {
1220-
return this.applyWhereNotIn(column, values)
1220+
return this.applyWhereNotIn<V>(column, values)
12211221
}
12221222

12231223
static whereNotIn<V = number>(column: keyof ErrorsTable, values: V[]): ErrorModel {

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -660,10 +660,10 @@ export class FailedJobModel {
660660

661661
case 'whereIn':
662662
if (condition.operator === 'is not') {
663-
subquery = subquery.whereNotIn(condition.column, condition.values!)
663+
subquery = subquery.whereNotIn(condition.column, condition.values)
664664
}
665665
else {
666-
subquery = subquery.whereIn(condition.column, condition.values!)
666+
subquery = subquery.whereIn(condition.column, condition.values)
667667
}
668668

669669
break
@@ -677,7 +677,7 @@ export class FailedJobModel {
677677
break
678678

679679
case 'whereBetween':
680-
subquery = subquery.whereBetween(condition.column, condition.values!)
680+
subquery = subquery.whereBetween(condition.column, condition.values)
681681
break
682682

683683
case 'whereExists': {
@@ -759,10 +759,10 @@ export class FailedJobModel {
759759

760760
case 'whereIn':
761761
if (condition.operator === 'is not') {
762-
this.whereNotIn(condition.column, condition.values!)
762+
this.whereNotIn(condition.column, condition.values)
763763
}
764764
else {
765-
this.whereIn(condition.column, condition.values!)
765+
this.whereIn(condition.column, condition.values)
766766
}
767767

768768
break
@@ -776,7 +776,7 @@ export class FailedJobModel {
776776
break
777777

778778
case 'whereBetween':
779-
this.whereBetween(condition.column, condition.values!)
779+
this.whereBetween(condition.column, condition.values)
780780
break
781781

782782
case 'whereExists': {
@@ -1217,7 +1217,7 @@ export class FailedJobModel {
12171217
}
12181218

12191219
whereNotIn<V>(column: keyof FailedJobsTable, values: V[]): FailedJobModel {
1220-
return this.applyWhereNotIn(column, values)
1220+
return this.applyWhereNotIn<V>(column, values)
12211221
}
12221222

12231223
static whereNotIn<V = number>(column: keyof FailedJobsTable, values: V[]): FailedJobModel {

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -660,10 +660,10 @@ export class JobModel {
660660

661661
case 'whereIn':
662662
if (condition.operator === 'is not') {
663-
subquery = subquery.whereNotIn(condition.column, condition.values!)
663+
subquery = subquery.whereNotIn(condition.column, condition.values)
664664
}
665665
else {
666-
subquery = subquery.whereIn(condition.column, condition.values!)
666+
subquery = subquery.whereIn(condition.column, condition.values)
667667
}
668668

669669
break
@@ -677,7 +677,7 @@ export class JobModel {
677677
break
678678

679679
case 'whereBetween':
680-
subquery = subquery.whereBetween(condition.column, condition.values!)
680+
subquery = subquery.whereBetween(condition.column, condition.values)
681681
break
682682

683683
case 'whereExists': {
@@ -759,10 +759,10 @@ export class JobModel {
759759

760760
case 'whereIn':
761761
if (condition.operator === 'is not') {
762-
this.whereNotIn(condition.column, condition.values!)
762+
this.whereNotIn(condition.column, condition.values)
763763
}
764764
else {
765-
this.whereIn(condition.column, condition.values!)
765+
this.whereIn(condition.column, condition.values)
766766
}
767767

768768
break
@@ -776,7 +776,7 @@ export class JobModel {
776776
break
777777

778778
case 'whereBetween':
779-
this.whereBetween(condition.column, condition.values!)
779+
this.whereBetween(condition.column, condition.values)
780780
break
781781

782782
case 'whereExists': {
@@ -1217,7 +1217,7 @@ export class JobModel {
12171217
}
12181218

12191219
whereNotIn<V>(column: keyof JobsTable, values: V[]): JobModel {
1220-
return this.applyWhereNotIn(column, values)
1220+
return this.applyWhereNotIn<V>(column, values)
12211221
}
12221222

12231223
static whereNotIn<V = number>(column: keyof JobsTable, values: V[]): JobModel {

0 commit comments

Comments
 (0)