Skip to content

Commit 55a2b04

Browse files
chore: wip
1 parent 1b4a57f commit 55a2b04

File tree

17 files changed

+255
-17
lines changed

17 files changed

+255
-17
lines changed

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

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1477,7 +1477,15 @@ export async function generateModelString(
14771477
static groupBy(column: keyof ${modelName}Type): ${modelName}Model {
14781478
const instance = new ${modelName}Model(null)
14791479
1480-
instance.selectFromQuery = instance.selectFromQuery.orderBy(column)
1480+
instance.selectFromQuery = instance.selectFromQuery.groupBy(column)
1481+
1482+
return instance
1483+
}
1484+
1485+
static having(column: keyof PaymentMethodType, operator: string, value: any): ${modelName}Model {
1486+
const instance = new ${modelName}Model(null)
1487+
1488+
instance.selectFromQuery = instance.selectFromQuery.having(column, operator, value)
14811489
14821490
return instance
14831491
}
@@ -1487,6 +1495,12 @@ export async function generateModelString(
14871495
14881496
return this
14891497
}
1498+
1499+
having(column: keyof ${modelName}Type, operator: string, value: any): ${modelName}Model {
1500+
this.selectFromQuery = this.selectFromQuery.having(column, operator, value)
1501+
1502+
return this
1503+
}
14901504
14911505
groupBy(column: keyof ${modelName}Type): ${modelName}Model {
14921506
this.selectFromQuery = this.selectFromQuery.groupBy(column)

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

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -815,7 +815,15 @@ export class AccessTokenModel {
815815
static groupBy(column: keyof AccessTokenType): AccessTokenModel {
816816
const instance = new AccessTokenModel(null)
817817

818-
instance.selectFromQuery = instance.selectFromQuery.orderBy(column)
818+
instance.selectFromQuery = instance.selectFromQuery.groupBy(column)
819+
820+
return instance
821+
}
822+
823+
static having(column: keyof PaymentMethodType, operator: string, value: any): AccessTokenModel {
824+
const instance = new AccessTokenModel(null)
825+
826+
instance.selectFromQuery = instance.selectFromQuery.having(column, operator, value)
819827

820828
return instance
821829
}
@@ -826,6 +834,12 @@ export class AccessTokenModel {
826834
return this
827835
}
828836

837+
having(column: keyof AccessTokenType, operator: string, value: any): AccessTokenModel {
838+
this.selectFromQuery = this.selectFromQuery.having(column, operator, value)
839+
840+
return this
841+
}
842+
829843
groupBy(column: keyof AccessTokenType): AccessTokenModel {
830844
this.selectFromQuery = this.selectFromQuery.groupBy(column)
831845

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

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -858,7 +858,15 @@ export class DeploymentModel {
858858
static groupBy(column: keyof DeploymentType): DeploymentModel {
859859
const instance = new DeploymentModel(null)
860860

861-
instance.selectFromQuery = instance.selectFromQuery.orderBy(column)
861+
instance.selectFromQuery = instance.selectFromQuery.groupBy(column)
862+
863+
return instance
864+
}
865+
866+
static having(column: keyof PaymentMethodType, operator: string, value: any): DeploymentModel {
867+
const instance = new DeploymentModel(null)
868+
869+
instance.selectFromQuery = instance.selectFromQuery.having(column, operator, value)
862870

863871
return instance
864872
}
@@ -869,6 +877,12 @@ export class DeploymentModel {
869877
return this
870878
}
871879

880+
having(column: keyof DeploymentType, operator: string, value: any): DeploymentModel {
881+
this.selectFromQuery = this.selectFromQuery.having(column, operator, value)
882+
883+
return this
884+
}
885+
872886
groupBy(column: keyof DeploymentType): DeploymentModel {
873887
this.selectFromQuery = this.selectFromQuery.groupBy(column)
874888

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

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -813,7 +813,15 @@ export class ErrorModel {
813813
static groupBy(column: keyof ErrorType): ErrorModel {
814814
const instance = new ErrorModel(null)
815815

816-
instance.selectFromQuery = instance.selectFromQuery.orderBy(column)
816+
instance.selectFromQuery = instance.selectFromQuery.groupBy(column)
817+
818+
return instance
819+
}
820+
821+
static having(column: keyof PaymentMethodType, operator: string, value: any): ErrorModel {
822+
const instance = new ErrorModel(null)
823+
824+
instance.selectFromQuery = instance.selectFromQuery.having(column, operator, value)
817825

818826
return instance
819827
}
@@ -824,6 +832,12 @@ export class ErrorModel {
824832
return this
825833
}
826834

835+
having(column: keyof ErrorType, operator: string, value: any): ErrorModel {
836+
this.selectFromQuery = this.selectFromQuery.having(column, operator, value)
837+
838+
return this
839+
}
840+
827841
groupBy(column: keyof ErrorType): ErrorModel {
828842
this.selectFromQuery = this.selectFromQuery.groupBy(column)
829843

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

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -813,7 +813,15 @@ export class FailedJobModel {
813813
static groupBy(column: keyof FailedJobType): FailedJobModel {
814814
const instance = new FailedJobModel(null)
815815

816-
instance.selectFromQuery = instance.selectFromQuery.orderBy(column)
816+
instance.selectFromQuery = instance.selectFromQuery.groupBy(column)
817+
818+
return instance
819+
}
820+
821+
static having(column: keyof PaymentMethodType, operator: string, value: any): FailedJobModel {
822+
const instance = new FailedJobModel(null)
823+
824+
instance.selectFromQuery = instance.selectFromQuery.having(column, operator, value)
817825

818826
return instance
819827
}
@@ -824,6 +832,12 @@ export class FailedJobModel {
824832
return this
825833
}
826834

835+
having(column: keyof FailedJobType, operator: string, value: any): FailedJobModel {
836+
this.selectFromQuery = this.selectFromQuery.having(column, operator, value)
837+
838+
return this
839+
}
840+
827841
groupBy(column: keyof FailedJobType): FailedJobModel {
828842
this.selectFromQuery = this.selectFromQuery.groupBy(column)
829843

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

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -813,7 +813,15 @@ export class JobModel {
813813
static groupBy(column: keyof JobType): JobModel {
814814
const instance = new JobModel(null)
815815

816-
instance.selectFromQuery = instance.selectFromQuery.orderBy(column)
816+
instance.selectFromQuery = instance.selectFromQuery.groupBy(column)
817+
818+
return instance
819+
}
820+
821+
static having(column: keyof PaymentMethodType, operator: string, value: any): JobModel {
822+
const instance = new JobModel(null)
823+
824+
instance.selectFromQuery = instance.selectFromQuery.having(column, operator, value)
817825

818826
return instance
819827
}
@@ -824,6 +832,12 @@ export class JobModel {
824832
return this
825833
}
826834

835+
having(column: keyof JobType, operator: string, value: any): JobModel {
836+
this.selectFromQuery = this.selectFromQuery.having(column, operator, value)
837+
838+
return this
839+
}
840+
827841
groupBy(column: keyof JobType): JobModel {
828842
this.selectFromQuery = this.selectFromQuery.groupBy(column)
829843

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

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -868,7 +868,15 @@ export class PaymentMethodModel {
868868
static groupBy(column: keyof PaymentMethodType): PaymentMethodModel {
869869
const instance = new PaymentMethodModel(null)
870870

871-
instance.selectFromQuery = instance.selectFromQuery.orderBy(column)
871+
instance.selectFromQuery = instance.selectFromQuery.groupBy(column)
872+
873+
return instance
874+
}
875+
876+
static having(column: keyof PaymentMethodType, operator: string, value: any): PaymentMethodModel {
877+
const instance = new PaymentMethodModel(null)
878+
879+
instance.selectFromQuery = instance.selectFromQuery.having(column, operator, value)
872880

873881
return instance
874882
}
@@ -879,6 +887,12 @@ export class PaymentMethodModel {
879887
return this
880888
}
881889

890+
having(column: keyof PaymentMethodType, operator: string, value: any): PaymentMethodModel {
891+
this.selectFromQuery = this.selectFromQuery.having(column, operator, value)
892+
893+
return this
894+
}
895+
882896
groupBy(column: keyof PaymentMethodType): PaymentMethodModel {
883897
this.selectFromQuery = this.selectFromQuery.groupBy(column)
884898

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

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -793,7 +793,15 @@ export class PostModel {
793793
static groupBy(column: keyof PostType): PostModel {
794794
const instance = new PostModel(null)
795795

796-
instance.selectFromQuery = instance.selectFromQuery.orderBy(column)
796+
instance.selectFromQuery = instance.selectFromQuery.groupBy(column)
797+
798+
return instance
799+
}
800+
801+
static having(column: keyof PaymentMethodType, operator: string, value: any): PostModel {
802+
const instance = new PostModel(null)
803+
804+
instance.selectFromQuery = instance.selectFromQuery.having(column, operator, value)
797805

798806
return instance
799807
}
@@ -804,6 +812,12 @@ export class PostModel {
804812
return this
805813
}
806814

815+
having(column: keyof PostType, operator: string, value: any): PostModel {
816+
this.selectFromQuery = this.selectFromQuery.having(column, operator, value)
817+
818+
return this
819+
}
820+
807821
groupBy(column: keyof PostType): PostModel {
808822
this.selectFromQuery = this.selectFromQuery.groupBy(column)
809823

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

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -845,7 +845,15 @@ export class ProductModel {
845845
static groupBy(column: keyof ProductType): ProductModel {
846846
const instance = new ProductModel(null)
847847

848-
instance.selectFromQuery = instance.selectFromQuery.orderBy(column)
848+
instance.selectFromQuery = instance.selectFromQuery.groupBy(column)
849+
850+
return instance
851+
}
852+
853+
static having(column: keyof PaymentMethodType, operator: string, value: any): ProductModel {
854+
const instance = new ProductModel(null)
855+
856+
instance.selectFromQuery = instance.selectFromQuery.having(column, operator, value)
849857

850858
return instance
851859
}
@@ -856,6 +864,12 @@ export class ProductModel {
856864
return this
857865
}
858866

867+
having(column: keyof ProductType, operator: string, value: any): ProductModel {
868+
this.selectFromQuery = this.selectFromQuery.having(column, operator, value)
869+
870+
return this
871+
}
872+
859873
groupBy(column: keyof ProductType): ProductModel {
860874
this.selectFromQuery = this.selectFromQuery.groupBy(column)
861875

storage/framework/orm/src/models/Project.ts

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -802,7 +802,15 @@ export class ProjectModel {
802802
static groupBy(column: keyof ProjectType): ProjectModel {
803803
const instance = new ProjectModel(null)
804804

805-
instance.selectFromQuery = instance.selectFromQuery.orderBy(column)
805+
instance.selectFromQuery = instance.selectFromQuery.groupBy(column)
806+
807+
return instance
808+
}
809+
810+
static having(column: keyof PaymentMethodType, operator: string, value: any): ProjectModel {
811+
const instance = new ProjectModel(null)
812+
813+
instance.selectFromQuery = instance.selectFromQuery.having(column, operator, value)
806814

807815
return instance
808816
}
@@ -813,6 +821,12 @@ export class ProjectModel {
813821
return this
814822
}
815823

824+
having(column: keyof ProjectType, operator: string, value: any): ProjectModel {
825+
this.selectFromQuery = this.selectFromQuery.having(column, operator, value)
826+
827+
return this
828+
}
829+
816830
groupBy(column: keyof ProjectType): ProjectModel {
817831
this.selectFromQuery = this.selectFromQuery.groupBy(column)
818832

0 commit comments

Comments
 (0)