Skip to content

Commit bb18d38

Browse files
chore: wip
1 parent 0ffe4d9 commit bb18d38

File tree

17 files changed

+41
-41
lines changed

17 files changed

+41
-41
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ export async function generateModelString(
194194
.selectAll()
195195
.execute()
196196
197-
return results.map((modelItem) => new ${modelRelation}(modelItem))
197+
return results.map((modelItem: ${modelName}Model) => new ${modelRelation}(modelItem))
198198
}\n\n`
199199
}
200200

@@ -1751,7 +1751,7 @@ export async function generateModelString(
17511751
}
17521752
17531753
static async rawQuery(rawQuery: string): Promise<any> {
1754-
return await sql\`\${rawQuery}\`\.execute(db)
1754+
return await sql\`\${rawQuery}\`\.execute(DB.instance)
17551755
}
17561756
17571757
toJSON(): Partial<${modelName}JsonResponse> {
@@ -1797,7 +1797,7 @@ export async function generateModelString(
17971797
}
17981798
17991799
export async function rawQuery(rawQuery: string): Promise<any> {
1800-
return await sql\`\${rawQuery}\`\.execute(db)
1800+
return await sql\`\${rawQuery}\`\.execute(DB.instance)
18011801
}
18021802
18031803
export async function remove(id: number): Promise<void> {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1112,7 +1112,7 @@ export class AccessTokenModel {
11121112
}
11131113

11141114
static async rawQuery(rawQuery: string): Promise<any> {
1115-
return await sql`${rawQuery}`.execute(db)
1115+
return await sql`${rawQuery}`.execute(DB.instance)
11161116
}
11171117

11181118
toJSON(): Partial<AccessTokenJsonResponse> {
@@ -1171,7 +1171,7 @@ export async function create(newAccessToken: NewAccessToken): Promise<AccessToke
11711171
}
11721172

11731173
export async function rawQuery(rawQuery: string): Promise<any> {
1174-
return await sql`${rawQuery}`.execute(db)
1174+
return await sql`${rawQuery}`.execute(DB.instance)
11751175
}
11761176

11771177
export async function remove(id: number): Promise<void> {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1150,7 +1150,7 @@ export class DeploymentModel {
11501150
}
11511151

11521152
static async rawQuery(rawQuery: string): Promise<any> {
1153-
return await sql`${rawQuery}`.execute(db)
1153+
return await sql`${rawQuery}`.execute(DB.instance)
11541154
}
11551155

11561156
toJSON(): Partial<DeploymentJsonResponse> {
@@ -1212,7 +1212,7 @@ export async function create(newDeployment: NewDeployment): Promise<DeploymentMo
12121212
}
12131213

12141214
export async function rawQuery(rawQuery: string): Promise<any> {
1215-
return await sql`${rawQuery}`.execute(db)
1215+
return await sql`${rawQuery}`.execute(DB.instance)
12161216
}
12171217

12181218
export async function remove(id: number): Promise<void> {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1096,7 +1096,7 @@ export class ErrorModel {
10961096
}
10971097

10981098
static async rawQuery(rawQuery: string): Promise<any> {
1099-
return await sql`${rawQuery}`.execute(db)
1099+
return await sql`${rawQuery}`.execute(DB.instance)
11001100
}
11011101

11021102
toJSON(): Partial<ErrorJsonResponse> {
@@ -1154,7 +1154,7 @@ export async function create(newError: NewError): Promise<ErrorModel> {
11541154
}
11551155

11561156
export async function rawQuery(rawQuery: string): Promise<any> {
1157-
return await sql`${rawQuery}`.execute(db)
1157+
return await sql`${rawQuery}`.execute(DB.instance)
11581158
}
11591159

11601160
export async function remove(id: number): Promise<void> {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1096,7 +1096,7 @@ export class FailedJobModel {
10961096
}
10971097

10981098
static async rawQuery(rawQuery: string): Promise<any> {
1099-
return await sql`${rawQuery}`.execute(db)
1099+
return await sql`${rawQuery}`.execute(DB.instance)
11001100
}
11011101

11021102
toJSON(): Partial<FailedJobJsonResponse> {
@@ -1154,7 +1154,7 @@ export async function create(newFailedJob: NewFailedJob): Promise<FailedJobModel
11541154
}
11551155

11561156
export async function rawQuery(rawQuery: string): Promise<any> {
1157-
return await sql`${rawQuery}`.execute(db)
1157+
return await sql`${rawQuery}`.execute(DB.instance)
11581158
}
11591159

11601160
export async function remove(id: number): Promise<void> {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1096,7 +1096,7 @@ export class JobModel {
10961096
}
10971097

10981098
static async rawQuery(rawQuery: string): Promise<any> {
1099-
return await sql`${rawQuery}`.execute(db)
1099+
return await sql`${rawQuery}`.execute(DB.instance)
11001100
}
11011101

11021102
toJSON(): Partial<JobJsonResponse> {
@@ -1154,7 +1154,7 @@ export async function create(newJob: NewJob): Promise<JobModel> {
11541154
}
11551155

11561156
export async function rawQuery(rawQuery: string): Promise<any> {
1157-
return await sql`${rawQuery}`.execute(db)
1157+
return await sql`${rawQuery}`.execute(DB.instance)
11581158
}
11591159

11601160
export async function remove(id: number): Promise<void> {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1144,7 +1144,7 @@ export class PaymentMethodModel {
11441144
.selectAll()
11451145
.execute()
11461146

1147-
return results.map(modelItem => new Transaction(modelItem))
1147+
return results.map((modelItem: PaymentMethodModel) => new Transaction(modelItem))
11481148
}
11491149

11501150
distinct(column: keyof PaymentMethodType): PaymentMethodModel {
@@ -1174,7 +1174,7 @@ export class PaymentMethodModel {
11741174
}
11751175

11761176
static async rawQuery(rawQuery: string): Promise<any> {
1177-
return await sql`${rawQuery}`.execute(db)
1177+
return await sql`${rawQuery}`.execute(DB.instance)
11781178
}
11791179

11801180
toJSON(): Partial<PaymentMethodJsonResponse> {
@@ -1237,7 +1237,7 @@ export async function create(newPaymentMethod: NewPaymentMethod): Promise<Paymen
12371237
}
12381238

12391239
export async function rawQuery(rawQuery: string): Promise<any> {
1240-
return await sql`${rawQuery}`.execute(db)
1240+
return await sql`${rawQuery}`.execute(DB.instance)
12411241
}
12421242

12431243
export async function remove(id: number): Promise<void> {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1090,7 +1090,7 @@ export class PostModel {
10901090
}
10911091

10921092
static async rawQuery(rawQuery: string): Promise<any> {
1093-
return await sql`${rawQuery}`.execute(db)
1093+
return await sql`${rawQuery}`.execute(DB.instance)
10941094
}
10951095

10961096
toJSON(): Partial<PostJsonResponse> {
@@ -1147,7 +1147,7 @@ export async function create(newPost: NewPost): Promise<PostModel> {
11471147
}
11481148

11491149
export async function rawQuery(rawQuery: string): Promise<any> {
1150-
return await sql`${rawQuery}`.execute(db)
1150+
return await sql`${rawQuery}`.execute(DB.instance)
11511151
}
11521152

11531153
export async function remove(id: number): Promise<void> {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1123,7 +1123,7 @@ export class ProductModel {
11231123
}
11241124

11251125
static async rawQuery(rawQuery: string): Promise<any> {
1126-
return await sql`${rawQuery}`.execute(db)
1126+
return await sql`${rawQuery}`.execute(DB.instance)
11271127
}
11281128

11291129
toJSON(): Partial<ProductJsonResponse> {
@@ -1183,7 +1183,7 @@ export async function create(newProduct: NewProduct): Promise<ProductModel> {
11831183
}
11841184

11851185
export async function rawQuery(rawQuery: string): Promise<any> {
1186-
return await sql`${rawQuery}`.execute(db)
1186+
return await sql`${rawQuery}`.execute(DB.instance)
11871187
}
11881188

11891189
export async function remove(id: number): Promise<void> {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1085,7 +1085,7 @@ export class ProjectModel {
10851085
}
10861086

10871087
static async rawQuery(rawQuery: string): Promise<any> {
1088-
return await sql`${rawQuery}`.execute(db)
1088+
return await sql`${rawQuery}`.execute(DB.instance)
10891089
}
10901090

10911091
toJSON(): Partial<ProjectJsonResponse> {
@@ -1142,7 +1142,7 @@ export async function create(newProject: NewProject): Promise<ProjectModel> {
11421142
}
11431143

11441144
export async function rawQuery(rawQuery: string): Promise<any> {
1145-
return await sql`${rawQuery}`.execute(db)
1145+
return await sql`${rawQuery}`.execute(DB.instance)
11461146
}
11471147

11481148
export async function remove(id: number): Promise<void> {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1052,7 +1052,7 @@ export class ReleaseModel {
10521052
}
10531053

10541054
static async rawQuery(rawQuery: string): Promise<any> {
1055-
return await sql`${rawQuery}`.execute(db)
1055+
return await sql`${rawQuery}`.execute(DB.instance)
10561056
}
10571057

10581058
toJSON(): Partial<ReleaseJsonResponse> {
@@ -1106,7 +1106,7 @@ export async function create(newRelease: NewRelease): Promise<ReleaseModel> {
11061106
}
11071107

11081108
export async function rawQuery(rawQuery: string): Promise<any> {
1109-
return await sql`${rawQuery}`.execute(db)
1109+
return await sql`${rawQuery}`.execute(DB.instance)
11101110
}
11111111

11121112
export async function remove(id: number): Promise<void> {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1052,7 +1052,7 @@ export class SubscriberModel {
10521052
}
10531053

10541054
static async rawQuery(rawQuery: string): Promise<any> {
1055-
return await sql`${rawQuery}`.execute(db)
1055+
return await sql`${rawQuery}`.execute(DB.instance)
10561056
}
10571057

10581058
toJSON(): Partial<SubscriberJsonResponse> {
@@ -1106,7 +1106,7 @@ export async function create(newSubscriber: NewSubscriber): Promise<SubscriberMo
11061106
}
11071107

11081108
export async function rawQuery(rawQuery: string): Promise<any> {
1109-
return await sql`${rawQuery}`.execute(db)
1109+
return await sql`${rawQuery}`.execute(DB.instance)
11101110
}
11111111

11121112
export async function remove(id: number): Promise<void> {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1094,7 +1094,7 @@ export class SubscriberEmailModel {
10941094
}
10951095

10961096
static async rawQuery(rawQuery: string): Promise<any> {
1097-
return await sql`${rawQuery}`.execute(db)
1097+
return await sql`${rawQuery}`.execute(DB.instance)
10981098
}
10991099

11001100
toJSON(): Partial<SubscriberEmailJsonResponse> {
@@ -1150,7 +1150,7 @@ export async function create(newSubscriberEmail: NewSubscriberEmail): Promise<Su
11501150
}
11511151

11521152
export async function rawQuery(rawQuery: string): Promise<any> {
1153-
return await sql`${rawQuery}`.execute(db)
1153+
return await sql`${rawQuery}`.execute(DB.instance)
11541154
}
11551155

11561156
export async function remove(id: number): Promise<void> {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1183,7 +1183,7 @@ export class SubscriptionModel {
11831183
}
11841184

11851185
static async rawQuery(rawQuery: string): Promise<any> {
1186-
return await sql`${rawQuery}`.execute(db)
1186+
return await sql`${rawQuery}`.execute(DB.instance)
11871187
}
11881188

11891189
toJSON(): Partial<SubscriptionJsonResponse> {
@@ -1248,7 +1248,7 @@ export async function create(newSubscription: NewSubscription): Promise<Subscrip
12481248
}
12491249

12501250
export async function rawQuery(rawQuery: string): Promise<any> {
1251-
return await sql`${rawQuery}`.execute(db)
1251+
return await sql`${rawQuery}`.execute(DB.instance)
12521252
}
12531253

12541254
export async function remove(id: number): Promise<void> {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1124,7 +1124,7 @@ export class TeamModel {
11241124
.selectAll()
11251125
.execute()
11261126

1127-
return results.map(modelItem => new AccessToken(modelItem))
1127+
return results.map((modelItem: TeamModel) => new AccessToken(modelItem))
11281128
}
11291129

11301130
async teamUsers() {
@@ -1173,7 +1173,7 @@ export class TeamModel {
11731173
}
11741174

11751175
static async rawQuery(rawQuery: string): Promise<any> {
1176-
return await sql`${rawQuery}`.execute(db)
1176+
return await sql`${rawQuery}`.execute(DB.instance)
11771177
}
11781178

11791179
toJSON(): Partial<TeamJsonResponse> {
@@ -1235,7 +1235,7 @@ export async function create(newTeam: NewTeam): Promise<TeamModel> {
12351235
}
12361236

12371237
export async function rawQuery(rawQuery: string): Promise<any> {
1238-
return await sql`${rawQuery}`.execute(db)
1238+
return await sql`${rawQuery}`.execute(DB.instance)
12391239
}
12401240

12411241
export async function remove(id: number): Promise<void> {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1156,7 +1156,7 @@ export class TransactionModel {
11561156
}
11571157

11581158
static async rawQuery(rawQuery: string): Promise<any> {
1159-
return await sql`${rawQuery}`.execute(db)
1159+
return await sql`${rawQuery}`.execute(DB.instance)
11601160
}
11611161

11621162
toJSON(): Partial<TransactionJsonResponse> {
@@ -1218,7 +1218,7 @@ export async function create(newTransaction: NewTransaction): Promise<Transactio
12181218
}
12191219

12201220
export async function rawQuery(rawQuery: string): Promise<any> {
1221-
return await sql`${rawQuery}`.execute(db)
1221+
return await sql`${rawQuery}`.execute(DB.instance)
12221222
}
12231223

12241224
export async function remove(id: number): Promise<void> {

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1177,7 +1177,7 @@ export class UserModel {
11771177
.selectAll()
11781178
.execute()
11791179

1180-
return results.map(modelItem => new Deployment(modelItem))
1180+
return results.map((modelItem: UserModel) => new Deployment(modelItem))
11811181
}
11821182

11831183
async subscriptionsHasMany(): Promise<SubscriptionModel[]> {
@@ -1190,7 +1190,7 @@ export class UserModel {
11901190
.selectAll()
11911191
.execute()
11921192

1193-
return results.map(modelItem => new Subscription(modelItem))
1193+
return results.map((modelItem: UserModel) => new Subscription(modelItem))
11941194
}
11951195

11961196
async paymentMethodsHasMany(): Promise<PaymentMethodModel[]> {
@@ -1203,7 +1203,7 @@ export class UserModel {
12031203
.selectAll()
12041204
.execute()
12051205

1206-
return results.map(modelItem => new PaymentMethod(modelItem))
1206+
return results.map((modelItem: UserModel) => new PaymentMethod(modelItem))
12071207
}
12081208

12091209
async transactionsHasMany(): Promise<TransactionModel[]> {
@@ -1216,7 +1216,7 @@ export class UserModel {
12161216
.selectAll()
12171217
.execute()
12181218

1219-
return results.map(modelItem => new Transaction(modelItem))
1219+
return results.map((modelItem: UserModel) => new Transaction(modelItem))
12201220
}
12211221

12221222
async userTeams() {
@@ -1517,7 +1517,7 @@ export class UserModel {
15171517
}
15181518

15191519
static async rawQuery(rawQuery: string): Promise<any> {
1520-
return await sql`${rawQuery}`.execute(db)
1520+
return await sql`${rawQuery}`.execute(DB.instance)
15211521
}
15221522

15231523
toJSON(): Partial<UserJsonResponse> {
@@ -1578,7 +1578,7 @@ export async function create(newUser: NewUser): Promise<UserModel> {
15781578
}
15791579

15801580
export async function rawQuery(rawQuery: string): Promise<any> {
1581-
return await sql`${rawQuery}`.execute(db)
1581+
return await sql`${rawQuery}`.execute(DB.instance)
15821582
}
15831583

15841584
export async function remove(id: number): Promise<void> {

0 commit comments

Comments
 (0)