Skip to content

Commit 7b13999

Browse files
glennmichael123glennmichael123
committed
chore: wip
1 parent 2ece3ff commit 7b13999

File tree

18 files changed

+216
-162
lines changed

18 files changed

+216
-162
lines changed

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

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1512,22 +1512,25 @@ export async function generateModelString(
15121512
.execute()
15131513
}
15141514
1515-
private static applyWhere(instance: ${modelName}Model, column: string, operator: string, value: any): ${modelName}Model {
1516-
instance.selectFromQuery = instance.selectFromQuery.where(column, operator, value)
1517-
instance.updateFromQuery = instance.updateFromQuery.where(column, operator, value)
1518-
instance.deleteFromQuery = instance.deleteFromQuery.where(column, operator, value)
1515+
private static applyWhere(instance: ${modelName}Model, column: string, ...args: any[]): ${modelName}Model {
1516+
const [operatorOrValue, value] = args
1517+
const operator = value === undefined ? '=' : operatorOrValue
1518+
const actualValue = value === undefined ? operatorOrValue : value
1519+
1520+
instance.selectFromQuery = instance.selectFromQuery.where(column, operator, actualValue)
1521+
instance.updateFromQuery = instance.updateFromQuery.where(column, operator, actualValue)
1522+
instance.deleteFromQuery = instance.deleteFromQuery.where(column, operator, actualValue)
15191523
15201524
return instance
15211525
}
15221526
1523-
where(column: string, operator: string, value: any): ${modelName}Model {
1524-
return ${modelName}Model.applyWhere(this, column, operator, value)
1527+
where(column: string, ...args: any[]): ${modelName}Model {
1528+
return ${modelName}Model.applyWhere(this, column, ...args)
15251529
}
15261530
1527-
static where(column: string, operator: string, value: any): ${modelName}Model {
1531+
static where(column: string, ...args: any[]): ${modelName}Model {
15281532
const instance = new ${modelName}Model(null)
1529-
1530-
return ${modelName}Model.applyWhere(instance, column, operator, value)
1533+
return ${modelName}Model.applyWhere(instance, column, ...args)
15311534
}
15321535
15331536
whereColumn(first: string, operator: string, second: string): ${modelName}Model {

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

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -726,22 +726,25 @@ export class AccessTokenModel {
726726
.execute()
727727
}
728728

729-
private static applyWhere(instance: AccessTokenModel, column: string, operator: string, value: any): AccessTokenModel {
730-
instance.selectFromQuery = instance.selectFromQuery.where(column, operator, value)
731-
instance.updateFromQuery = instance.updateFromQuery.where(column, operator, value)
732-
instance.deleteFromQuery = instance.deleteFromQuery.where(column, operator, value)
729+
private static applyWhere(instance: AccessTokenModel, column: string, ...args: any[]): AccessTokenModel {
730+
const [operatorOrValue, value] = args
731+
const operator = value === undefined ? '=' : operatorOrValue
732+
const actualValue = value === undefined ? operatorOrValue : value
733+
734+
instance.selectFromQuery = instance.selectFromQuery.where(column, operator, actualValue)
735+
instance.updateFromQuery = instance.updateFromQuery.where(column, operator, actualValue)
736+
instance.deleteFromQuery = instance.deleteFromQuery.where(column, operator, actualValue)
733737

734738
return instance
735739
}
736740

737-
where(column: string, operator: string, value: any): AccessTokenModel {
738-
return AccessTokenModel.applyWhere(this, column, operator, value)
741+
where(column: string, ...args: any[]): AccessTokenModel {
742+
return AccessTokenModel.applyWhere(this, column, ...args)
739743
}
740744

741-
static where(column: string, operator: string, value: any): AccessTokenModel {
745+
static where(column: string, ...args: any[]): AccessTokenModel {
742746
const instance = new AccessTokenModel(null)
743-
744-
return AccessTokenModel.applyWhere(instance, column, operator, value)
747+
return AccessTokenModel.applyWhere(instance, column, ...args)
745748
}
746749

747750
whereColumn(first: string, operator: string, second: string): AccessTokenModel {

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

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -764,22 +764,25 @@ export class ActivityModel {
764764
.execute()
765765
}
766766

767-
private static applyWhere(instance: ActivityModel, column: string, operator: string, value: any): ActivityModel {
768-
instance.selectFromQuery = instance.selectFromQuery.where(column, operator, value)
769-
instance.updateFromQuery = instance.updateFromQuery.where(column, operator, value)
770-
instance.deleteFromQuery = instance.deleteFromQuery.where(column, operator, value)
767+
private static applyWhere(instance: ActivityModel, column: string, ...args: any[]): ActivityModel {
768+
const [operatorOrValue, value] = args
769+
const operator = value === undefined ? '=' : operatorOrValue
770+
const actualValue = value === undefined ? operatorOrValue : value
771+
772+
instance.selectFromQuery = instance.selectFromQuery.where(column, operator, actualValue)
773+
instance.updateFromQuery = instance.updateFromQuery.where(column, operator, actualValue)
774+
instance.deleteFromQuery = instance.deleteFromQuery.where(column, operator, actualValue)
771775

772776
return instance
773777
}
774778

775-
where(column: string, operator: string, value: any): ActivityModel {
776-
return ActivityModel.applyWhere(this, column, operator, value)
779+
where(column: string, ...args: any[]): ActivityModel {
780+
return ActivityModel.applyWhere(this, column, ...args)
777781
}
778782

779-
static where(column: string, operator: string, value: any): ActivityModel {
783+
static where(column: string, ...args: any[]): ActivityModel {
780784
const instance = new ActivityModel(null)
781-
782-
return ActivityModel.applyWhere(instance, column, operator, value)
785+
return ActivityModel.applyWhere(instance, column, ...args)
783786
}
784787

785788
whereColumn(first: string, operator: string, second: string): ActivityModel {

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

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -767,22 +767,25 @@ export class DeploymentModel {
767767
.execute()
768768
}
769769

770-
private static applyWhere(instance: DeploymentModel, column: string, operator: string, value: any): DeploymentModel {
771-
instance.selectFromQuery = instance.selectFromQuery.where(column, operator, value)
772-
instance.updateFromQuery = instance.updateFromQuery.where(column, operator, value)
773-
instance.deleteFromQuery = instance.deleteFromQuery.where(column, operator, value)
770+
private static applyWhere(instance: DeploymentModel, column: string, ...args: any[]): DeploymentModel {
771+
const [operatorOrValue, value] = args
772+
const operator = value === undefined ? '=' : operatorOrValue
773+
const actualValue = value === undefined ? operatorOrValue : value
774+
775+
instance.selectFromQuery = instance.selectFromQuery.where(column, operator, actualValue)
776+
instance.updateFromQuery = instance.updateFromQuery.where(column, operator, actualValue)
777+
instance.deleteFromQuery = instance.deleteFromQuery.where(column, operator, actualValue)
774778

775779
return instance
776780
}
777781

778-
where(column: string, operator: string, value: any): DeploymentModel {
779-
return DeploymentModel.applyWhere(this, column, operator, value)
782+
where(column: string, ...args: any[]): DeploymentModel {
783+
return DeploymentModel.applyWhere(this, column, ...args)
780784
}
781785

782-
static where(column: string, operator: string, value: any): DeploymentModel {
786+
static where(column: string, ...args: any[]): DeploymentModel {
783787
const instance = new DeploymentModel(null)
784-
785-
return DeploymentModel.applyWhere(instance, column, operator, value)
788+
return DeploymentModel.applyWhere(instance, column, ...args)
786789
}
787790

788791
whereColumn(first: string, operator: string, second: string): DeploymentModel {

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

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -718,22 +718,25 @@ export class ErrorModel {
718718
.execute()
719719
}
720720

721-
private static applyWhere(instance: ErrorModel, column: string, operator: string, value: any): ErrorModel {
722-
instance.selectFromQuery = instance.selectFromQuery.where(column, operator, value)
723-
instance.updateFromQuery = instance.updateFromQuery.where(column, operator, value)
724-
instance.deleteFromQuery = instance.deleteFromQuery.where(column, operator, value)
721+
private static applyWhere(instance: ErrorModel, column: string, ...args: any[]): ErrorModel {
722+
const [operatorOrValue, value] = args
723+
const operator = value === undefined ? '=' : operatorOrValue
724+
const actualValue = value === undefined ? operatorOrValue : value
725+
726+
instance.selectFromQuery = instance.selectFromQuery.where(column, operator, actualValue)
727+
instance.updateFromQuery = instance.updateFromQuery.where(column, operator, actualValue)
728+
instance.deleteFromQuery = instance.deleteFromQuery.where(column, operator, actualValue)
725729

726730
return instance
727731
}
728732

729-
where(column: string, operator: string, value: any): ErrorModel {
730-
return ErrorModel.applyWhere(this, column, operator, value)
733+
where(column: string, ...args: any[]): ErrorModel {
734+
return ErrorModel.applyWhere(this, column, ...args)
731735
}
732736

733-
static where(column: string, operator: string, value: any): ErrorModel {
737+
static where(column: string, ...args: any[]): ErrorModel {
734738
const instance = new ErrorModel(null)
735-
736-
return ErrorModel.applyWhere(instance, column, operator, value)
739+
return ErrorModel.applyWhere(instance, column, ...args)
737740
}
738741

739742
whereColumn(first: string, operator: string, second: string): ErrorModel {

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

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -718,22 +718,25 @@ export class FailedJobModel {
718718
.execute()
719719
}
720720

721-
private static applyWhere(instance: FailedJobModel, column: string, operator: string, value: any): FailedJobModel {
722-
instance.selectFromQuery = instance.selectFromQuery.where(column, operator, value)
723-
instance.updateFromQuery = instance.updateFromQuery.where(column, operator, value)
724-
instance.deleteFromQuery = instance.deleteFromQuery.where(column, operator, value)
721+
private static applyWhere(instance: FailedJobModel, column: string, ...args: any[]): FailedJobModel {
722+
const [operatorOrValue, value] = args
723+
const operator = value === undefined ? '=' : operatorOrValue
724+
const actualValue = value === undefined ? operatorOrValue : value
725+
726+
instance.selectFromQuery = instance.selectFromQuery.where(column, operator, actualValue)
727+
instance.updateFromQuery = instance.updateFromQuery.where(column, operator, actualValue)
728+
instance.deleteFromQuery = instance.deleteFromQuery.where(column, operator, actualValue)
725729

726730
return instance
727731
}
728732

729-
where(column: string, operator: string, value: any): FailedJobModel {
730-
return FailedJobModel.applyWhere(this, column, operator, value)
733+
where(column: string, ...args: any[]): FailedJobModel {
734+
return FailedJobModel.applyWhere(this, column, ...args)
731735
}
732736

733-
static where(column: string, operator: string, value: any): FailedJobModel {
737+
static where(column: string, ...args: any[]): FailedJobModel {
734738
const instance = new FailedJobModel(null)
735-
736-
return FailedJobModel.applyWhere(instance, column, operator, value)
739+
return FailedJobModel.applyWhere(instance, column, ...args)
737740
}
738741

739742
whereColumn(first: string, operator: string, second: string): FailedJobModel {

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

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -718,22 +718,25 @@ export class JobModel {
718718
.execute()
719719
}
720720

721-
private static applyWhere(instance: JobModel, column: string, operator: string, value: any): JobModel {
722-
instance.selectFromQuery = instance.selectFromQuery.where(column, operator, value)
723-
instance.updateFromQuery = instance.updateFromQuery.where(column, operator, value)
724-
instance.deleteFromQuery = instance.deleteFromQuery.where(column, operator, value)
721+
private static applyWhere(instance: JobModel, column: string, ...args: any[]): JobModel {
722+
const [operatorOrValue, value] = args
723+
const operator = value === undefined ? '=' : operatorOrValue
724+
const actualValue = value === undefined ? operatorOrValue : value
725+
726+
instance.selectFromQuery = instance.selectFromQuery.where(column, operator, actualValue)
727+
instance.updateFromQuery = instance.updateFromQuery.where(column, operator, actualValue)
728+
instance.deleteFromQuery = instance.deleteFromQuery.where(column, operator, actualValue)
725729

726730
return instance
727731
}
728732

729-
where(column: string, operator: string, value: any): JobModel {
730-
return JobModel.applyWhere(this, column, operator, value)
733+
where(column: string, ...args: any[]): JobModel {
734+
return JobModel.applyWhere(this, column, ...args)
731735
}
732736

733-
static where(column: string, operator: string, value: any): JobModel {
737+
static where(column: string, ...args: any[]): JobModel {
734738
const instance = new JobModel(null)
735-
736-
return JobModel.applyWhere(instance, column, operator, value)
739+
return JobModel.applyWhere(instance, column, ...args)
737740
}
738741

739742
whereColumn(first: string, operator: string, second: string): JobModel {

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

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -780,22 +780,25 @@ export class PaymentMethodModel {
780780
.execute()
781781
}
782782

783-
private static applyWhere(instance: PaymentMethodModel, column: string, operator: string, value: any): PaymentMethodModel {
784-
instance.selectFromQuery = instance.selectFromQuery.where(column, operator, value)
785-
instance.updateFromQuery = instance.updateFromQuery.where(column, operator, value)
786-
instance.deleteFromQuery = instance.deleteFromQuery.where(column, operator, value)
783+
private static applyWhere(instance: PaymentMethodModel, column: string, ...args: any[]): PaymentMethodModel {
784+
const [operatorOrValue, value] = args
785+
const operator = value === undefined ? '=' : operatorOrValue
786+
const actualValue = value === undefined ? operatorOrValue : value
787+
788+
instance.selectFromQuery = instance.selectFromQuery.where(column, operator, actualValue)
789+
instance.updateFromQuery = instance.updateFromQuery.where(column, operator, actualValue)
790+
instance.deleteFromQuery = instance.deleteFromQuery.where(column, operator, actualValue)
787791

788792
return instance
789793
}
790794

791-
where(column: string, operator: string, value: any): PaymentMethodModel {
792-
return PaymentMethodModel.applyWhere(this, column, operator, value)
795+
where(column: string, ...args: any[]): PaymentMethodModel {
796+
return PaymentMethodModel.applyWhere(this, column, ...args)
793797
}
794798

795-
static where(column: string, operator: string, value: any): PaymentMethodModel {
799+
static where(column: string, ...args: any[]): PaymentMethodModel {
796800
const instance = new PaymentMethodModel(null)
797-
798-
return PaymentMethodModel.applyWhere(instance, column, operator, value)
801+
return PaymentMethodModel.applyWhere(instance, column, ...args)
799802
}
800803

801804
whereColumn(first: string, operator: string, second: string): PaymentMethodModel {

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

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -708,22 +708,25 @@ export class PostModel {
708708
.execute()
709709
}
710710

711-
private static applyWhere(instance: PostModel, column: string, operator: string, value: any): PostModel {
712-
instance.selectFromQuery = instance.selectFromQuery.where(column, operator, value)
713-
instance.updateFromQuery = instance.updateFromQuery.where(column, operator, value)
714-
instance.deleteFromQuery = instance.deleteFromQuery.where(column, operator, value)
711+
private static applyWhere(instance: PostModel, column: string, ...args: any[]): PostModel {
712+
const [operatorOrValue, value] = args
713+
const operator = value === undefined ? '=' : operatorOrValue
714+
const actualValue = value === undefined ? operatorOrValue : value
715+
716+
instance.selectFromQuery = instance.selectFromQuery.where(column, operator, actualValue)
717+
instance.updateFromQuery = instance.updateFromQuery.where(column, operator, actualValue)
718+
instance.deleteFromQuery = instance.deleteFromQuery.where(column, operator, actualValue)
715719

716720
return instance
717721
}
718722

719-
where(column: string, operator: string, value: any): PostModel {
720-
return PostModel.applyWhere(this, column, operator, value)
723+
where(column: string, ...args: any[]): PostModel {
724+
return PostModel.applyWhere(this, column, ...args)
721725
}
722726

723-
static where(column: string, operator: string, value: any): PostModel {
727+
static where(column: string, ...args: any[]): PostModel {
724728
const instance = new PostModel(null)
725-
726-
return PostModel.applyWhere(instance, column, operator, value)
729+
return PostModel.applyWhere(instance, column, ...args)
727730
}
728731

729732
whereColumn(first: string, operator: string, second: string): PostModel {

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

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -750,22 +750,25 @@ export class ProductModel {
750750
.execute()
751751
}
752752

753-
private static applyWhere(instance: ProductModel, column: string, operator: string, value: any): ProductModel {
754-
instance.selectFromQuery = instance.selectFromQuery.where(column, operator, value)
755-
instance.updateFromQuery = instance.updateFromQuery.where(column, operator, value)
756-
instance.deleteFromQuery = instance.deleteFromQuery.where(column, operator, value)
753+
private static applyWhere(instance: ProductModel, column: string, ...args: any[]): ProductModel {
754+
const [operatorOrValue, value] = args
755+
const operator = value === undefined ? '=' : operatorOrValue
756+
const actualValue = value === undefined ? operatorOrValue : value
757+
758+
instance.selectFromQuery = instance.selectFromQuery.where(column, operator, actualValue)
759+
instance.updateFromQuery = instance.updateFromQuery.where(column, operator, actualValue)
760+
instance.deleteFromQuery = instance.deleteFromQuery.where(column, operator, actualValue)
757761

758762
return instance
759763
}
760764

761-
where(column: string, operator: string, value: any): ProductModel {
762-
return ProductModel.applyWhere(this, column, operator, value)
765+
where(column: string, ...args: any[]): ProductModel {
766+
return ProductModel.applyWhere(this, column, ...args)
763767
}
764768

765-
static where(column: string, operator: string, value: any): ProductModel {
769+
static where(column: string, ...args: any[]): ProductModel {
766770
const instance = new ProductModel(null)
767-
768-
return ProductModel.applyWhere(instance, column, operator, value)
771+
return ProductModel.applyWhere(instance, column, ...args)
769772
}
770773

771774
whereColumn(first: string, operator: string, second: string): ProductModel {

0 commit comments

Comments
 (0)