@sqb/connect 4.25.0 → 4.26.1

package/orm/commands/count.command.js

@@ -1,4 +1,4 @@
-import { And, Count, Select } from '@sqb/builder';
+import { And, Count, Select, TableName } from '@sqb/builder';
 import { prepareFilter } from './command.helper.js';
 export class CountCommand {
     // istanbul ignore next
@@ -12,25 +12,17 @@ export class CountCommand {
             where = And();
             await prepareFilter(entity, filter, where, 'T');
         }
-        const query = Select(Count()).from(entity.tableName + ' T');
+        const query = Select(Count()).from(TableName({
+            table: entity.tableName,
+            alias: 'T',
+            optimizerHint: args.optimizerHint,
+        }));
         if (args.comment) {
             if (Array.isArray(args.comment))
                 args.comment.forEach(c => query.comment(c));
             else
                 query.comment(args.comment);
         }
-        if (args.indexHint) {
-            if (Array.isArray(args.indexHint))
-                args.indexHint.forEach(c => query.indexHint(c));
-            else
-                query.indexHint(args.indexHint);
-        }
-        if (args.noIndexHint) {
-            if (Array.isArray(args.noIndexHint))
-                args.noIndexHint.forEach(c => query.noIndexHint(c));
-            else
-                query.noIndexHint(args.noIndexHint);
-        }
         if (where)
             query.where(where);
         // Execute query

package/orm/commands/delete.command.js

@@ -1,4 +1,4 @@
-import { And, Delete } from '@sqb/builder';
+import { And, Delete, TableName } from '@sqb/builder';
 import { prepareFilter } from './command.helper.js';
 export class DeleteCommand {
     // istanbul ignore next
@@ -12,25 +12,17 @@ export class DeleteCommand {
             where = And();
             await prepareFilter(entity, filter, where);
         }
-        const query = Delete(entity.tableName + ' T');
+        const query = Delete(TableName({
+            table: entity.tableName,
+            alias: 'T',
+            optimizerHint: args.optimizerHint,
+        }));
         if (args.comment) {
             if (Array.isArray(args.comment))
                 args.comment.forEach(c => query.comment(c));
             else
                 query.comment(args.comment);
         }
-        if (args.indexHint) {
-            if (Array.isArray(args.indexHint))
-                args.indexHint.forEach(c => query.indexHint(c));
-            else
-                query.indexHint(args.indexHint);
-        }
-        if (args.noIndexHint) {
-            if (Array.isArray(args.noIndexHint))
-                args.noIndexHint.forEach(c => query.noIndexHint(c));
-            else
-                query.noIndexHint(args.noIndexHint);
-        }
         if (where)
             query.where(...where._items);
         // Execute query

package/orm/commands/find.command.d.ts

@@ -38,6 +38,6 @@ export declare class FindCommand {
     private _selectColumn;
     filter(filter: any): Promise<void>;
     sort(sortFields: string[]): Promise<void>;
-    execute(args: Pick<FindCommandArgs, 'connection' | 'distinct' | 'offset' | 'limit' | 'params' | 'onTransformRow' | 'prettyPrint' | 'comment' | 'indexHint' | 'noIndexHint'>): Promise<any[]>;
+    execute(args: Pick<FindCommandArgs, 'connection' | 'distinct' | 'offset' | 'limit' | 'params' | 'onTransformRow' | 'prettyPrint' | 'comment' | 'optimizerHint'>): Promise<any[]>;
     private _getEntityFromAlias;
 }

package/orm/commands/find.command.js

@@ -1,4 +1,4 @@
-import { And, In, Param, Select } from '@sqb/builder';
+import { And, In, Param, Select, TableName } from '@sqb/builder';
 import { AssociationNode } from '../model/association-node.js';
 import { EntityMetadata } from '../model/entity-metadata.js';
 import { isAssociationField, isColumnField, isEmbeddedField, resolveEntityForEmbeddedField, } from '../util/orm.helper.js';
@@ -241,25 +241,17 @@ export class FindCommand {
         const columnSqls = Object.keys(this._selectColumns).map(x => this._selectColumns[x].statement);
         if (!columnSqls.length)
             columnSqls.push('1');
-        const query = Select(...columnSqls).from(this.mainEntity.tableName + ' as ' + this.mainAlias);
+        const query = Select(...columnSqls).from(TableName({
+            table: this.mainEntity.tableName,
+            alias: this.mainAlias,
+            optimizerHint: args.optimizerHint,
+        }));
         if (args.comment) {
             if (Array.isArray(args.comment))
                 args.comment.forEach(c => query.comment(c));
             else
                 query.comment(args.comment);
         }
-        if (args.indexHint) {
-            if (Array.isArray(args.indexHint))
-                args.indexHint.forEach(c => query.indexHint(c));
-            else
-                query.indexHint(args.indexHint);
-        }
-        if (args.noIndexHint) {
-            if (Array.isArray(args.noIndexHint))
-                args.noIndexHint.forEach(c => query.noIndexHint(c));
-            else
-                query.noIndexHint(args.noIndexHint);
-        }
         if (args.distinct)
             query.distinct();
         query.where(...this._filter._items);

package/orm/commands/update.command.js

@@ -1,4 +1,4 @@
-import { And, Param, Update } from '@sqb/builder';
+import { And, Param, TableName, Update } from '@sqb/builder';
 import { checkEnumValue, isColumnField, isEmbeddedField, resolveEntityForEmbeddedField, } from '../util/orm.helper.js';
 import { prepareFilter } from './command.helper.js';
 export class UpdateCommand {
@@ -25,25 +25,17 @@ export class UpdateCommand {
             return 0;
         if (args.filter)
             await this._prepareFilter(ctx, args.filter);
-        const query = Update(tableName + ' as T', ctx.queryValues).where(...ctx.queryFilter);
+        const query = Update(TableName({
+            table: tableName,
+            alias: 'T',
+            optimizerHint: args.optimizerHint,
+        }), ctx.queryValues).where(...ctx.queryFilter);
         if (args.comment) {
             if (Array.isArray(args.comment))
                 args.comment.forEach(c => query.comment(c));
             else
                 query.comment(args.comment);
         }
-        if (args.indexHint) {
-            if (Array.isArray(args.indexHint))
-                args.indexHint.forEach(c => query.indexHint(c));
-            else
-                query.indexHint(args.indexHint);
-        }
-        if (args.noIndexHint) {
-            if (Array.isArray(args.noIndexHint))
-                args.noIndexHint.forEach(c => query.noIndexHint(c));
-            else
-                query.noIndexHint(args.noIndexHint);
-        }
         const qr = await args.connection.execute(query, {
             params: args.params ? [...args.params, ctx.queryParams] : ctx.queryParams,
             objectRows: false,

package/orm/repository.class.d.ts

@@ -1,4 +1,5 @@
 import { LogicalOperator } from '@sqb/builder';
+import { OptimizerHintArgs } from '@sqb/builder/build/sql-objects/table-name';
 import { PartialDTO, PatchDTO, RequiredSome, StrictOmit, Type } from 'ts-gems';
 import { FieldInfoMap } from '../client/field-info-map.js';
 import type { SqbClient } from '../client/sqb-client.js';
@@ -24,20 +25,7 @@ export declare namespace Repository {
             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[];
-        }[];
+        optimizerHint?: string | string[] | OptimizerHintArgs | OptimizerHintArgs[];
     }
     interface CreateOptions extends CommandOptions, Projection {
     }

package/package.json

@@ -1,27 +1,27 @@
 {
   "name": "@sqb/connect",
   "description": "Multi-dialect database connection framework written with TypeScript",
-  "version": "4.25.0",
+  "version": "4.26.1",
   "author": "Panates",
   "license": "Apache-2.0",
   "dependencies": {
-    "@jsopen/objects": "^2.2.0",
+    "@jsopen/objects": "^2.2.1",
     "debug": "^4.4.3",
     "doublylinked": "^2.5.6",
     "fast-tokenizer": "^1.9.0",
     "lightning-pool": "^4.12.0",
-    "lodash": "^4.17.23",
-    "power-tasks": "^1.11.1",
+    "lodash": "^4.18.1",
+    "power-tasks": "^1.14.2",
     "putil-isplainobject": "^1.1.5",
     "putil-merge": "^3.13.0",
     "putil-promisify": "^1.10.1",
     "putil-varhelpers": "^1.7.0",
     "strict-typed-events": "^2.8.0",
-    "ts-gems": "^3.11.3",
+    "ts-gems": "^3.11.6",
     "tslib": "^2.8.1"
   },
   "peerDependencies": {
-    "@sqb/builder": "^4.25.0",
+    "@sqb/builder": "^4.26.1",
     "reflect-metadata": "^0.2.2"
   },
   "type": "module",