panates · erayhanoglu · Mar 13, 2026 · Mar 13, 2026 · Mar 13, 2026 · Mar 13, 2026
diff --git a/packages/builder/package.json b/packages/builder/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@sqb/builder",
   "description": "Extensible multi-dialect SQL query builder written with TypeScript",
-  "version": "4.24.1",
+  "version": "4.25.0",
   "author": "Panates",
   "private": false,
   "license": "Apache-2.0",

diff --git a/packages/builder/src/query/delete-query.ts b/packages/builder/src/query/delete-query.ts
@@ -45,6 +45,14 @@ export class DeleteQuery extends Query {
     const o = {
       table: this._table._serialize(ctx),
       where: this._serializeWhere(ctx),
+      indexHint: this._indexHint.filter(
+        x =>
+          !ctx.dialect || !x.dialect?.length || x.dialect.includes(ctx.dialect),
+      ),
+      noIndexHint: this._noIndexHint.filter(
+        x =>
+          !ctx.dialect || !x.dialect?.length || x.dialect.includes(ctx.dialect),
+      ),
     };
     return ctx.serialize(this._type, o, () => this.__defaultSerialize(ctx, o));
   }

diff --git a/packages/builder/src/query/insert-query.ts b/packages/builder/src/query/insert-query.ts
@@ -50,6 +50,14 @@ export class InsertQuery extends ReturningQuery {
       columns: this.__serializeColumns(ctx),
       values: this.__serializeValues(ctx),
       returning: this.__serializeReturning(ctx),
+      indexHint: this._indexHint.filter(
+        x =>
+          !ctx.dialect || !x.dialect?.length || x.dialect.includes(ctx.dialect),
+      ),
+      noIndexHint: this._noIndexHint.filter(
+        x =>
+          !ctx.dialect || !x.dialect?.length || x.dialect.includes(ctx.dialect),
+      ),
     };
 
     let out =

diff --git a/packages/builder/src/query/query.ts b/packages/builder/src/query/query.ts
@@ -7,9 +7,20 @@ import { GenerateOptions, GenerateResult } from '../types.js';
 
 export declare interface Query extends EventEmitter {}
 
+export interface QueryCommentArgs {
+  comment: string;
+  dialect?: string[];
+}
+
+export interface QueryIndexHintArgs {
+  index: string[];
+  dialect?: string[];
+}
+
 export abstract class Query extends Serializable {
-  protected _comment?: string;
-  protected _commentDialect?: string[];
+  protected _comment: QueryCommentArgs[] = [];
+  protected _indexHint: QueryIndexHintArgs[] = [];
+  protected _noIndexHint: QueryIndexHintArgs[] = [];
   protected _params?: Record<string, any>;
 
   constructor() {
@@ -28,14 +39,19 @@ export abstract class Query extends Serializable {
     /* generate output */
     let sql = this._serialize(ctx);
     sql = flattenText(sql, { noWrap: !ctx.prettyPrint });
-    if (
-      this._comment &&
-      (!ctx.dialect ||
-        !this._commentDialect ||
-        this._commentDialect.includes(ctx.dialect))
-    ) {
-      const lines = '-- ' + this._comment.split('\n').join('\n-- ') + '\n';
-      sql = lines + sql;
+    if (this._comment.length) {
+      const comment = this._comment
+        .filter(
+          x =>
+            !ctx.dialect ||
+            !x.dialect?.length ||
+            x.dialect.includes(ctx.dialect),
+        )
+        .map(x => x.comment.replace(/\n/g, '\n  '))
+        .join('\n');
+      if (comment) {
+        sql = `/*${comment}*/\n${sql}`;
+      }
     }
     return {
       sql,
@@ -52,9 +68,53 @@ export abstract class Query extends Serializable {
     return this;
   }
 
-  comment(text: string, dialect?: string[]): this {
-    this._comment = text;
-    this._commentDialect = dialect;
+  comment(args: QueryCommentArgs): this;
+  comment(text: string, dialect?: string[]): this;
+  comment(arg0: any, dialect?: string[]): this {
+    if (typeof arg0 === 'string')
+      this._comment.push({
+        comment: arg0,
+        dialect: Array.isArray(dialect) ? dialect : undefined,
+      });
+    else if (typeof arg0 === 'object' && typeof arg0.comment === 'string')
+      this._comment.push({
+        comment: arg0.comment,
+        dialect: Array.isArray(arg0.dialect) ? arg0.dialect : undefined,
+      });
+    return this;
+  }
+
+  indexHint(args: QueryIndexHintArgs): this;
+  indexHint(index: string | string[], dialect?: string[]): this;
+  indexHint(arg0: any, dialect?: string[]): this {
+    if (typeof arg0 === 'object' && !Array.isArray(arg0))
+      this._indexHint.push({
+        index: Array.isArray(arg0.index) ? arg0.index : [arg0.index],
+        dialect: Array.isArray(arg0.dialect) ? arg0.dialect : undefined,
+      });
+    else {
+      this._indexHint.push({
+        index: Array.isArray(arg0) ? arg0 : [arg0],
+        dialect: Array.isArray(dialect) ? dialect : undefined,
+      });
+    }
+    return this;
+  }
+
+  noIndexHint(args: QueryIndexHintArgs): this;
+  noIndexHint(index: string | string[], dialect?: string[]): this;
+  noIndexHint(arg0: any, dialect?: string[]): this {
+    if (typeof arg0 === 'object' && !Array.isArray(arg0))
+      this._noIndexHint.push({
+        index: Array.isArray(arg0.index) ? arg0.index : [arg0.index],
+        dialect: Array.isArray(arg0.dialect) ? arg0.dialect : undefined,
+      });
+    else {
+      this._noIndexHint.push({
+        index: Array.isArray(arg0) ? arg0 : [arg0],
+        dialect: Array.isArray(dialect) ? dialect : undefined,
+      });
+    }
     return this;
   }
 }

diff --git a/packages/builder/src/query/select-query.ts b/packages/builder/src/query/select-query.ts
@@ -166,6 +166,14 @@ export class SelectQuery extends Query {
       orderBy: this.__serializeOrderColumns(ctx),
       limit: this._limit,
       offset: this._offset,
+      indexHint: this._indexHint.filter(
+        x =>
+          !ctx.dialect || !x.dialect?.length || x.dialect.includes(ctx.dialect),
+      ),
+      noIndexHint: this._noIndexHint.filter(
+        x =>
+          !ctx.dialect || !x.dialect?.length || x.dialect.includes(ctx.dialect),
+      ),
     };
 
     return ctx.serialize(this._type, o, () => {

diff --git a/packages/builder/src/query/update-query.ts b/packages/builder/src/query/update-query.ts
@@ -58,6 +58,14 @@ export class UpdateQuery extends ReturningQuery {
       values: this.__serializeValues(ctx),
       where: this.__serializeWhere(ctx),
       returning: this.__serializeReturning(ctx),
+      indexHint: this._indexHint.filter(
+        x =>
+          !ctx.dialect || !x.dialect?.length || x.dialect.includes(ctx.dialect),
+      ),
+      noIndexHint: this._noIndexHint.filter(
+        x =>
+          !ctx.dialect || !x.dialect?.length || x.dialect.includes(ctx.dialect),
+      ),
     };
     let out = 'update ' + o.table + ' set \n\t' + o.values + '\b';
     if (o.where) out += '\n' + o.where;

diff --git a/packages/builder/test/query-objects/select-query.spec.ts b/packages/builder/test/query-objects/select-query.spec.ts
@@ -239,14 +239,14 @@ describe('builder:serialize "SelectQuery"', () => {
   it('should serialize comment', () => {
     const query = Select().comment('This is a comment');
     const result = query.generate(options);
-    expect(result.sql).toStrictEqual('-- This is a comment\nselect *');
+    expect(result.sql).toStrictEqual('/*This is a comment*/\nselect *');
   });
 
   it('should serialize multiline comment', () => {
     const query = Select().comment('This is a comment\nline 2\nline 3');
     const result = query.generate(options);
     expect(result.sql).toStrictEqual(
-      '-- This is a comment\n-- line 2\n-- line 3\nselect *',
+      '/*This is a comment\n  line 2\n  line 3*/\nselect *',
     );
   });
 });
diff --git a/packages/connect/package.json b/packages/connect/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@sqb/connect",
   "description": "Multi-dialect database connection framework written with TypeScript",
-  "version": "4.24.1",
+  "version": "4.25.0",
   "author": "Panates",
   "license": "Apache-2.0",
   "scripts": {
@@ -44,7 +44,7 @@
     "postgrejs": "^2.22.9"
   },
   "peerDependencies": {
-    "@sqb/builder": "^4.24.1",
+    "@sqb/builder": "^4.25.0",
     "reflect-metadata": "^0.2.2"
   },
   "type": "module",

diff --git a/packages/connect/src/orm/commands/count.command.ts b/packages/connect/src/orm/commands/count.command.ts
@@ -23,7 +23,11 @@ export class CountCommand {
       await prepareFilter(entity, filter, where, 'T');
     }
     const query = Select(Count()).from(entity.tableName + ' T');
-    if (args.comment) query.comment(args.comment, args.commentDialect);
+    if (args.comment) {
+      if (Array.isArray(args.comment))
+        args.comment.forEach(c => query.comment(c));
+      else query.comment(args.comment as any);
+    }
     if (where) query.where(where);
     // Execute query
     const resp = await connection.execute(query, {

diff --git a/packages/connect/src/orm/commands/create.command.ts b/packages/connect/src/orm/commands/create.command.ts
@@ -51,7 +51,11 @@ export class CreateCommand {
       throw new Error('No field given to create new entity instance');
 
     const query = Insert(tableName, ctx.queryValues);
-    if (args.comment) query.comment(args.comment, args.commentDialect);
+    if (args.comment) {
+      if (Array.isArray(args.comment))
+        args.comment.forEach(c => query.comment(c));
+      else query.comment(args.comment as any);
+    }
     if (args.returning) {
       const primaryIndexColumns = EntityMetadata.getPrimaryIndexColumns(entity);
       if (primaryIndexColumns.length)

diff --git a/packages/connect/src/orm/commands/delete.command.ts b/packages/connect/src/orm/commands/delete.command.ts
@@ -24,7 +24,11 @@ export class DeleteCommand {
       await prepareFilter(entity, filter, where);
     }
     const query = Delete(entity.tableName + ' T');
-    if (args.comment) query.comment(args.comment, args.commentDialect);
+    if (args.comment) {
+      if (Array.isArray(args.comment))
+        args.comment.forEach(c => query.comment(c));
+      else query.comment(args.comment as any);
+    }
     if (where) query.where(...where._items);
     // Execute query
     const resp = await connection.execute(query, {

diff --git a/packages/connect/src/orm/commands/find.command.ts b/packages/connect/src/orm/commands/find.command.ts
@@ -337,7 +337,8 @@ export class FindCommand {
       | 'onTransformRow'
       | 'prettyPrint'
       | 'comment'
-      | 'commentDialect'
+      | 'indexHint'
+      | 'noIndexHint'
     >,
   ): Promise<any[]> {
     // Generate select query
@@ -350,7 +351,23 @@ export class FindCommand {
       this.mainEntity.tableName + ' as ' + this.mainAlias,
     );
 
-    if (args.comment) query.comment(args.comment, args.commentDialect);
+    if (args.comment) {
+      if (Array.isArray(args.comment))
+        args.comment.forEach(c => query.comment(c));
+      else query.comment(args.comment as any);
+    }
+
+    if (args.indexHint) {
+      if (Array.isArray(args.indexHint))
+        args.indexHint.forEach(c => query.indexHint(c));
+      else query.indexHint(args.indexHint as any);
+    }
+
+    if (args.noIndexHint) {
+      if (Array.isArray(args.noIndexHint))
+        args.noIndexHint.forEach(c => query.noIndexHint(c));
+      else query.noIndexHint(args.noIndexHint as any);
+    }
 
     if (args.distinct) query.distinct();
 

diff --git a/packages/connect/src/orm/repository.class.ts b/packages/connect/src/orm/repository.class.ts
@@ -32,8 +32,39 @@ export namespace Repository {
   export interface CommandOptions {
     connection?: SqbConnection;
     prettyPrint?: boolean;
-    comment?: string;
-    commentDialect?: string[];
+    comment?:
+      | string
+      | string[]
+      | {
+          comment: string;
+          dialect?: string[];
+        }
+      | {
+          comment: string;
+          dialect?: string[];
+        }[];
+    indexHint?:
+      | string
+      | string[]
+      | {
+          index: string[];
+          dialect?: string[];
+        }
+      | {
+          index: string[];
+          dialect?: string[];
+        }[];
+    noIndexHint?:
+      | string
+      | string[]
+      | {
+          index: string[];
+          dialect?: string[];
+        }
+      | {
+          index: string[];
+          dialect?: string[];
+        }[];
   }
 
   export interface CreateOptions extends CommandOptions, Projection {}

diff --git a/packages/migrator/package.json b/packages/migrator/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@sqb/migrator",
   "description": "Database migrator for SQB",
-  "version": "4.24.1",
+  "version": "4.25.0",
   "author": "Panates",
   "license": "Apache-2.0",
   "scripts": {
@@ -28,9 +28,9 @@
     "tslib": "^2.8.1"
   },
   "peerDependencies": {
-    "@sqb/builder": "^4.24.1",
-    "@sqb/connect": "^4.24.1",
-    "@sqb/postgres": "^4.24.1"
+    "@sqb/builder": "^4.25.0",
+    "@sqb/connect": "^4.25.0",
+    "@sqb/postgres": "^4.25.0"
   },
   "devDependencies": {
     "expect": "^30.3.0",

diff --git a/packages/mssql-dialect/package.json b/packages/mssql-dialect/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@sqb/mssql-dialect",
   "description": "SQB serialization extension for MS-SQL database",
-  "version": "4.24.1",
+  "version": "4.25.0",
   "author": "Panates",
   "license": "Apache-2.0",
   "scripts": {
@@ -24,7 +24,7 @@
     "tslib": "^2.8.1"
   },
   "peerDependencies": {
-    "@sqb/builder": "^4.24.1"
+    "@sqb/builder": "^4.25.0"
   },
   "devDependencies": {
     "expect": "^30.3.0"

diff --git a/packages/nestjs/package.json b/packages/nestjs/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@sqb/nestjs",
   "description": "Nestjs module for data connection using SQB",
-  "version": "4.24.1",
+  "version": "4.25.0",
   "author": "Panates",
   "license": "Apache-2.0",
   "scripts": {
@@ -39,8 +39,8 @@
   "peerDependencies": {
     "@nestjs/common": ">=7.4.0",
     "@nestjs/core": ">=7.4.0",
-    "@sqb/builder": "^4.24.1",
-    "@sqb/connect": "^4.24.1",
+    "@sqb/builder": "^4.25.0",
+    "@sqb/connect": "^4.25.0",
     "reflect-metadata": "^0.2.2",
     "rxjs": ">=6.6.0"
   },