chore: wip

stacksjs · Jan 30, 2025 · bb18d38 · bb18d38
1 parent 0ffe4d9
commit bb18d38
Show file tree

Hide file tree

Showing 17 changed files with 41 additions and 41 deletions.
diff --git a/storage/framework/core/orm/src/generate.ts b/storage/framework/core/orm/src/generate.ts
@@ -194,7 +194,7 @@ export async function generateModelString(
             .selectAll()
             .execute()
   
-            return results.map((modelItem) => new ${modelRelation}(modelItem))
+            return results.map((modelItem: ${modelName}Model) => new ${modelRelation}(modelItem))
         }\n\n`
     }
 
@@ -1751,7 +1751,7 @@ export async function generateModelString(
         }
   
         static async rawQuery(rawQuery: string): Promise<any> {
-          return await sql\`\${rawQuery}\`\.execute(db)
+          return await sql\`\${rawQuery}\`\.execute(DB.instance)
         }
   
         toJSON(): Partial<${modelName}JsonResponse> {
@@ -1797,7 +1797,7 @@ export async function generateModelString(
       }
   
       export async function rawQuery(rawQuery: string): Promise<any> {
-        return await sql\`\${rawQuery}\`\.execute(db)
+        return await sql\`\${rawQuery}\`\.execute(DB.instance)
       }
   
       export async function remove(id: number): Promise<void> {

diff --git a/storage/framework/orm/src/models/AccessToken.ts b/storage/framework/orm/src/models/AccessToken.ts
@@ -1112,7 +1112,7 @@ export class AccessTokenModel {
   }
 
   static async rawQuery(rawQuery: string): Promise<any> {
-    return await sql`${rawQuery}`.execute(db)
+    return await sql`${rawQuery}`.execute(DB.instance)
   }
 
   toJSON(): Partial<AccessTokenJsonResponse> {
@@ -1171,7 +1171,7 @@ export async function create(newAccessToken: NewAccessToken): Promise<AccessToke
 }
 
 export async function rawQuery(rawQuery: string): Promise<any> {
-  return await sql`${rawQuery}`.execute(db)
+  return await sql`${rawQuery}`.execute(DB.instance)
 }
 
 export async function remove(id: number): Promise<void> {

diff --git a/storage/framework/orm/src/models/Deployment.ts b/storage/framework/orm/src/models/Deployment.ts
@@ -1150,7 +1150,7 @@ export class DeploymentModel {
   }
 
   static async rawQuery(rawQuery: string): Promise<any> {
-    return await sql`${rawQuery}`.execute(db)
+    return await sql`${rawQuery}`.execute(DB.instance)
   }
 
   toJSON(): Partial<DeploymentJsonResponse> {
@@ -1212,7 +1212,7 @@ export async function create(newDeployment: NewDeployment): Promise<DeploymentMo
 }
 
 export async function rawQuery(rawQuery: string): Promise<any> {
-  return await sql`${rawQuery}`.execute(db)
+  return await sql`${rawQuery}`.execute(DB.instance)
 }
 
 export async function remove(id: number): Promise<void> {

diff --git a/storage/framework/orm/src/models/Error.ts b/storage/framework/orm/src/models/Error.ts
@@ -1096,7 +1096,7 @@ export class ErrorModel {
   }
 
   static async rawQuery(rawQuery: string): Promise<any> {
-    return await sql`${rawQuery}`.execute(db)
+    return await sql`${rawQuery}`.execute(DB.instance)
   }
 
   toJSON(): Partial<ErrorJsonResponse> {
@@ -1154,7 +1154,7 @@ export async function create(newError: NewError): Promise<ErrorModel> {
 }
 
 export async function rawQuery(rawQuery: string): Promise<any> {
-  return await sql`${rawQuery}`.execute(db)
+  return await sql`${rawQuery}`.execute(DB.instance)
 }
 
 export async function remove(id: number): Promise<void> {

diff --git a/storage/framework/orm/src/models/FailedJob.ts b/storage/framework/orm/src/models/FailedJob.ts
@@ -1096,7 +1096,7 @@ export class FailedJobModel {
   }
 
   static async rawQuery(rawQuery: string): Promise<any> {
-    return await sql`${rawQuery}`.execute(db)
+    return await sql`${rawQuery}`.execute(DB.instance)
   }
 
   toJSON(): Partial<FailedJobJsonResponse> {
@@ -1154,7 +1154,7 @@ export async function create(newFailedJob: NewFailedJob): Promise<FailedJobModel
 }
 
 export async function rawQuery(rawQuery: string): Promise<any> {
-  return await sql`${rawQuery}`.execute(db)
+  return await sql`${rawQuery}`.execute(DB.instance)
 }
 
 export async function remove(id: number): Promise<void> {

diff --git a/storage/framework/orm/src/models/Job.ts b/storage/framework/orm/src/models/Job.ts
@@ -1096,7 +1096,7 @@ export class JobModel {
   }
 
   static async rawQuery(rawQuery: string): Promise<any> {
-    return await sql`${rawQuery}`.execute(db)
+    return await sql`${rawQuery}`.execute(DB.instance)
   }
 
   toJSON(): Partial<JobJsonResponse> {
@@ -1154,7 +1154,7 @@ export async function create(newJob: NewJob): Promise<JobModel> {
 }
 
 export async function rawQuery(rawQuery: string): Promise<any> {
-  return await sql`${rawQuery}`.execute(db)
+  return await sql`${rawQuery}`.execute(DB.instance)
 }
 
 export async function remove(id: number): Promise<void> {

diff --git a/storage/framework/orm/src/models/PaymentMethod.ts b/storage/framework/orm/src/models/PaymentMethod.ts
@@ -1144,7 +1144,7 @@ export class PaymentMethodModel {
       .selectAll()
       .execute()
 
-    return results.map(modelItem => new Transaction(modelItem))
+    return results.map((modelItem: PaymentMethodModel) => new Transaction(modelItem))
   }
 
   distinct(column: keyof PaymentMethodType): PaymentMethodModel {
@@ -1174,7 +1174,7 @@ export class PaymentMethodModel {
   }
 
   static async rawQuery(rawQuery: string): Promise<any> {
-    return await sql`${rawQuery}`.execute(db)
+    return await sql`${rawQuery}`.execute(DB.instance)
   }
 
   toJSON(): Partial<PaymentMethodJsonResponse> {
@@ -1237,7 +1237,7 @@ export async function create(newPaymentMethod: NewPaymentMethod): Promise<Paymen
 }
 
 export async function rawQuery(rawQuery: string): Promise<any> {
-  return await sql`${rawQuery}`.execute(db)
+  return await sql`${rawQuery}`.execute(DB.instance)
 }
 
 export async function remove(id: number): Promise<void> {

diff --git a/storage/framework/orm/src/models/Post.ts b/storage/framework/orm/src/models/Post.ts
@@ -1090,7 +1090,7 @@ export class PostModel {
   }
 
   static async rawQuery(rawQuery: string): Promise<any> {
-    return await sql`${rawQuery}`.execute(db)
+    return await sql`${rawQuery}`.execute(DB.instance)
   }
 
   toJSON(): Partial<PostJsonResponse> {
@@ -1147,7 +1147,7 @@ export async function create(newPost: NewPost): Promise<PostModel> {
 }
 
 export async function rawQuery(rawQuery: string): Promise<any> {
-  return await sql`${rawQuery}`.execute(db)
+  return await sql`${rawQuery}`.execute(DB.instance)
 }
 
 export async function remove(id: number): Promise<void> {

diff --git a/storage/framework/orm/src/models/Product.ts b/storage/framework/orm/src/models/Product.ts
@@ -1123,7 +1123,7 @@ export class ProductModel {
   }
 
   static async rawQuery(rawQuery: string): Promise<any> {
-    return await sql`${rawQuery}`.execute(db)
+    return await sql`${rawQuery}`.execute(DB.instance)
   }
 
   toJSON(): Partial<ProductJsonResponse> {
@@ -1183,7 +1183,7 @@ export async function create(newProduct: NewProduct): Promise<ProductModel> {
 }
 
 export async function rawQuery(rawQuery: string): Promise<any> {
-  return await sql`${rawQuery}`.execute(db)
+  return await sql`${rawQuery}`.execute(DB.instance)
 }
 
 export async function remove(id: number): Promise<void> {

diff --git a/storage/framework/orm/src/models/Project.ts b/storage/framework/orm/src/models/Project.ts
@@ -1085,7 +1085,7 @@ export class ProjectModel {
   }
 
   static async rawQuery(rawQuery: string): Promise<any> {
-    return await sql`${rawQuery}`.execute(db)
+    return await sql`${rawQuery}`.execute(DB.instance)
   }
 
   toJSON(): Partial<ProjectJsonResponse> {
@@ -1142,7 +1142,7 @@ export async function create(newProject: NewProject): Promise<ProjectModel> {
 }
 
 export async function rawQuery(rawQuery: string): Promise<any> {
-  return await sql`${rawQuery}`.execute(db)
+  return await sql`${rawQuery}`.execute(DB.instance)
 }
 
 export async function remove(id: number): Promise<void> {

diff --git a/storage/framework/orm/src/models/Release.ts b/storage/framework/orm/src/models/Release.ts
@@ -1052,7 +1052,7 @@ export class ReleaseModel {
   }
 
   static async rawQuery(rawQuery: string): Promise<any> {
-    return await sql`${rawQuery}`.execute(db)
+    return await sql`${rawQuery}`.execute(DB.instance)
   }
 
   toJSON(): Partial<ReleaseJsonResponse> {
@@ -1106,7 +1106,7 @@ export async function create(newRelease: NewRelease): Promise<ReleaseModel> {
 }
 
 export async function rawQuery(rawQuery: string): Promise<any> {
-  return await sql`${rawQuery}`.execute(db)
+  return await sql`${rawQuery}`.execute(DB.instance)
 }
 
 export async function remove(id: number): Promise<void> {

diff --git a/storage/framework/orm/src/models/Subscriber.ts b/storage/framework/orm/src/models/Subscriber.ts
@@ -1052,7 +1052,7 @@ export class SubscriberModel {
   }
 
   static async rawQuery(rawQuery: string): Promise<any> {
-    return await sql`${rawQuery}`.execute(db)
+    return await sql`${rawQuery}`.execute(DB.instance)
   }
 
   toJSON(): Partial<SubscriberJsonResponse> {
@@ -1106,7 +1106,7 @@ export async function create(newSubscriber: NewSubscriber): Promise<SubscriberMo
 }
 
 export async function rawQuery(rawQuery: string): Promise<any> {
-  return await sql`${rawQuery}`.execute(db)
+  return await sql`${rawQuery}`.execute(DB.instance)
 }
 
 export async function remove(id: number): Promise<void> {

diff --git a/storage/framework/orm/src/models/SubscriberEmail.ts b/storage/framework/orm/src/models/SubscriberEmail.ts
@@ -1094,7 +1094,7 @@ export class SubscriberEmailModel {
   }
 
   static async rawQuery(rawQuery: string): Promise<any> {
-    return await sql`${rawQuery}`.execute(db)
+    return await sql`${rawQuery}`.execute(DB.instance)
   }
 
   toJSON(): Partial<SubscriberEmailJsonResponse> {
@@ -1150,7 +1150,7 @@ export async function create(newSubscriberEmail: NewSubscriberEmail): Promise<Su
 }
 
 export async function rawQuery(rawQuery: string): Promise<any> {
-  return await sql`${rawQuery}`.execute(db)
+  return await sql`${rawQuery}`.execute(DB.instance)
 }
 
 export async function remove(id: number): Promise<void> {

diff --git a/storage/framework/orm/src/models/Subscription.ts b/storage/framework/orm/src/models/Subscription.ts
@@ -1183,7 +1183,7 @@ export class SubscriptionModel {
   }
 
   static async rawQuery(rawQuery: string): Promise<any> {
-    return await sql`${rawQuery}`.execute(db)
+    return await sql`${rawQuery}`.execute(DB.instance)
   }
 
   toJSON(): Partial<SubscriptionJsonResponse> {
@@ -1248,7 +1248,7 @@ export async function create(newSubscription: NewSubscription): Promise<Subscrip
 }
 
 export async function rawQuery(rawQuery: string): Promise<any> {
-  return await sql`${rawQuery}`.execute(db)
+  return await sql`${rawQuery}`.execute(DB.instance)
 }
 
 export async function remove(id: number): Promise<void> {

diff --git a/storage/framework/orm/src/models/Team.ts b/storage/framework/orm/src/models/Team.ts
@@ -1124,7 +1124,7 @@ export class TeamModel {
       .selectAll()
       .execute()
 
-    return results.map(modelItem => new AccessToken(modelItem))
+    return results.map((modelItem: TeamModel) => new AccessToken(modelItem))
   }
 
   async teamUsers() {
@@ -1173,7 +1173,7 @@ export class TeamModel {
   }
 
   static async rawQuery(rawQuery: string): Promise<any> {
-    return await sql`${rawQuery}`.execute(db)
+    return await sql`${rawQuery}`.execute(DB.instance)
   }
 
   toJSON(): Partial<TeamJsonResponse> {
@@ -1235,7 +1235,7 @@ export async function create(newTeam: NewTeam): Promise<TeamModel> {
 }
 
 export async function rawQuery(rawQuery: string): Promise<any> {
-  return await sql`${rawQuery}`.execute(db)
+  return await sql`${rawQuery}`.execute(DB.instance)
 }
 
 export async function remove(id: number): Promise<void> {

diff --git a/storage/framework/orm/src/models/Transaction.ts b/storage/framework/orm/src/models/Transaction.ts
@@ -1156,7 +1156,7 @@ export class TransactionModel {
   }
 
   static async rawQuery(rawQuery: string): Promise<any> {
-    return await sql`${rawQuery}`.execute(db)
+    return await sql`${rawQuery}`.execute(DB.instance)
   }
 
   toJSON(): Partial<TransactionJsonResponse> {
@@ -1218,7 +1218,7 @@ export async function create(newTransaction: NewTransaction): Promise<Transactio
 }
 
 export async function rawQuery(rawQuery: string): Promise<any> {
-  return await sql`${rawQuery}`.execute(db)
+  return await sql`${rawQuery}`.execute(DB.instance)
 }
 
 export async function remove(id: number): Promise<void> {

diff --git a/storage/framework/orm/src/models/User.ts b/storage/framework/orm/src/models/User.ts
@@ -1177,7 +1177,7 @@ export class UserModel {
       .selectAll()
       .execute()
 
-    return results.map(modelItem => new Deployment(modelItem))
+    return results.map((modelItem: UserModel) => new Deployment(modelItem))
   }
 
   async subscriptionsHasMany(): Promise<SubscriptionModel[]> {
@@ -1190,7 +1190,7 @@ export class UserModel {
       .selectAll()
       .execute()
 
-    return results.map(modelItem => new Subscription(modelItem))
+    return results.map((modelItem: UserModel) => new Subscription(modelItem))
   }
 
   async paymentMethodsHasMany(): Promise<PaymentMethodModel[]> {
@@ -1203,7 +1203,7 @@ export class UserModel {
       .selectAll()
       .execute()
 
-    return results.map(modelItem => new PaymentMethod(modelItem))
+    return results.map((modelItem: UserModel) => new PaymentMethod(modelItem))
   }
 
   async transactionsHasMany(): Promise<TransactionModel[]> {
@@ -1216,7 +1216,7 @@ export class UserModel {
       .selectAll()
       .execute()
 
-    return results.map(modelItem => new Transaction(modelItem))
+    return results.map((modelItem: UserModel) => new Transaction(modelItem))
   }
 
   async userTeams() {
@@ -1517,7 +1517,7 @@ export class UserModel {
   }
 
   static async rawQuery(rawQuery: string): Promise<any> {
-    return await sql`${rawQuery}`.execute(db)
+    return await sql`${rawQuery}`.execute(DB.instance)
   }
 
   toJSON(): Partial<UserJsonResponse> {
@@ -1578,7 +1578,7 @@ export async function create(newUser: NewUser): Promise<UserModel> {
 }
 
 export async function rawQuery(rawQuery: string): Promise<any> {
-  return await sql`${rawQuery}`.execute(db)
+  return await sql`${rawQuery}`.execute(DB.instance)
 }
 
 export async function remove(id: number): Promise<void> {