forge-sql-orm 2.0.16 → 2.0.18

package/dist/core/ForgeSQLCrudOperations.d.ts

@@ -27,7 +27,7 @@ export declare class ForgeSQLCrudOperations implements CRUDForgeSQL {
      * @returns {Promise<number>} The number of inserted rows
      * @throws {Error} If the insert operation fails
      */
-    insert<T extends AnyMySqlTable>(schema: T, models: Partial<InferInsertModel<T>>[], updateIfExists?: boolean): Promise<number>;
+    insert<T extends AnyMySqlTable>(schema: T, models: InferInsertModel<T>[], updateIfExists?: boolean): Promise<number>;
     /**
      * Deletes a record by its primary key with optional version check.
      * If versioning is enabled, ensures the record hasn't been modified since last read.

package/dist/core/ForgeSQLCrudOperations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ForgeSQLCrudOperations.d.ts","sourceRoot":"","sources":["../../src/core/ForgeSQLCrudOperations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,IAAI,CAAC;AACxC,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AACzE,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,OAAO,EAAa,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAE1D,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAGlC;;;GAGG;AACH,qBAAa,sBAAuB,YAAW,YAAY;IACzD,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAoB;IACpD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAqB;IAE7C;;;;OAIG;gBACS,kBAAkB,EAAE,iBAAiB,EAAE,OAAO,EAAE,kBAAkB;IAK9E;;;;;;;;;;OAUG;IACG,MAAM,CAAC,CAAC,SAAS,aAAa,EAClC,MAAM,EAAE,CAAC,EACT,MAAM,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,EAAE,EACtC,cAAc,GAAE,OAAe,GAC9B,OAAO,CAAC,MAAM,CAAC;IA+BlB;;;;;;;;;;OAUG;IACG,UAAU,CAAC,CAAC,SAAS,aAAa,EAAE,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;IAqClF;;;;;;;;;;;;;;OAcG;IACG,UAAU,CAAC,CAAC,SAAS,aAAa,EACtC,MAAM,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,EACpC,MAAM,EAAE,CAAC,GACR,OAAO,CAAC,MAAM,CAAC;IAyDlB;;;;;;;;;;;OAWG;IACG,YAAY,CAAC,CAAC,SAAS,aAAa,EACxC,UAAU,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,EACxC,MAAM,EAAE,CAAC,EACT,KAAK,CAAC,EAAE,GAAG,CAAC,OAAO,CAAC,GACnB,OAAO,CAAC,MAAM,CAAC;IAiBlB;;;;;;OAMG;IACH,OAAO,CAAC,cAAc;IAStB;;;;;OAKG;IACH,OAAO,CAAC,oBAAoB;IA4C5B;;;;;;;;;OASG;YACW,iBAAiB;IAyB/B;;;;;;;OAOG;IACH,OAAO,CAAC,uBAAuB;IAmB/B;;;;;;;;OAQG;IACH,OAAO,CAAC,iBAAiB;IAsBzB;;;;;;;;OAQG;YACW,WAAW;CA4B1B"}
+{"version":3,"file":"ForgeSQLCrudOperations.d.ts","sourceRoot":"","sources":["../../src/core/ForgeSQLCrudOperations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,IAAI,CAAC;AACxC,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AACzE,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,OAAO,EAAa,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAE1D,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAGlC;;;GAGG;AACH,qBAAa,sBAAuB,YAAW,YAAY;IACzD,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAoB;IACpD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAqB;IAE7C;;;;OAIG;gBACS,kBAAkB,EAAE,iBAAiB,EAAE,OAAO,EAAE,kBAAkB;IAK9E;;;;;;;;;;OAUG;IACG,MAAM,CAAC,CAAC,SAAS,aAAa,EAClC,MAAM,EAAE,CAAC,EACT,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAAE,EAC7B,cAAc,GAAE,OAAe,GAC9B,OAAO,CAAC,MAAM,CAAC;IA+BlB;;;;;;;;;;OAUG;IACG,UAAU,CAAC,CAAC,SAAS,aAAa,EAAE,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;IAqClF;;;;;;;;;;;;;;OAcG;IACG,UAAU,CAAC,CAAC,SAAS,aAAa,EACtC,MAAM,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,EACpC,MAAM,EAAE,CAAC,GACR,OAAO,CAAC,MAAM,CAAC;IAyDlB;;;;;;;;;;;OAWG;IACG,YAAY,CAAC,CAAC,SAAS,aAAa,EACxC,UAAU,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,EACxC,MAAM,EAAE,CAAC,EACT,KAAK,CAAC,EAAE,GAAG,CAAC,OAAO,CAAC,GACnB,OAAO,CAAC,MAAM,CAAC;IAiBlB;;;;;;OAMG;IACH,OAAO,CAAC,cAAc;IAStB;;;;;OAKG;IACH,OAAO,CAAC,oBAAoB;IAoD5B;;;;;;;;;OASG;YACW,iBAAiB;IAyB/B;;;;;;;OAOG;IACH,OAAO,CAAC,uBAAuB;IA0B/B;;;;;;;;OAQG;IACH,OAAO,CAAC,iBAAiB;IAsBzB;;;;;;;;OAQG;YACW,WAAW;CA4B1B"}

package/dist/core/ForgeSQLORM.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ForgeSQLORM.d.ts","sourceRoot":"","sources":["../../src/core/ForgeSQLORM.ts"],"names":[],"mappings":"AACA,OAAO,EACL,YAAY,EACZ,iBAAiB,EACjB,kBAAkB,EAClB,iBAAiB,EAClB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAW,mBAAmB,EAAE,2BAA2B,EAAE,MAAM,yBAAyB,CAAC;AAEpG,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oDAAoD,CAAC;AACzF,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAmI5D;;;GAGG;AACH,cAAM,WAAY,YAAW,iBAAiB;IAC5C,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAoB;gBAEpC,OAAO,CAAC,EAAE,kBAAkB;IAIxC;;;;;;;;;;;;;;;OAeG;IACH,MAAM,CAAC,UAAU,SAAS,cAAc,EACtC,MAAM,EAAE,UAAU,GACjB,kBAAkB,CAAC,UAAU,EAAE,2BAA2B,CAAC;IAI9D;;;;;;;;;;;;;;;OAeG;IACH,cAAc,CAAC,UAAU,SAAS,cAAc,EAC9C,MAAM,EAAE,UAAU,GACjB,kBAAkB,CAAC,UAAU,EAAE,2BAA2B,CAAC;IAI9D;;;OAGG;IACH,IAAI,IAAI,YAAY;IAIpB;;;OAGG;IACH,KAAK,IAAI,iBAAiB;IAI1B;;;;;;;;OAQG;IACH,sBAAsB;CAGvB;AAED,eAAe,WAAW,CAAC"}
+{"version":3,"file":"ForgeSQLORM.d.ts","sourceRoot":"","sources":["../../src/core/ForgeSQLORM.ts"],"names":[],"mappings":"AACA,OAAO,EACL,YAAY,EACZ,iBAAiB,EACjB,kBAAkB,EAClB,iBAAiB,EAClB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAW,mBAAmB,EAAE,2BAA2B,EAAE,MAAM,yBAAyB,CAAC;AAEpG,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oDAAoD,CAAC;AACzF,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAoI5D;;;GAGG;AACH,cAAM,WAAY,YAAW,iBAAiB;IAC5C,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAoB;gBAEpC,OAAO,CAAC,EAAE,kBAAkB;IAIxC;;;;;;;;;;;;;;;OAeG;IACH,MAAM,CAAC,UAAU,SAAS,cAAc,EACtC,MAAM,EAAE,UAAU,GACjB,kBAAkB,CAAC,UAAU,EAAE,2BAA2B,CAAC;IAI9D;;;;;;;;;;;;;;;OAeG;IACH,cAAc,CAAC,UAAU,SAAS,cAAc,EAC9C,MAAM,EAAE,UAAU,GACjB,kBAAkB,CAAC,UAAU,EAAE,2BAA2B,CAAC;IAI9D;;;OAGG;IACH,IAAI,IAAI,YAAY;IAIpB;;;OAGG;IACH,KAAK,IAAI,iBAAiB;IAI1B;;;;;;;;OAQG;IACH,sBAAsB;CAGvB;AAED,eAAe,WAAW,CAAC"}

package/dist/core/ForgeSQLQueryBuilder.d.ts

@@ -4,6 +4,7 @@ import { AnyMySqlSelectQueryBuilder, AnyMySqlTable, MySqlSelectBuilder } from "d
 import { MySqlSelectDynamic, type SelectedFields } from "drizzle-orm/mysql-core/query-builders/select.types";
 import { InferInsertModel, SQL } from "drizzle-orm";
 import { MySqlRemoteDatabase, MySqlRemotePreparedQueryHKT } from "drizzle-orm/mysql-proxy/index";
+import { SqlHints } from "../utils/sqlHints";
 /**
  * Interface representing the main ForgeSQL operations.
  * Provides access to CRUD operations and schema-level SQL operations.
@@ -74,12 +75,12 @@ export interface CRUDForgeSQL {
      * Inserts multiple records into the database.
      * @template T - The type of the table schema
      * @param {T} schema - The entity schema
-     * @param {Partial<InferInsertModel<T>>[]} models - The list of entities to insert
+     * @param {<InferInsertModel<T>[]} models - The list of entities to insert
      * @param {boolean} [updateIfExists] - Whether to update the row if it already exists (default: false)
      * @returns {Promise<number>} The number of inserted rows
      * @throws {Error} If the insert operation fails
      */
-    insert<T extends AnyMySqlTable>(schema: T, models: Partial<InferInsertModel<T>>[], updateIfExists?: boolean): Promise<number>;
+    insert<T extends AnyMySqlTable>(schema: T, models: InferInsertModel<T>[], updateIfExists?: boolean): Promise<number>;
     /**
      * Deletes a record by its ID.
      * @template T - The type of the table schema
@@ -175,21 +176,15 @@ export interface TableMetadata {
  */
 export type AdditionalMetadata = Record<string, TableMetadata>;
 /**
- * Options for configuring ForgeSQL ORM behavior.
+ * Interface for ForgeSQL ORM options
  */
 export interface ForgeSqlOrmOptions {
-    /**
-     * Enables logging of raw SQL queries in the Atlassian Forge Developer Console.
-     * Useful for debugging and monitoring SQL operations.
-     * @default false
-     */
+    /** Whether to log raw SQL queries */
     logRawSqlQuery?: boolean;
-    /**
-     * Disables optimistic locking for all operations.
-     * When enabled, version checks are skipped during updates.
-     * @default false
-     */
+    /** Whether to disable optimistic locking */
     disableOptimisticLocking?: boolean;
+    /** SQL hints to be applied to queries */
+    hints?: SqlHints;
     /**
      * Additional metadata for table configuration.
      * Allows specifying table-specific settings and behaviors.

package/dist/core/ForgeSQLQueryBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ForgeSQLQueryBuilder.d.ts","sourceRoot":"","sources":["../../src/core/ForgeSQLQueryBuilder.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ForgeSQLQueryBuilder.d.ts","sourceRoot":"","sources":["../../src/core/ForgeSQLQueryBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,OAAO,EACL,0BAA0B,EAC1B,aAAa,EAEb,kBAAkB,EACnB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACL,kBAAkB,EAClB,KAAK,cAAc,EACpB,MAAM,oDAAoD,CAAC;AAC5D,OAAO,EAAE,gBAAgB,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAGpD,OAAO,EAAE,mBAAmB,EAAE,2BAA2B,EAAE,MAAM,+BAA+B,CAAC;AACjG,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAI7C;;;GAGG;AACH,MAAM,WAAW,iBAAkB,SAAQ,oBAAoB;IAC7D;;;OAGG;IACH,IAAI,IAAI,YAAY,CAAC;IAErB;;;OAGG;IACH,KAAK,IAAI,iBAAiB,CAAC;CAC5B;AAED;;;GAGG;AACH,MAAM,WAAW,oBAAoB;IACnC;;;OAGG;IACH,sBAAsB,IAAI,mBAAmB,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAEvE;;;;;;;;;;;;;;;OAeG;IACH,MAAM,CAAC,UAAU,SAAS,cAAc,EACtC,MAAM,EAAE,UAAU,GACjB,kBAAkB,CAAC,UAAU,EAAE,2BAA2B,CAAC,CAAC;IAE/D;;;;;;;;;;;;;;;OAeG;IACH,cAAc,CAAC,UAAU,SAAS,cAAc,EAC9C,MAAM,EAAE,UAAU,GACjB,kBAAkB,CAAC,UAAU,EAAE,2BAA2B,CAAC,CAAC;CAChE;AAID;;;GAGG;AACH,MAAM,WAAW,YAAY;IAC3B;;;;;;;;OAQG;IACH,MAAM,CAAC,CAAC,SAAS,aAAa,EAC5B,MAAM,EAAE,CAAC,EACT,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAAE,EAC7B,cAAc,CAAC,EAAE,OAAO,GACvB,OAAO,CAAC,MAAM,CAAC,CAAC;IAEnB;;;;;;;OAOG;IACH,UAAU,CAAC,CAAC,SAAS,aAAa,EAAE,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAE7E;;;;;;;;;;;;;OAaG;IACH,UAAU,CAAC,CAAC,SAAS,aAAa,EAChC,MAAM,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,EACpC,MAAM,EAAE,CAAC,GACR,OAAO,CAAC,MAAM,CAAC,CAAC;IAEnB;;;;;;;;;;;;OAYG;IACH,YAAY,CAAC,CAAC,SAAS,aAAa,EAClC,UAAU,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,EACxC,MAAM,EAAE,CAAC,EACT,KAAK,CAAC,EAAE,GAAG,CAAC,OAAO,CAAC,GACnB,OAAO,CAAC,MAAM,CAAC,CAAC;CACpB;AAID;;;GAGG;AACH,MAAM,WAAW,iBAAiB;IAChC;;;;;;;OAOG;IACH,mBAAmB,CAAC,CAAC,SAAS,kBAAkB,CAAC,0BAA0B,CAAC,EAC1E,KAAK,EAAE,CAAC,GACP,OAAO,CACR,OAAO,CAAC,CAAC,CAAC,SAAS,KAAK,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,SAAS,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,SAAS,CACxF,CAAC;IAEF;;;;;;;OAOG;IACH,aAAa,CAAC,CAAC,SAAS,MAAM,GAAG,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC;IAEjG;;;;;;OAMG;IACH,mBAAmB,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;CACtF;AAID;;;GAGG;AACH,MAAM,WAAW,oBAAoB;IACnC,gCAAgC;IAChC,SAAS,EAAE,MAAM,CAAC;CACnB;AAED;;;GAGG;AACH,MAAM,WAAW,aAAa;IAC5B,wBAAwB;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,yDAAyD;IACzD,YAAY,EAAE,oBAAoB,CAAC;CACpC;AAED;;;GAGG;AACH,MAAM,MAAM,kBAAkB,GAAG,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;AAE/D;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,qCAAqC;IACrC,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,4CAA4C;IAC5C,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC,yCAAyC;IACzC,KAAK,CAAC,EAAE,QAAQ,CAAC;IAEjB;;;;;;;;;;;;;;;;OAgBG;IACH,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;CACzC;AAID;;;GAGG;AACH,eAAO,MAAM,mBAAmB;;;;;;;;;;iBAGX,MAAM;;;;;;;;;;iBAAN,MAAM;;;;;;;;;CAYzB,CAAC;AAEH;;;GAGG;AACH,eAAO,MAAM,oBAAoB;;;;;;;;;;iBAGZ,MAAM;;;;;;;;;;iBAAN,MAAM;;;;;;;;;CAYzB,CAAC;AAEH;;;GAGG;AACH,eAAO,MAAM,eAAe;;;;;;;;;;iBAGP,MAAM;;;;;;;;;;iBAAN,MAAM;;;;;;;;;CAYzB,CAAC;AAEH;;;GAGG;AACH,eAAO,MAAM,eAAe;;;;;;;;;;iBAGP,MAAM;;;;;;;;;;iBAAN,MAAM;;;;;;;;;CAWzB,CAAC"}

package/dist/utils/forgeDriverProxy.d.ts

@@ -0,0 +1,11 @@
+import { SqlHints } from "./sqlHints";
+/**
+ * Creates a proxy for the forgeDriver that injects SQL hints
+ * @returns A proxied version of the forgeDriver
+ */
+export declare function createForgeDriverProxy(options?: SqlHints, logRawSqlQuery?: boolean): (query: string, params: any[], method: "all" | "execute") => Promise<{
+    rows: any[];
+    insertId?: number;
+    affectedRows?: number;
+}>;
+//# sourceMappingURL=forgeDriverProxy.d.ts.map

package/dist/utils/forgeDriverProxy.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"forgeDriverProxy.d.ts","sourceRoot":"","sources":["../../src/utils/forgeDriverProxy.ts"],"names":[],"mappings":"AACA,OAAO,EAAkB,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtD;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,cAAc,CAAC,EAAE,OAAO,IAE/E,OAAO,MAAM,EACb,QAAQ,GAAG,EAAE,EACb,QAAQ,KAAK,GAAG,SAAS,KACxB,OAAO,CAAC;IACT,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC,CAUH"}

package/dist/utils/sqlHints.d.ts

@@ -0,0 +1,21 @@
+/**
+ * Interface for SQL hints configuration
+ */
+export interface SqlHints {
+    /** SQL hints for SELECT queries */
+    select?: string[];
+    /** SQL hints for INSERT queries */
+    insert?: string[];
+    /** SQL hints for UPDATE queries */
+    update?: string[];
+    /** SQL hints for DELETE queries */
+    delete?: string[];
+}
+/**
+ * Detects the type of SQL query and injects appropriate hints
+ * @param query - The SQL query to analyze
+ * @param hints - The hints configuration
+ * @returns The modified query with injected hints
+ */
+export declare function injectSqlHints(query: string, hints?: SqlHints): string;
+//# sourceMappingURL=sqlHints.d.ts.map

package/dist/utils/sqlHints.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sqlHints.d.ts","sourceRoot":"","sources":["../../src/utils/sqlHints.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,WAAW,QAAQ;IACvB,mCAAmC;IACnC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,mCAAmC;IACnC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,mCAAmC;IACnC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,mCAAmC;IACnC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,QAAQ,GAAG,MAAM,CA0CtE"}

package/dist/utils/sqlUtils.d.ts

@@ -34,12 +34,6 @@ export interface MetadataInfo {
  * @returns Date object
  */
 export declare const parseDateTime: (value: string, format: string) => Date;
-/**
- * Extracts the alias from a SQL query
- * @param query - The SQL query to extract the alias from
- * @returns The extracted alias or the original query if no alias found
- */
-export declare function extractAlias(query: string): string;
 /**
  * Gets primary keys from the schema.
  * @template T - The type of the table schema

package/dist/utils/sqlUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sqlUtils.d.ts","sourceRoot":"","sources":["../../src/utils/sqlUtils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAA0C,MAAM,aAAa,CAAC;AAChF,OAAO,EAAE,aAAa,EAAqB,MAAM,8BAA8B,CAAC;AAChF,OAAO,EAAE,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;AACxE,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;AACxE,OAAO,EAAE,uBAAuB,EAAE,MAAM,0CAA0C,CAAC;AACnF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oDAAoD,CAAC;AAIzF;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,4BAA4B;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,wEAAwE;IACxE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACnC,8BAA8B;IAC9B,OAAO,EAAE,eAAe,EAAE,CAAC;IAC3B,yCAAyC;IACzC,MAAM,EAAE,YAAY,EAAE,CAAC;IACvB,oCAAoC;IACpC,WAAW,EAAE,iBAAiB,EAAE,CAAC;IACjC,oCAAoC;IACpC,WAAW,EAAE,iBAAiB,EAAE,CAAC;IACjC,0CAA0C;IAC1C,iBAAiB,EAAE,uBAAuB,EAAE,CAAC;IAC7C,kCAAkC;IAClC,MAAM,EAAE,GAAG,EAAE,CAAC;CACf;AAUD;;;;;GAKG;AACH,eAAO,MAAM,aAAa,GAAI,OAAO,MAAM,EAAE,QAAQ,MAAM,KAAG,IAM7D,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAGlD;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,CAAC,SAAS,aAAa,EAAE,KAAK,EAAE,CAAC,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,EAAE,CAkCvF;AA0DD;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,aAAa,GAAG,YAAY,CAoEnE;AAED;;;;GAIG;AACH,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,EAAE,CAc7E;AAED,KAAK,cAAc,GAAG,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;AAmBhD,wBAAgB,yBAAyB,CACvC,UAAU,EAAE,GAAG,EACf,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAC,MAAM,EACf,MAAM,EAAE,GAAG,EACX,QAAQ,EAAE,cAAc,GACvB,GAAG,CAmBL;AACD,wBAAgB,wBAAwB,CAAC,UAAU,SAAS,cAAc,EACxE,MAAM,EAAE,UAAU,GACjB;IAAE,UAAU,EAAE,UAAU,CAAC;IAAC,QAAQ,EAAE,cAAc,CAAA;CAAE,CAUtD;AAsED,wBAAgB,wBAAwB,CAAC,CAAC,EAAE,UAAU,EACpD,IAAI,EAAE,CAAC,EAAE,EACT,UAAU,EAAE,UAAU,EACtB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAClC,CAAC,EAAE,CAUL"}
+{"version":3,"file":"sqlUtils.d.ts","sourceRoot":"","sources":["../../src/utils/sqlUtils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAA0C,MAAM,aAAa,CAAC;AAChF,OAAO,EAAE,aAAa,EAAqB,MAAM,8BAA8B,CAAC;AAChF,OAAO,EAAE,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;AACxE,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;AACxE,OAAO,EAAE,uBAAuB,EAAE,MAAM,0CAA0C,CAAC;AACnF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oDAAoD,CAAC;AAIzF;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,4BAA4B;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,wEAAwE;IACxE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACnC,8BAA8B;IAC9B,OAAO,EAAE,eAAe,EAAE,CAAC;IAC3B,yCAAyC;IACzC,MAAM,EAAE,YAAY,EAAE,CAAC;IACvB,oCAAoC;IACpC,WAAW,EAAE,iBAAiB,EAAE,CAAC;IACjC,oCAAoC;IACpC,WAAW,EAAE,iBAAiB,EAAE,CAAC;IACjC,0CAA0C;IAC1C,iBAAiB,EAAE,uBAAuB,EAAE,CAAC;IAC7C,kCAAkC;IAClC,MAAM,EAAE,GAAG,EAAE,CAAC;CACf;AAUD;;;;;GAKG;AACH,eAAO,MAAM,aAAa,GAAI,OAAO,MAAM,EAAE,QAAQ,MAAM,KAAG,IAiB7D,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,CAAC,SAAS,aAAa,EAAE,KAAK,EAAE,CAAC,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,EAAE,CAkCvF;AA0DD;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,aAAa,GAAG,YAAY,CAoEnE;AAED;;;;GAIG;AACH,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,EAAE,CAc7E;AAED,KAAK,cAAc,GAAG,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;AAuBhD,wBAAgB,yBAAyB,CACvC,UAAU,EAAE,GAAG,EACf,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,GAAG,EACX,QAAQ,EAAE,cAAc,GACvB,GAAG,CAmBL;AACD,wBAAgB,wBAAwB,CAAC,UAAU,SAAS,cAAc,EACxE,MAAM,EAAE,UAAU,GACjB;IAAE,UAAU,EAAE,UAAU,CAAC;IAAC,QAAQ,EAAE,cAAc,CAAA;CAAE,CAUtD;AAsED,wBAAgB,wBAAwB,CAAC,CAAC,EAAE,UAAU,EACpD,IAAI,EAAE,CAAC,EAAE,EACT,UAAU,EAAE,UAAU,EACtB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAClC,CAAC,EAAE,CAUL"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "forge-sql-orm",
-  "version": "2.0.16",
+  "version": "2.0.18",
   "description": "Drizzle ORM integration for Forge-SQL in Atlassian Forge applications.",
   "main": "dist/ForgeSQLORM.js",
   "module": "dist/ForgeSQLORM.mjs",

package/src/core/ForgeSQLCrudOperations.ts

@@ -37,7 +37,7 @@ export class ForgeSQLCrudOperations implements CRUDForgeSQL {
    */
   async insert<T extends AnyMySqlTable>(
     schema: T,
-    models: Partial<InferInsertModel<T>>[],
+    models: InferInsertModel<T>[],
     updateIfExists: boolean = false,
   ): Promise<number> {
     if (!models?.length) return 0;
@@ -257,8 +257,16 @@ export class ForgeSQLCrudOperations implements CRUDForgeSQL {
     }
     const versionMetadata = this.options.additionalMetadata?.[tableName]?.versionField;
     if (!versionMetadata) return undefined;
+    let fieldName = versionMetadata.fieldName;
 
-    const versionField = columns[versionMetadata.fieldName];
+    let versionField = columns[versionMetadata.fieldName];
+    if (!versionField) {
+      const find = Object.entries(columns).find(([, c]) => c.name === versionMetadata.fieldName);
+      if (find) {
+        fieldName = find[0];
+        versionField = find[1];
+      }
+    }
     if (!versionField) {
       console.warn(
         `Version field "${versionMetadata.fieldName}" not found in table ${tableName}. Versioning will be skipped.`,
@@ -289,7 +297,7 @@ export class ForgeSQLCrudOperations implements CRUDForgeSQL {
       return undefined;
     }
 
-    return { fieldName: versionMetadata.fieldName, type: fieldType };
+    return { fieldName, type: fieldType };
   }
 
   /**
@@ -341,15 +349,22 @@ export class ForgeSQLCrudOperations implements CRUDForgeSQL {
     columns: Record<string, AnyColumn>,
   ): InferInsertModel<T> {
     if (!versionMetadata || !columns) return model as InferInsertModel<T>;
+    let fieldName = versionMetadata.fieldName;
+    let versionField = columns[versionMetadata.fieldName];
+    if (!versionField) {
+      const find = Object.entries(columns).find(([, c]) => c.name === versionMetadata.fieldName);
+      if (find) {
+        fieldName = find[0];
+        versionField = find[1];
+      }
+    }
 
-    const versionField = columns[versionMetadata.fieldName];
     if (!versionField) return model as InferInsertModel<T>;
 
     const modelWithVersion = { ...model };
     const fieldType = versionField.getSQLType();
     const versionValue = fieldType === "datetime" || fieldType === "timestamp" ? new Date() : 1;
-    modelWithVersion[versionMetadata.fieldName as keyof typeof modelWithVersion] =
-      versionValue as any;
+    modelWithVersion[fieldName as keyof typeof modelWithVersion] = versionValue as any;
 
     return modelWithVersion as InferInsertModel<T>;
   }

package/src/core/ForgeSQLORM.ts

@@ -7,7 +7,7 @@ import {
 } from "./ForgeSQLQueryBuilder";
 import { ForgeSQLSelectOperations } from "./ForgeSQLSelectOperations";
 import { drizzle, MySqlRemoteDatabase, MySqlRemotePreparedQueryHKT } from "drizzle-orm/mysql-proxy";
-import { forgeDriver } from "../utils/forgeDriver";
+import { createForgeDriverProxy } from "../utils/forgeDriverProxy";
 import type { SelectedFields } from "drizzle-orm/mysql-core/query-builders/select.types";
 import { MySqlSelectBuilder } from "drizzle-orm/mysql-core";
 import { patchDbWithSelectAliased } from "../lib/drizzle/extensions/selectAliased";
@@ -37,8 +37,9 @@ class ForgeSQLORMImpl implements ForgeSqlOperation {
         console.debug("Initializing ForgeSQLORM...");
       }
       // Initialize Drizzle instance with our custom driver
+      const proxiedDriver = createForgeDriverProxy(newOptions.hints, newOptions.logRawSqlQuery);
       this.drizzle = patchDbWithSelectAliased(
-        drizzle(forgeDriver, { logger: newOptions.logRawSqlQuery }),
+        drizzle(proxiedDriver, { logger: newOptions.logRawSqlQuery }),
       );
       this.crudOperations = new ForgeSQLCrudOperations(this, newOptions);
       this.fetchOperations = new ForgeSQLSelectOperations(newOptions);

package/src/core/ForgeSQLQueryBuilder.ts

@@ -14,6 +14,7 @@ import { InferInsertModel, SQL } from "drizzle-orm";
 import moment from "moment/moment";
 import { parseDateTime } from "../utils/sqlUtils";
 import { MySqlRemoteDatabase, MySqlRemotePreparedQueryHKT } from "drizzle-orm/mysql-proxy/index";
+import { SqlHints } from "../utils/sqlHints";
 
 // ============= Core Types =============
 
@@ -98,14 +99,14 @@ export interface CRUDForgeSQL {
    * Inserts multiple records into the database.
    * @template T - The type of the table schema
    * @param {T} schema - The entity schema
-   * @param {Partial<InferInsertModel<T>>[]} models - The list of entities to insert
+   * @param {<InferInsertModel<T>[]} models - The list of entities to insert
    * @param {boolean} [updateIfExists] - Whether to update the row if it already exists (default: false)
    * @returns {Promise<number>} The number of inserted rows
    * @throws {Error} If the insert operation fails
    */
   insert<T extends AnyMySqlTable>(
     schema: T,
-    models: Partial<InferInsertModel<T>>[],
+    models: InferInsertModel<T>[],
     updateIfExists?: boolean,
   ): Promise<number>;
 
@@ -228,22 +229,15 @@ export interface TableMetadata {
 export type AdditionalMetadata = Record<string, TableMetadata>;
 
 /**
- * Options for configuring ForgeSQL ORM behavior.
+ * Interface for ForgeSQL ORM options
  */
 export interface ForgeSqlOrmOptions {
-  /**
-   * Enables logging of raw SQL queries in the Atlassian Forge Developer Console.
-   * Useful for debugging and monitoring SQL operations.
-   * @default false
-   */
+  /** Whether to log raw SQL queries */
   logRawSqlQuery?: boolean;
-
-  /**
-   * Disables optimistic locking for all operations.
-   * When enabled, version checks are skipped during updates.
-   * @default false
-   */
+  /** Whether to disable optimistic locking */
   disableOptimisticLocking?: boolean;
+  /** SQL hints to be applied to queries */
+  hints?: SqlHints;
 
   /**
    * Additional metadata for table configuration.
@@ -301,7 +295,7 @@ export const forgeTimestampString = customType<{
     return "timestamp";
   },
   toDriver(value: Date) {
-    return moment(value as Date).format("YYYY-MM-DDTHH:mm:ss.SSS");
+    return moment(new Date(value)).format("YYYY-MM-DDTHH:mm:ss.SSS");
   },
   fromDriver(value: unknown) {
     const format = "YYYY-MM-DDTHH:mm:ss.SSS";

package/src/utils/forgeDriverProxy.ts

@@ -0,0 +1,27 @@
+import { forgeDriver } from "./forgeDriver";
+import { injectSqlHints, SqlHints } from "./sqlHints";
+
+/**
+ * Creates a proxy for the forgeDriver that injects SQL hints
+ * @returns A proxied version of the forgeDriver
+ */
+export function createForgeDriverProxy(options?: SqlHints, logRawSqlQuery?: boolean) {
+  return async (
+    query: string,
+    params: any[],
+    method: "all" | "execute",
+  ): Promise<{
+    rows: any[];
+    insertId?: number;
+    affectedRows?: number;
+  }> => {
+    // Inject SQL hints into the query
+    const modifiedQuery = injectSqlHints(query, options);
+
+    if (options && logRawSqlQuery) {
+      console.warn("modified query: " + modifiedQuery);
+    }
+    // Call the original forgeDriver with the modified query
+    return forgeDriver(modifiedQuery, params, method);
+  };
+}

package/src/utils/sqlHints.ts

@@ -0,0 +1,63 @@
+/**
+ * Interface for SQL hints configuration
+ */
+export interface SqlHints {
+  /** SQL hints for SELECT queries */
+  select?: string[];
+  /** SQL hints for INSERT queries */
+  insert?: string[];
+  /** SQL hints for UPDATE queries */
+  update?: string[];
+  /** SQL hints for DELETE queries */
+  delete?: string[];
+}
+
+/**
+ * Detects the type of SQL query and injects appropriate hints
+ * @param query - The SQL query to analyze
+ * @param hints - The hints configuration
+ * @returns The modified query with injected hints
+ */
+export function injectSqlHints(query: string, hints?: SqlHints): string {
+  if (!hints) {
+    return query;
+  }
+
+  // Normalize the query for easier matching
+  const normalizedQuery = query.trim().toUpperCase();
+
+  // Get the appropriate hints based on query type
+  let queryHints: string[] | undefined;
+
+  if (normalizedQuery.startsWith("SELECT")) {
+    queryHints = hints.select;
+  } else if (normalizedQuery.startsWith("INSERT")) {
+    queryHints = hints.insert;
+  } else if (normalizedQuery.startsWith("UPDATE")) {
+    queryHints = hints.update;
+  } else if (normalizedQuery.startsWith("DELETE")) {
+    queryHints = hints.delete;
+  }
+
+  // If no hints for this query type, return original query
+  if (!queryHints || queryHints.length === 0) {
+    return query;
+  }
+
+  // Join all hints with spaces
+  const hintsString = queryHints.join(" ");
+
+  // Inject hints into the query
+  if (normalizedQuery.startsWith("SELECT")) {
+    return `SELECT /*+ ${hintsString} */ ${query.substring(6)}`;
+  } else if (normalizedQuery.startsWith("INSERT")) {
+    return `INSERT /*+ ${hintsString} */ ${query.substring(6)}`;
+  } else if (normalizedQuery.startsWith("UPDATE")) {
+    return `UPDATE /*+ ${hintsString} */ ${query.substring(6)}`;
+  } else if (normalizedQuery.startsWith("DELETE")) {
+    return `DELETE /*+ ${hintsString} */ ${query.substring(6)}`;
+  }
+
+  // If no match found, return original query
+  return query;
+}

package/src/utils/sqlUtils.ts

@@ -47,23 +47,24 @@ interface ConfigBuilderData {
  * @returns Date object
  */
 export const parseDateTime = (value: string, format: string): Date => {
+  let result: Date;
   const m = moment(value, format, true);
   if (!m.isValid()) {
-    return moment(value).toDate();
+    const momentDate = moment(value);
+    if (momentDate.isValid()) {
+      result = momentDate.toDate();
+    } else {
+      result = new Date(value);
+    }
+  } else {
+    result = m.toDate();
+  }
+  if (isNaN(result.getTime())) {
+    result = new Date(value);
   }
-  return m.toDate();
+  return result;
 };
 
-/**
- * Extracts the alias from a SQL query
- * @param query - The SQL query to extract the alias from
- * @returns The extracted alias or the original query if no alias found
- */
-export function extractAlias(query: string): string {
-  const match = query.match(/\bas\s+(['"`]?)([\w*]+)\1$/i);
-  return match ? match[2] : query;
-}
-
 /**
  * Gets primary keys from the schema.
  * @template T - The type of the table schema
@@ -260,7 +261,11 @@ export function generateDropTableStatements(tables: AnyMySqlTable[]): string[] {
 
 type AliasColumnMap = Record<string, AnyColumn>;
 
-function mapSelectTableToAlias(table: MySqlTable,uniqPrefix:string, aliasMap: AliasColumnMap): any {
+function mapSelectTableToAlias(
+  table: MySqlTable,
+  uniqPrefix: string,
+  aliasMap: AliasColumnMap,
+): any {
   const { columns, tableName } = getTableMetadata(table);
   const selectionsTableFields: Record<string, unknown> = {};
   Object.keys(columns).forEach((name) => {
@@ -280,7 +285,7 @@ function isDrizzleColumn(column: any): boolean {
 export function mapSelectAllFieldsToAlias(
   selections: any,
   name: string,
-  uniqName:string,
+  uniqName: string,
   fields: any,
   aliasMap: AliasColumnMap,
 ): any {
@@ -291,7 +296,7 @@ export function mapSelectAllFieldsToAlias(
     const uniqAliasName = `a_${uniqName}_${column.name}`.toLowerCase();
     let aliasName = sql.raw(uniqAliasName);
     selections[name] = sql`${column} as \`${aliasName}\``;
-    aliasMap[uniqName] = column;
+    aliasMap[uniqAliasName] = column;
   } else if (isSQLWrapper(fields)) {
     selections[name] = fields;
   } else {
@@ -312,7 +317,7 @@ export function mapSelectFieldsWithAlias<TSelection extends SelectedFields>(
   const aliasMap: AliasColumnMap = {};
   const selections: any = {};
   Object.entries(fields).forEach(([name, fields]) => {
-    mapSelectAllFieldsToAlias(selections, name,name, fields, aliasMap);
+    mapSelectAllFieldsToAlias(selections, name, name, fields, aliasMap);
   });
   return { selections, aliasMap };
 }
@@ -402,7 +407,12 @@ export function applyFromDriverTransform<T, TSelection>(
 }
 
 function processNullBranches(obj: Record<string, unknown>): Record<string, unknown> | null {
-  if (obj === null || typeof obj !== 'object' || obj===undefined) {
+  if (obj === null || typeof obj !== "object" || obj === undefined) {
+    return obj;
+  }
+
+  // Skip built-in objects like Date, Array, etc.
+  if (obj.constructor && obj.constructor.name !== "Object") {
     return obj;
   }
 
@@ -410,12 +420,12 @@ function processNullBranches(obj: Record<string, unknown>): Record<string, unkno
   let allNull = true;
 
   for (const [key, value] of Object.entries(obj)) {
-    if (value === null || value===undefined) {
+    if (value === null || value === undefined) {
       result[key] = null;
       continue;
     }
 
-    if (typeof value === 'object' && (value !== null || value !== undefined) ) {
+    if (typeof value === "object" && value !== null && value !== undefined) {
       const processed = processNullBranches(value as Record<string, unknown>);
       result[key] = processed;
       if (processed !== null) {