chore: wip

Author: glennmichael123

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

@@ -1564,7 +1564,9 @@ export async function generateModelString(
         }
 
         whereColumn(first: string, operator: string, second: string): ${modelName}Model {
-          return ${modelName}Model.whereColumn(first, operator, second)
+          this.selectFromQuery = this.selectFromQuery.whereRef(first, operator, second)
+
+          return this
         }
 
         static whereColumn(first: string, operator: string, second: string): ${modelName}Model {
@@ -1576,21 +1578,30 @@ export async function generateModelString(
         }
 
         whereRef(column: string, ...args: string[]): ${modelName}Model {
-          return ${modelName}Model.whereRef(column, ...args)
-        }
-
-        static whereRef(column: string, ...args: string[]): ${modelName}Model {
           const [operatorOrValue, value] = args
           const operator = value === undefined ? '=' : operatorOrValue
           const actualValue = value === undefined ? operatorOrValue : value
 
           const instance = new ${modelName}Model(null)
           instance.selectFromQuery = instance.selectFromQuery.whereRef(column, operator, actualValue)
+          
           return instance
         }
+        
+        whereRef(column: string, ...args: string[]): ${modelName}Model {
+          return this.whereRef(column, ...args)
+        }
+
+        static whereRef(column: string, ...args: string[]): ${modelName}Model {
+          const instance = new ${modelName}Model(null)
+
+          return instance.whereRef(column, ...args)
+        }
 
         whereRaw(sqlStatement: string): ${modelName}Model {
-          return ${modelName}Model.whereRaw(sqlStatement)
+          this.selectFromQuery = this.selectFromQuery.where(sql\`\${sqlStatement}\`)
+
+          return this
         }
 
         static whereRaw(sqlStatement: string): ${modelName}Model {
@@ -2096,7 +2107,11 @@ export async function generateModelString(
         ${likeableStatements}
   
         distinct(column: keyof ${modelName}Type): ${modelName}Model {
-          return ${modelName}Model.distinct(column)
+          this.selectFromQuery = this.selectFromQuery.select(column).distinct()
+  
+          this.hasSelect = true
+  
+          return this
         }
   
         static distinct(column: keyof ${modelName}Type): ${modelName}Model {
@@ -2110,7 +2125,9 @@ export async function generateModelString(
         }
   
         join(table: string, firstCol: string, secondCol: string): ${modelName}Model {
-          return ${modelName}Model.join(table, firstCol, secondCol)
+          this.selectFromQuery = this.selectFromQuery.innerJoin(table, firstCol, secondCol)
+  
+          return this
         }
   
         static join(table: string, firstCol: string, secondCol: string): ${modelName}Model {

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

@@ -782,7 +782,9 @@ export class AccessTokenModel {
   }
 
   whereColumn(first: string, operator: string, second: string): AccessTokenModel {
-    return AccessTokenModel.whereColumn(first, operator, second)
+    this.selectFromQuery = this.selectFromQuery.whereRef(first, operator, second)
+
+    return this
   }
 
   static whereColumn(first: string, operator: string, second: string): AccessTokenModel {
@@ -794,21 +796,30 @@ export class AccessTokenModel {
   }
 
   whereRef(column: string, ...args: string[]): AccessTokenModel {
-    return AccessTokenModel.whereRef(column, ...args)
-  }
-
-  static whereRef(column: string, ...args: string[]): AccessTokenModel {
     const [operatorOrValue, value] = args
     const operator = value === undefined ? '=' : operatorOrValue
     const actualValue = value === undefined ? operatorOrValue : value
 
     const instance = new AccessTokenModel(null)
     instance.selectFromQuery = instance.selectFromQuery.whereRef(column, operator, actualValue)
+
     return instance
   }
 
+  whereRef(column: string, ...args: string[]): AccessTokenModel {
+    return this.whereRef(column, ...args)
+  }
+
+  static whereRef(column: string, ...args: string[]): AccessTokenModel {
+    const instance = new AccessTokenModel(null)
+
+    return instance.whereRef(column, ...args)
+  }
+
   whereRaw(sqlStatement: string): AccessTokenModel {
-    return AccessTokenModel.whereRaw(sqlStatement)
+    this.selectFromQuery = this.selectFromQuery.where(sql`${sqlStatement}`)
+
+    return this
   }
 
   static whereRaw(sqlStatement: string): AccessTokenModel {
@@ -1341,7 +1352,11 @@ export class AccessTokenModel {
   }
 
   distinct(column: keyof AccessTokenType): AccessTokenModel {
-    return AccessTokenModel.distinct(column)
+    this.selectFromQuery = this.selectFromQuery.select(column).distinct()
+
+    this.hasSelect = true
+
+    return this
   }
 
   static distinct(column: keyof AccessTokenType): AccessTokenModel {
@@ -1355,7 +1370,9 @@ export class AccessTokenModel {
   }
 
   join(table: string, firstCol: string, secondCol: string): AccessTokenModel {
-    return AccessTokenModel.join(table, firstCol, secondCol)
+    this.selectFromQuery = this.selectFromQuery.innerJoin(table, firstCol, secondCol)
+
+    return this
   }
 
   static join(table: string, firstCol: string, secondCol: string): AccessTokenModel {

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

@@ -812,7 +812,9 @@ export class ActivityModel {
   }
 
   whereColumn(first: string, operator: string, second: string): ActivityModel {
-    return ActivityModel.whereColumn(first, operator, second)
+    this.selectFromQuery = this.selectFromQuery.whereRef(first, operator, second)
+
+    return this
   }
 
   static whereColumn(first: string, operator: string, second: string): ActivityModel {
@@ -824,21 +826,30 @@ export class ActivityModel {
   }
 
   whereRef(column: string, ...args: string[]): ActivityModel {
-    return ActivityModel.whereRef(column, ...args)
-  }
-
-  static whereRef(column: string, ...args: string[]): ActivityModel {
     const [operatorOrValue, value] = args
     const operator = value === undefined ? '=' : operatorOrValue
     const actualValue = value === undefined ? operatorOrValue : value
 
     const instance = new ActivityModel(null)
     instance.selectFromQuery = instance.selectFromQuery.whereRef(column, operator, actualValue)
+
     return instance
   }
 
+  whereRef(column: string, ...args: string[]): ActivityModel {
+    return this.whereRef(column, ...args)
+  }
+
+  static whereRef(column: string, ...args: string[]): ActivityModel {
+    const instance = new ActivityModel(null)
+
+    return instance.whereRef(column, ...args)
+  }
+
   whereRaw(sqlStatement: string): ActivityModel {
-    return ActivityModel.whereRaw(sqlStatement)
+    this.selectFromQuery = this.selectFromQuery.where(sql`${sqlStatement}`)
+
+    return this
   }
 
   static whereRaw(sqlStatement: string): ActivityModel {
@@ -1430,7 +1441,11 @@ export class ActivityModel {
   }
 
   distinct(column: keyof ActivityType): ActivityModel {
-    return ActivityModel.distinct(column)
+    this.selectFromQuery = this.selectFromQuery.select(column).distinct()
+
+    this.hasSelect = true
+
+    return this
   }
 
   static distinct(column: keyof ActivityType): ActivityModel {
@@ -1444,7 +1459,9 @@ export class ActivityModel {
   }
 
   join(table: string, firstCol: string, secondCol: string): ActivityModel {
-    return ActivityModel.join(table, firstCol, secondCol)
+    this.selectFromQuery = this.selectFromQuery.innerJoin(table, firstCol, secondCol)
+
+    return this
   }
 
   static join(table: string, firstCol: string, secondCol: string): ActivityModel {

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

@@ -823,7 +823,9 @@ export class DeploymentModel {
   }
 
   whereColumn(first: string, operator: string, second: string): DeploymentModel {
-    return DeploymentModel.whereColumn(first, operator, second)
+    this.selectFromQuery = this.selectFromQuery.whereRef(first, operator, second)
+
+    return this
   }
 
   static whereColumn(first: string, operator: string, second: string): DeploymentModel {
@@ -835,21 +837,30 @@ export class DeploymentModel {
   }
 
   whereRef(column: string, ...args: string[]): DeploymentModel {
-    return DeploymentModel.whereRef(column, ...args)
-  }
-
-  static whereRef(column: string, ...args: string[]): DeploymentModel {
     const [operatorOrValue, value] = args
     const operator = value === undefined ? '=' : operatorOrValue
     const actualValue = value === undefined ? operatorOrValue : value
 
     const instance = new DeploymentModel(null)
     instance.selectFromQuery = instance.selectFromQuery.whereRef(column, operator, actualValue)
+
     return instance
   }
 
+  whereRef(column: string, ...args: string[]): DeploymentModel {
+    return this.whereRef(column, ...args)
+  }
+
+  static whereRef(column: string, ...args: string[]): DeploymentModel {
+    const instance = new DeploymentModel(null)
+
+    return instance.whereRef(column, ...args)
+  }
+
   whereRaw(sqlStatement: string): DeploymentModel {
-    return DeploymentModel.whereRaw(sqlStatement)
+    this.selectFromQuery = this.selectFromQuery.where(sql`${sqlStatement}`)
+
+    return this
   }
 
   static whereRaw(sqlStatement: string): DeploymentModel {
@@ -1406,7 +1417,11 @@ export class DeploymentModel {
   }
 
   distinct(column: keyof DeploymentType): DeploymentModel {
-    return DeploymentModel.distinct(column)
+    this.selectFromQuery = this.selectFromQuery.select(column).distinct()
+
+    this.hasSelect = true
+
+    return this
   }
 
   static distinct(column: keyof DeploymentType): DeploymentModel {
@@ -1420,7 +1435,9 @@ export class DeploymentModel {
   }
 
   join(table: string, firstCol: string, secondCol: string): DeploymentModel {
-    return DeploymentModel.join(table, firstCol, secondCol)
+    this.selectFromQuery = this.selectFromQuery.innerJoin(table, firstCol, secondCol)
+
+    return this
   }
 
   static join(table: string, firstCol: string, secondCol: string): DeploymentModel {

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

@@ -774,7 +774,9 @@ export class ErrorModel {
   }
 
   whereColumn(first: string, operator: string, second: string): ErrorModel {
-    return ErrorModel.whereColumn(first, operator, second)
+    this.selectFromQuery = this.selectFromQuery.whereRef(first, operator, second)
+
+    return this
   }
 
   static whereColumn(first: string, operator: string, second: string): ErrorModel {
@@ -786,21 +788,30 @@ export class ErrorModel {
   }
 
   whereRef(column: string, ...args: string[]): ErrorModel {
-    return ErrorModel.whereRef(column, ...args)
-  }
-
-  static whereRef(column: string, ...args: string[]): ErrorModel {
     const [operatorOrValue, value] = args
     const operator = value === undefined ? '=' : operatorOrValue
     const actualValue = value === undefined ? operatorOrValue : value
 
     const instance = new ErrorModel(null)
     instance.selectFromQuery = instance.selectFromQuery.whereRef(column, operator, actualValue)
+
     return instance
   }
 
+  whereRef(column: string, ...args: string[]): ErrorModel {
+    return this.whereRef(column, ...args)
+  }
+
+  static whereRef(column: string, ...args: string[]): ErrorModel {
+    const instance = new ErrorModel(null)
+
+    return instance.whereRef(column, ...args)
+  }
+
   whereRaw(sqlStatement: string): ErrorModel {
-    return ErrorModel.whereRaw(sqlStatement)
+    this.selectFromQuery = this.selectFromQuery.where(sql`${sqlStatement}`)
+
+    return this
   }
 
   static whereRaw(sqlStatement: string): ErrorModel {
@@ -1327,7 +1338,11 @@ export class ErrorModel {
   }
 
   distinct(column: keyof ErrorType): ErrorModel {
-    return ErrorModel.distinct(column)
+    this.selectFromQuery = this.selectFromQuery.select(column).distinct()
+
+    this.hasSelect = true
+
+    return this
   }
 
   static distinct(column: keyof ErrorType): ErrorModel {
@@ -1341,7 +1356,9 @@ export class ErrorModel {
   }
 
   join(table: string, firstCol: string, secondCol: string): ErrorModel {
-    return ErrorModel.join(table, firstCol, secondCol)
+    this.selectFromQuery = this.selectFromQuery.innerJoin(table, firstCol, secondCol)
+
+    return this
   }
 
   static join(table: string, firstCol: string, secondCol: string): ErrorModel {