Skip to content

Commit 680feac

Browse files
glennmichael123glennmichael123
committed
chore: wip
1 parent ed44c16 commit 680feac

18 files changed

+534
-511
lines changed

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

Lines changed: 32 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -796,46 +796,48 @@ export class AccessTokenModel {
796796
return instance
797797
}
798798

799-
orWhere(column: string, ...args: any[]): AccessTokenModel {
800-
const [operatorOrValue, value] = args
801-
const operator = value === undefined ? '=' : operatorOrValue
802-
const actualValue = value === undefined ? operatorOrValue : value
803-
804-
// Use the expression builder to append the OR condition
805-
this.selectFromQuery = this.selectFromQuery.where((eb: any) =>
806-
eb.or([eb(column, operator, actualValue)]),
807-
)
799+
orWhere(...conditions: [string, any][]): AccessTokenModel {
800+
this.selectFromQuery = this.selectFromQuery.where((eb) => {
801+
return eb.or(
802+
conditions.map(([column, value]) => eb(column, '=', value)),
803+
)
804+
})
808805

809-
this.updateFromQuery = this.updateFromQuery.where((eb: any) =>
810-
eb.or([eb(column, operator, actualValue)]),
811-
)
806+
this.updateFromQuery = this.updateFromQuery.where((eb) => {
807+
return eb.or(
808+
conditions.map(([column, value]) => eb(column, '=', value)),
809+
)
810+
})
812811

813-
this.deleteFromQuery = this.deleteFromQuery.where((eb: any) =>
814-
eb.or([eb(column, operator, actualValue)]),
815-
)
812+
this.deleteFromQuery = this.deleteFromQuery.where((eb) => {
813+
return eb.or(
814+
conditions.map(([column, value]) => eb(column, '=', value)),
815+
)
816+
})
816817

817818
return this
818819
}
819820

820-
static orWhere(column: string, ...args: any[]): AccessTokenModel {
821+
static orWhere(...conditions: [string, any][]): AccessTokenModel {
821822
const instance = new AccessTokenModel(null)
822823

823-
const [operatorOrValue, value] = args
824-
const operator = value === undefined ? '=' : operatorOrValue
825-
const actualValue = value === undefined ? operatorOrValue : value
826-
827-
// Use the expression builder to append the OR condition
828-
instance.selectFromQuery = instance.selectFromQuery.where((eb: any) =>
829-
eb.or([eb(column, operator, actualValue)]),
830-
)
824+
instance.selectFromQuery = instance.selectFromQuery.where((eb) => {
825+
return eb.or(
826+
conditions.map(([column, value]) => eb(column, '=', value)),
827+
)
828+
})
831829

832-
instance.updateFromQuery = instance.updateFromQuery.where((eb: any) =>
833-
eb.or([eb(column, operator, actualValue)]),
834-
)
830+
instance.updateFromQuery = instance.updateFromQuery.where((eb) => {
831+
return eb.or(
832+
conditions.map(([column, value]) => eb(column, '=', value)),
833+
)
834+
})
835835

836-
instance.deleteFromQuery = instance.deleteFromQuery.where((eb: any) =>
837-
eb.or([eb(column, operator, actualValue)]),
838-
)
836+
instance.deleteFromQuery = instance.deleteFromQuery.where((eb) => {
837+
return eb.or(
838+
conditions.map(([column, value]) => eb(column, '=', value)),
839+
)
840+
})
839841

840842
return instance
841843
}

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

Lines changed: 32 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -826,46 +826,48 @@ export class ActivityModel {
826826
return instance
827827
}
828828

829-
orWhere(column: string, ...args: any[]): ActivityModel {
830-
const [operatorOrValue, value] = args
831-
const operator = value === undefined ? '=' : operatorOrValue
832-
const actualValue = value === undefined ? operatorOrValue : value
833-
834-
// Use the expression builder to append the OR condition
835-
this.selectFromQuery = this.selectFromQuery.where((eb: any) =>
836-
eb.or([eb(column, operator, actualValue)]),
837-
)
829+
orWhere(...conditions: [string, any][]): ActivityModel {
830+
this.selectFromQuery = this.selectFromQuery.where((eb) => {
831+
return eb.or(
832+
conditions.map(([column, value]) => eb(column, '=', value)),
833+
)
834+
})
838835

839-
this.updateFromQuery = this.updateFromQuery.where((eb: any) =>
840-
eb.or([eb(column, operator, actualValue)]),
841-
)
836+
this.updateFromQuery = this.updateFromQuery.where((eb) => {
837+
return eb.or(
838+
conditions.map(([column, value]) => eb(column, '=', value)),
839+
)
840+
})
842841

843-
this.deleteFromQuery = this.deleteFromQuery.where((eb: any) =>
844-
eb.or([eb(column, operator, actualValue)]),
845-
)
842+
this.deleteFromQuery = this.deleteFromQuery.where((eb) => {
843+
return eb.or(
844+
conditions.map(([column, value]) => eb(column, '=', value)),
845+
)
846+
})
846847

847848
return this
848849
}
849850

850-
static orWhere(column: string, ...args: any[]): ActivityModel {
851+
static orWhere(...conditions: [string, any][]): ActivityModel {
851852
const instance = new ActivityModel(null)
852853

853-
const [operatorOrValue, value] = args
854-
const operator = value === undefined ? '=' : operatorOrValue
855-
const actualValue = value === undefined ? operatorOrValue : value
856-
857-
// Use the expression builder to append the OR condition
858-
instance.selectFromQuery = instance.selectFromQuery.where((eb: any) =>
859-
eb.or([eb(column, operator, actualValue)]),
860-
)
854+
instance.selectFromQuery = instance.selectFromQuery.where((eb) => {
855+
return eb.or(
856+
conditions.map(([column, value]) => eb(column, '=', value)),
857+
)
858+
})
861859

862-
instance.updateFromQuery = instance.updateFromQuery.where((eb: any) =>
863-
eb.or([eb(column, operator, actualValue)]),
864-
)
860+
instance.updateFromQuery = instance.updateFromQuery.where((eb) => {
861+
return eb.or(
862+
conditions.map(([column, value]) => eb(column, '=', value)),
863+
)
864+
})
865865

866-
instance.deleteFromQuery = instance.deleteFromQuery.where((eb: any) =>
867-
eb.or([eb(column, operator, actualValue)]),
868-
)
866+
instance.deleteFromQuery = instance.deleteFromQuery.where((eb) => {
867+
return eb.or(
868+
conditions.map(([column, value]) => eb(column, '=', value)),
869+
)
870+
})
869871

870872
return instance
871873
}

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

Lines changed: 32 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -837,46 +837,48 @@ export class DeploymentModel {
837837
return instance
838838
}
839839

840-
orWhere(column: string, ...args: any[]): DeploymentModel {
841-
const [operatorOrValue, value] = args
842-
const operator = value === undefined ? '=' : operatorOrValue
843-
const actualValue = value === undefined ? operatorOrValue : value
844-
845-
// Use the expression builder to append the OR condition
846-
this.selectFromQuery = this.selectFromQuery.where((eb: any) =>
847-
eb.or([eb(column, operator, actualValue)]),
848-
)
840+
orWhere(...conditions: [string, any][]): DeploymentModel {
841+
this.selectFromQuery = this.selectFromQuery.where((eb) => {
842+
return eb.or(
843+
conditions.map(([column, value]) => eb(column, '=', value)),
844+
)
845+
})
849846

850-
this.updateFromQuery = this.updateFromQuery.where((eb: any) =>
851-
eb.or([eb(column, operator, actualValue)]),
852-
)
847+
this.updateFromQuery = this.updateFromQuery.where((eb) => {
848+
return eb.or(
849+
conditions.map(([column, value]) => eb(column, '=', value)),
850+
)
851+
})
853852

854-
this.deleteFromQuery = this.deleteFromQuery.where((eb: any) =>
855-
eb.or([eb(column, operator, actualValue)]),
856-
)
853+
this.deleteFromQuery = this.deleteFromQuery.where((eb) => {
854+
return eb.or(
855+
conditions.map(([column, value]) => eb(column, '=', value)),
856+
)
857+
})
857858

858859
return this
859860
}
860861

861-
static orWhere(column: string, ...args: any[]): DeploymentModel {
862+
static orWhere(...conditions: [string, any][]): DeploymentModel {
862863
const instance = new DeploymentModel(null)
863864

864-
const [operatorOrValue, value] = args
865-
const operator = value === undefined ? '=' : operatorOrValue
866-
const actualValue = value === undefined ? operatorOrValue : value
867-
868-
// Use the expression builder to append the OR condition
869-
instance.selectFromQuery = instance.selectFromQuery.where((eb: any) =>
870-
eb.or([eb(column, operator, actualValue)]),
871-
)
865+
instance.selectFromQuery = instance.selectFromQuery.where((eb) => {
866+
return eb.or(
867+
conditions.map(([column, value]) => eb(column, '=', value)),
868+
)
869+
})
872870

873-
instance.updateFromQuery = instance.updateFromQuery.where((eb: any) =>
874-
eb.or([eb(column, operator, actualValue)]),
875-
)
871+
instance.updateFromQuery = instance.updateFromQuery.where((eb) => {
872+
return eb.or(
873+
conditions.map(([column, value]) => eb(column, '=', value)),
874+
)
875+
})
876876

877-
instance.deleteFromQuery = instance.deleteFromQuery.where((eb: any) =>
878-
eb.or([eb(column, operator, actualValue)]),
879-
)
877+
instance.deleteFromQuery = instance.deleteFromQuery.where((eb) => {
878+
return eb.or(
879+
conditions.map(([column, value]) => eb(column, '=', value)),
880+
)
881+
})
880882

881883
return instance
882884
}

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

Lines changed: 32 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -788,46 +788,48 @@ export class ErrorModel {
788788
return instance
789789
}
790790

791-
orWhere(column: string, ...args: any[]): ErrorModel {
792-
const [operatorOrValue, value] = args
793-
const operator = value === undefined ? '=' : operatorOrValue
794-
const actualValue = value === undefined ? operatorOrValue : value
795-
796-
// Use the expression builder to append the OR condition
797-
this.selectFromQuery = this.selectFromQuery.where((eb: any) =>
798-
eb.or([eb(column, operator, actualValue)]),
799-
)
791+
orWhere(...conditions: [string, any][]): ErrorModel {
792+
this.selectFromQuery = this.selectFromQuery.where((eb) => {
793+
return eb.or(
794+
conditions.map(([column, value]) => eb(column, '=', value)),
795+
)
796+
})
800797

801-
this.updateFromQuery = this.updateFromQuery.where((eb: any) =>
802-
eb.or([eb(column, operator, actualValue)]),
803-
)
798+
this.updateFromQuery = this.updateFromQuery.where((eb) => {
799+
return eb.or(
800+
conditions.map(([column, value]) => eb(column, '=', value)),
801+
)
802+
})
804803

805-
this.deleteFromQuery = this.deleteFromQuery.where((eb: any) =>
806-
eb.or([eb(column, operator, actualValue)]),
807-
)
804+
this.deleteFromQuery = this.deleteFromQuery.where((eb) => {
805+
return eb.or(
806+
conditions.map(([column, value]) => eb(column, '=', value)),
807+
)
808+
})
808809

809810
return this
810811
}
811812

812-
static orWhere(column: string, ...args: any[]): ErrorModel {
813+
static orWhere(...conditions: [string, any][]): ErrorModel {
813814
const instance = new ErrorModel(null)
814815

815-
const [operatorOrValue, value] = args
816-
const operator = value === undefined ? '=' : operatorOrValue
817-
const actualValue = value === undefined ? operatorOrValue : value
818-
819-
// Use the expression builder to append the OR condition
820-
instance.selectFromQuery = instance.selectFromQuery.where((eb: any) =>
821-
eb.or([eb(column, operator, actualValue)]),
822-
)
816+
instance.selectFromQuery = instance.selectFromQuery.where((eb) => {
817+
return eb.or(
818+
conditions.map(([column, value]) => eb(column, '=', value)),
819+
)
820+
})
823821

824-
instance.updateFromQuery = instance.updateFromQuery.where((eb: any) =>
825-
eb.or([eb(column, operator, actualValue)]),
826-
)
822+
instance.updateFromQuery = instance.updateFromQuery.where((eb) => {
823+
return eb.or(
824+
conditions.map(([column, value]) => eb(column, '=', value)),
825+
)
826+
})
827827

828-
instance.deleteFromQuery = instance.deleteFromQuery.where((eb: any) =>
829-
eb.or([eb(column, operator, actualValue)]),
830-
)
828+
instance.deleteFromQuery = instance.deleteFromQuery.where((eb) => {
829+
return eb.or(
830+
conditions.map(([column, value]) => eb(column, '=', value)),
831+
)
832+
})
831833

832834
return instance
833835
}

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

Lines changed: 32 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -788,46 +788,48 @@ export class FailedJobModel {
788788
return instance
789789
}
790790

791-
orWhere(column: string, ...args: any[]): FailedJobModel {
792-
const [operatorOrValue, value] = args
793-
const operator = value === undefined ? '=' : operatorOrValue
794-
const actualValue = value === undefined ? operatorOrValue : value
795-
796-
// Use the expression builder to append the OR condition
797-
this.selectFromQuery = this.selectFromQuery.where((eb: any) =>
798-
eb.or([eb(column, operator, actualValue)]),
799-
)
791+
orWhere(...conditions: [string, any][]): FailedJobModel {
792+
this.selectFromQuery = this.selectFromQuery.where((eb) => {
793+
return eb.or(
794+
conditions.map(([column, value]) => eb(column, '=', value)),
795+
)
796+
})
800797

801-
this.updateFromQuery = this.updateFromQuery.where((eb: any) =>
802-
eb.or([eb(column, operator, actualValue)]),
803-
)
798+
this.updateFromQuery = this.updateFromQuery.where((eb) => {
799+
return eb.or(
800+
conditions.map(([column, value]) => eb(column, '=', value)),
801+
)
802+
})
804803

805-
this.deleteFromQuery = this.deleteFromQuery.where((eb: any) =>
806-
eb.or([eb(column, operator, actualValue)]),
807-
)
804+
this.deleteFromQuery = this.deleteFromQuery.where((eb) => {
805+
return eb.or(
806+
conditions.map(([column, value]) => eb(column, '=', value)),
807+
)
808+
})
808809

809810
return this
810811
}
811812

812-
static orWhere(column: string, ...args: any[]): FailedJobModel {
813+
static orWhere(...conditions: [string, any][]): FailedJobModel {
813814
const instance = new FailedJobModel(null)
814815

815-
const [operatorOrValue, value] = args
816-
const operator = value === undefined ? '=' : operatorOrValue
817-
const actualValue = value === undefined ? operatorOrValue : value
818-
819-
// Use the expression builder to append the OR condition
820-
instance.selectFromQuery = instance.selectFromQuery.where((eb: any) =>
821-
eb.or([eb(column, operator, actualValue)]),
822-
)
816+
instance.selectFromQuery = instance.selectFromQuery.where((eb) => {
817+
return eb.or(
818+
conditions.map(([column, value]) => eb(column, '=', value)),
819+
)
820+
})
823821

824-
instance.updateFromQuery = instance.updateFromQuery.where((eb: any) =>
825-
eb.or([eb(column, operator, actualValue)]),
826-
)
822+
instance.updateFromQuery = instance.updateFromQuery.where((eb) => {
823+
return eb.or(
824+
conditions.map(([column, value]) => eb(column, '=', value)),
825+
)
826+
})
827827

828-
instance.deleteFromQuery = instance.deleteFromQuery.where((eb: any) =>
829-
eb.or([eb(column, operator, actualValue)]),
830-
)
828+
instance.deleteFromQuery = instance.deleteFromQuery.where((eb) => {
829+
return eb.or(
830+
conditions.map(([column, value]) => eb(column, '=', value)),
831+
)
832+
})
831833

832834
return instance
833835
}

0 commit comments

Comments
 (0)