drizzle-orm 0.10.45 → 0.11.0

package/builders/index.js

@@ -1,9 +1,19 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isNotNull = exports.raw = exports.lessEq = exports.less = exports.greaterEq = exports.greater = exports.like = exports.or = exports.and = exports.in = exports.eq = exports.combine = exports.set = exports.Update = exports.Select = exports.Insert = exports.Delete = exports.Create = exports.SelectResponseJoin = exports.SelectResponseTwoJoins = exports.SelectTRBWithTwoJoins = exports.SelectTRBWithJoin = exports.Join = exports.JoinWith = exports.to = exports.UpdateTRB = exports.SelectTRB = exports.InsertTRB = exports.DeleteTRB = void 0;
+exports.isNotNull = exports.raw = exports.lessEq = exports.less = exports.greaterEq = exports.greater = exports.like = exports.or = exports.and = exports.in = exports.eq = exports.combine = exports.set = exports.Update = exports.Select = exports.Insert = exports.Delete = exports.Create = exports.SelectResponseJoin = exports.SelectResponseTwoJoins = exports.SelectTRBWithTwoJoins = exports.SelectTRBWithJoin = exports.Join = exports.JoinWith = exports.to = exports.JoinBuilderResponses = exports.UpdateTRB = exports.SelectTRB = exports.InsertTRB = exports.DeleteTRB = void 0;
 /* eslint-disable import/no-cycle */
 var deleteRequestBuilder_1 = require("./highLvlBuilders/deleteRequestBuilder");
 Object.defineProperty(exports, "DeleteTRB", { enumerable: true, get: function () { return __importDefault(deleteRequestBuilder_1).default; } });
@@ -13,6 +23,10 @@ var selectRequestBuilder_1 = require("./highLvlBuilders/selectRequestBuilder");
 Object.defineProperty(exports, "SelectTRB", { enumerable: true, get: function () { return __importDefault(selectRequestBuilder_1).default; } });
 var updateRequestBuilder_1 = require("./highLvlBuilders/updateRequestBuilder");
 Object.defineProperty(exports, "UpdateTRB", { enumerable: true, get: function () { return __importDefault(updateRequestBuilder_1).default; } });
+__exportStar(require("./highLvlBuilders/joins/selectJoinBuilder"), exports);
+var joinBuilderResponse_1 = require("./highLvlBuilders/joins/joinBuilderResponse");
+Object.defineProperty(exports, "JoinBuilderResponses", { enumerable: true, get: function () { return __importDefault(joinBuilderResponse_1).default; } });
+__exportStar(require("./highLvlBuilders/joins/proxies/joinProxies"), exports);
 var static_1 = require("./joinBuilders/static");
 Object.defineProperty(exports, "to", { enumerable: true, get: function () { return __importDefault(static_1).default; } });
 var joinWith_1 = require("./joinBuilders/joinWith");

package/builders/joinBuilders/builders/abstractJoinBuilder.d.ts

@@ -1,4 +1,4 @@
-import BaseLogger from 'orm/src/logger/abstractLogger';
+import BaseLogger from '@/logger/abstractLogger';
 import { QueryResult } from 'pg';
 import { AbstractColumn } from '../../../columns/column';
 import ColumnType from '../../../columns/types/columnType';

package/builders/joinBuilders/builders/selectWithFiveJoins.d.ts

@@ -1,4 +1,4 @@
-import BaseLogger from 'orm/src/logger/abstractLogger';
+import BaseLogger from '@/logger/abstractLogger';
 import { QueryResult } from 'pg';
 import { AbstractColumn } from '../../../columns/column';
 import ColumnType from '../../../columns/types/columnType';

package/builders/joinBuilders/builders/selectWithFourJoins.d.ts

@@ -1,4 +1,4 @@
-import BaseLogger from 'orm/src/logger/abstractLogger';
+import BaseLogger from '@/logger/abstractLogger';
 import { QueryResult } from 'pg';
 import { AbstractColumn } from '../../../columns/column';
 import ColumnType from '../../../columns/types/columnType';

package/builders/joinBuilders/builders/selectWithJoin.d.ts

@@ -1,4 +1,4 @@
-import BaseLogger from 'orm/src/logger/abstractLogger';
+import BaseLogger from '@/logger/abstractLogger';
 import { QueryResult } from 'pg';
 import { AbstractColumn } from '../../../columns/column';
 import ColumnType from '../../../columns/types/columnType';

package/builders/joinBuilders/builders/selectWithThreeJoins.d.ts

@@ -1,4 +1,4 @@
-import BaseLogger from 'orm/src/logger/abstractLogger';
+import BaseLogger from '@/logger/abstractLogger';
 import { QueryResult } from 'pg';
 import { AbstractColumn } from '../../../columns/column';
 import ColumnType from '../../../columns/types/columnType';

package/builders/joinBuilders/builders/selectWithTwoJoins.d.ts

@@ -1,4 +1,4 @@
-import BaseLogger from 'orm/src/logger/abstractLogger';
+import BaseLogger from '@/logger/abstractLogger';
 import { QueryResult } from 'pg';
 import { AbstractColumn } from '../../../columns/column';
 import ColumnType from '../../../columns/types/columnType';

package/builders/lowLvlBuilders/selects/selectFrom.d.ts

@@ -1,3 +1,5 @@
+import { JoinType } from '@/builders/highLvlBuilders/joins/selectJoinBuilder';
+import AbstractTable from '@/tables/abstractTable';
 import { AbstractColumn } from '../../../columns/column';
 import ColumnType from '../../../columns/types/columnType';
 import SelectAggregator from '../../aggregators/selectAggregator';
@@ -16,6 +18,7 @@ export default class SelectFrom {
         } | undefined;
         id?: number | undefined;
     }[]) => SelectJoined;
+    joined2: (joins: Array<JoinType<AbstractTable<any>>>) => SelectJoined;
     limit: (limit?: number | undefined) => SelectFrom;
     offset: (offset?: number | undefined) => SelectFrom;
     orderBy: (orderBy?: AbstractColumn<ColumnType<{}>, boolean, boolean, any> | undefined, order?: Order | undefined) => SelectFrom;

package/builders/lowLvlBuilders/selects/selectFrom.js

@@ -8,6 +8,7 @@ const whereSelect_1 = __importDefault(require("./whereSelect"));
 class SelectFrom {
     constructor(aggregator) {
         this.joined = (joins) => new selectJoined_1.default(this._aggregator).apply(joins);
+        this.joined2 = (joins) => new selectJoined_1.default(this._aggregator).apply2(joins);
         this.limit = (limit) => {
             this._aggregator.limit(limit);
             return this;

package/builders/lowLvlBuilders/selects/selectJoined.d.ts

@@ -1,3 +1,5 @@
+import { JoinType } from '@/builders/highLvlBuilders/joins/selectJoinBuilder';
+import AbstractTable from '@/tables/abstractTable';
 import { AbstractColumn } from '../../../columns/column';
 import ColumnType from '../../../columns/types/columnType';
 import SelectAggregator from '../../aggregators/selectAggregator';
@@ -15,6 +17,7 @@ export default class SelectJoined {
         } | undefined;
         id?: number | undefined;
     }[]) => SelectJoined;
+    apply2: (joins: Array<JoinType<AbstractTable<any>>>) => SelectJoined;
     limit: (limit?: number | undefined) => SelectJoined;
     offset: (offset?: number | undefined) => SelectJoined;
     orderBy: (orderBy?: AbstractColumn<ColumnType<{}>, boolean, boolean, any> | undefined, order?: Order | undefined) => SelectJoined;

package/builders/lowLvlBuilders/selects/selectJoined.js

@@ -10,6 +10,10 @@ class SelectJoined {
             this._aggregator.join(joins);
             return this;
         };
+        this.apply2 = (joins) => {
+            this._aggregator.join2(joins);
+            return this;
+        };
         this.limit = (limit) => {
             this._aggregator.limit(limit);
             return this;

package/builders/requestBuilders/where/and.d.ts

@@ -3,11 +3,8 @@ import { ISession } from '../../../db/session';
 export default class And extends Expr {
     private expressions;
     constructor(expressions: Expr[]);
-    toQuery: ({ position, tableCache, session, }: {
+    toQuery: ({ position, session, }: {
         position?: number | undefined;
-        tableCache?: {
-            [tableName: string]: string;
-        } | undefined;
         session: ISession;
     }) => {
         query: string;

package/builders/requestBuilders/where/and.js

@@ -8,13 +8,13 @@ const where_1 = __importDefault(require("./where"));
 class And extends where_1.default {
     constructor(expressions) {
         super();
-        this.toQuery = ({ position, tableCache, session, }) => {
+        this.toQuery = ({ position, session, }) => {
             let nextPosition = position || 1;
             const result = ['('];
             const valuesResult = [];
             for (let i = 0; i < this.expressions.length; i += 1) {
                 const expression = this.expressions[i];
-                const expressionResult = expression.toQuery({ position: nextPosition, tableCache, session });
+                const expressionResult = expression.toQuery({ position: nextPosition, session });
                 valuesResult.push(...expressionResult.values);
                 result.push(expressionResult.query);
                 nextPosition += expressionResult.values.length;

package/builders/requestBuilders/where/const.d.ts

@@ -3,11 +3,8 @@ import Expr from './where';
 export default class Const extends Expr {
     private value;
     constructor(value: any);
-    toQuery: ({ position, tableCache, session, }: {
+    toQuery: ({ position, session, }: {
         position?: number | undefined;
-        tableCache?: {
-            [tableName: string]: string;
-        } | undefined;
         session: ISession;
     }) => {
         query: string;

package/builders/requestBuilders/where/const.js

@@ -8,7 +8,7 @@ const where_1 = __importDefault(require("./where"));
 class Const extends where_1.default {
     constructor(value) {
         super();
-        this.toQuery = ({ position, tableCache, session, }) => {
+        this.toQuery = ({ position, session, }) => {
             const nextPosition = position || 1;
             if (this.value instanceof Date) {
                 return { query: session.parametrized(nextPosition), values: [`${this.value.toISOString()}`] };

package/builders/requestBuilders/where/constArray.d.ts

@@ -3,11 +3,8 @@ import { ISession } from '../../../db/session';
 export default class ConstArray extends Expr {
     private values;
     constructor(values: Array<any>);
-    toQuery: ({ position, tableCache, session, }: {
+    toQuery: ({ position, session, }: {
         position?: number | undefined;
-        tableCache?: {
-            [tableName: string]: string;
-        } | undefined;
         session: ISession;
     }) => {
         query: string;

package/builders/requestBuilders/where/constArray.js

@@ -8,7 +8,7 @@ const where_1 = __importDefault(require("./where"));
 class ConstArray extends where_1.default {
     constructor(values) {
         super();
-        this.toQuery = ({ position, tableCache, session, }) => {
+        this.toQuery = ({ position, session, }) => {
             let nextPosition = position || 1;
             const finalArray = [];
             const finalValues = [];

package/builders/requestBuilders/where/eqWhere.d.ts

@@ -4,7 +4,7 @@ export default class EqWhere extends Expr {
     private left;
     private right;
     constructor(left: Expr, right: Expr);
-    toQuery: ({ position, tableCache, session, }: {
+    toQuery: ({ position, session, }: {
         position?: number | undefined;
         tableCache?: {
             [tableName: string]: string;

package/builders/requestBuilders/where/eqWhere.js

@@ -8,9 +8,9 @@ const where_1 = __importDefault(require("./where"));
 class EqWhere extends where_1.default {
     constructor(left, right) {
         super();
-        this.toQuery = ({ position, tableCache, session, }) => {
-            const rightPreparedValues = this.right.toQuery({ position, tableCache, session });
-            const leftPreparedValues = this.left.toQuery({ position, tableCache, session });
+        this.toQuery = ({ position, session, }) => {
+            const rightPreparedValues = this.right.toQuery({ position, session });
+            const leftPreparedValues = this.left.toQuery({ position, session });
             return { query: `${leftPreparedValues.query}=${rightPreparedValues.query}`, values: [...leftPreparedValues.values, ...rightPreparedValues.values] };
         };
         this.left = left;

package/builders/requestBuilders/where/greater.d.ts

@@ -7,11 +7,8 @@ export default class Greater extends Expr {
         left: Expr;
         right: Expr;
     });
-    toQuery: ({ position, tableCache, session, }: {
+    toQuery: ({ position, session, }: {
         position?: number | undefined;
-        tableCache?: {
-            [tableName: string]: string;
-        } | undefined;
         session: ISession;
     }) => {
         query: string;

package/builders/requestBuilders/where/greater.js

@@ -8,9 +8,9 @@ const where_1 = __importDefault(require("./where"));
 class Greater extends where_1.default {
     constructor({ left, right }) {
         super();
-        this.toQuery = ({ position, tableCache, session, }) => {
-            const rightPreparedValues = this.right.toQuery({ position, tableCache, session });
-            const leftPreparedValues = this.left.toQuery({ position, tableCache, session });
+        this.toQuery = ({ position, session, }) => {
+            const rightPreparedValues = this.right.toQuery({ position, session });
+            const leftPreparedValues = this.left.toQuery({ position, session });
             return { query: `${leftPreparedValues.query} > ${rightPreparedValues.query}`, values: [...leftPreparedValues.values, ...rightPreparedValues.values] };
         };
         this.left = left;

package/builders/requestBuilders/where/greaterEq.d.ts

@@ -7,11 +7,8 @@ export default class GreaterEq extends Expr {
         left: Expr;
         right: Expr;
     });
-    toQuery: ({ position, tableCache, session, }: {
+    toQuery: ({ position, session, }: {
         position?: number | undefined;
-        tableCache?: {
-            [tableName: string]: string;
-        } | undefined;
         session: ISession;
     }) => {
         query: string;

package/builders/requestBuilders/where/greaterEq.js

@@ -8,9 +8,9 @@ const where_1 = __importDefault(require("./where"));
 class GreaterEq extends where_1.default {
     constructor({ left, right }) {
         super();
-        this.toQuery = ({ position, tableCache, session, }) => {
-            const rightPreparedValues = this.right.toQuery({ position, tableCache, session });
-            const leftPreparedValues = this.left.toQuery({ position, tableCache, session });
+        this.toQuery = ({ position, session, }) => {
+            const rightPreparedValues = this.right.toQuery({ position, session });
+            const leftPreparedValues = this.left.toQuery({ position, session });
             return { query: `${leftPreparedValues.query} >= ${rightPreparedValues.query}`, values: [...leftPreparedValues.values, ...rightPreparedValues.values] };
         };
         this.left = left;

package/builders/requestBuilders/where/in.d.ts

@@ -4,11 +4,8 @@ export default class In extends Expr {
     private left;
     private right;
     constructor(left: Expr, right: Expr);
-    toQuery: ({ position, tableCache, session, }: {
+    toQuery: ({ position, session, }: {
         position?: number | undefined;
-        tableCache?: {
-            [tableName: string]: string;
-        } | undefined;
         session: ISession;
     }) => {
         query: string;

package/builders/requestBuilders/where/in.js

@@ -8,9 +8,9 @@ const where_1 = __importDefault(require("./where"));
 class In extends where_1.default {
     constructor(left, right) {
         super();
-        this.toQuery = ({ position, tableCache, session, }) => {
-            const rightPreparedValues = this.right.toQuery({ position, tableCache, session });
-            const leftPreparedValues = this.left.toQuery({ position, tableCache, session });
+        this.toQuery = ({ position, session, }) => {
+            const rightPreparedValues = this.right.toQuery({ position, session });
+            const leftPreparedValues = this.left.toQuery({ position, session });
             return { query: `${leftPreparedValues.query} in (${rightPreparedValues.query})`, values: [...leftPreparedValues.values, ...rightPreparedValues.values] };
         };
         this.left = left;

package/builders/requestBuilders/where/isNotNull.d.ts

@@ -3,11 +3,8 @@ import { ISession } from '../../../db/session';
 export default class IsNotNull extends Expr {
     private left;
     constructor(left: Expr);
-    toQuery: ({ position, tableCache, session, }: {
+    toQuery: ({ position, session, }: {
         position?: number | undefined;
-        tableCache?: {
-            [tableName: string]: string;
-        } | undefined;
         session: ISession;
     }) => {
         query: string;

package/builders/requestBuilders/where/isNotNull.js

@@ -8,8 +8,8 @@ const where_1 = __importDefault(require("./where"));
 class IsNotNull extends where_1.default {
     constructor(left) {
         super();
-        this.toQuery = ({ position, tableCache, session, }) => {
-            const leftPreparedValues = this.left.toQuery({ position, tableCache, session });
+        this.toQuery = ({ position, session, }) => {
+            const leftPreparedValues = this.left.toQuery({ position, session });
             return { query: `${leftPreparedValues.query} is not null`, values: leftPreparedValues.values };
         };
         this.left = left;

package/builders/requestBuilders/where/isNull.d.ts

@@ -3,11 +3,8 @@ import { ISession } from '../../../db/session';
 export default class IsNull extends Expr {
     private left;
     constructor(left: Expr);
-    toQuery: ({ position, tableCache, session, }: {
+    toQuery: ({ position, session, }: {
         position?: number | undefined;
-        tableCache?: {
-            [tableName: string]: string;
-        } | undefined;
         session: ISession;
     }) => {
         query: string;

package/builders/requestBuilders/where/isNull.js

@@ -8,8 +8,8 @@ const where_1 = __importDefault(require("./where"));
 class IsNull extends where_1.default {
     constructor(left) {
         super();
-        this.toQuery = ({ position, tableCache, session, }) => {
-            const leftPreparedValues = this.left.toQuery({ position, tableCache, session });
+        this.toQuery = ({ position, session, }) => {
+            const leftPreparedValues = this.left.toQuery({ position, session });
             return { query: `${leftPreparedValues.query} is null`, values: leftPreparedValues.values };
         };
         this.left = left;

package/builders/requestBuilders/where/less.d.ts

@@ -7,11 +7,8 @@ export default class Less extends Expr {
         left: Expr;
         right: Expr;
     });
-    toQuery: ({ position, tableCache, session, }: {
+    toQuery: ({ position, session, }: {
         position?: number | undefined;
-        tableCache?: {
-            [tableName: string]: string;
-        } | undefined;
         session: ISession;
     }) => {
         query: string;

package/builders/requestBuilders/where/less.js

@@ -8,9 +8,9 @@ const where_1 = __importDefault(require("./where"));
 class Less extends where_1.default {
     constructor({ left, right }) {
         super();
-        this.toQuery = ({ position, tableCache, session, }) => {
-            const rightPreparedValues = this.right.toQuery({ position, tableCache, session });
-            const leftPreparedValues = this.left.toQuery({ position, tableCache, session });
+        this.toQuery = ({ position, session, }) => {
+            const rightPreparedValues = this.right.toQuery({ position, session });
+            const leftPreparedValues = this.left.toQuery({ position, session });
             return { query: `${leftPreparedValues.query} < ${rightPreparedValues.query}`, values: [...leftPreparedValues.values, ...rightPreparedValues.values] };
         };
         this.left = left;

package/builders/requestBuilders/where/lessEq.d.ts

@@ -7,11 +7,8 @@ export default class LessEq extends Expr {
         left: Expr;
         right: Expr;
     });
-    toQuery: ({ position, tableCache, session, }: {
+    toQuery: ({ position, session, }: {
         position?: number | undefined;
-        tableCache?: {
-            [tableName: string]: string;
-        } | undefined;
         session: ISession;
     }) => {
         query: string;

package/builders/requestBuilders/where/lessEq.js

@@ -8,9 +8,9 @@ const where_1 = __importDefault(require("./where"));
 class LessEq extends where_1.default {
     constructor({ left, right }) {
         super();
-        this.toQuery = ({ position, tableCache, session, }) => {
-            const rightPreparedValues = this.right.toQuery({ position, tableCache, session });
-            const leftPreparedValues = this.left.toQuery({ position, tableCache, session });
+        this.toQuery = ({ position, session, }) => {
+            const rightPreparedValues = this.right.toQuery({ position, session });
+            const leftPreparedValues = this.left.toQuery({ position, session });
             return { query: `${leftPreparedValues.query} <= ${rightPreparedValues.query}`, values: [...leftPreparedValues.values, ...rightPreparedValues.values] };
         };
         this.left = left;

package/builders/requestBuilders/where/like.d.ts

@@ -4,11 +4,8 @@ export default class Like extends Expr {
     private left;
     private right;
     constructor(left: Expr, right: Expr);
-    toQuery: ({ position, tableCache, session, }: {
+    toQuery: ({ position, session, }: {
         position?: number | undefined;
-        tableCache?: {
-            [tableName: string]: string;
-        } | undefined;
         session: ISession;
     }) => {
         query: string;

package/builders/requestBuilders/where/like.js

@@ -8,9 +8,9 @@ const where_1 = __importDefault(require("./where"));
 class Like extends where_1.default {
     constructor(left, right) {
         super();
-        this.toQuery = ({ position, tableCache, session, }) => {
-            const rightPreparedValues = this.right.toQuery({ position, tableCache, session });
-            const leftPreparedValues = this.left.toQuery({ position, tableCache, session });
+        this.toQuery = ({ position, session, }) => {
+            const rightPreparedValues = this.right.toQuery({ position, session });
+            const leftPreparedValues = this.left.toQuery({ position, session });
             return { query: `${leftPreparedValues.query} like ${rightPreparedValues.query}`, values: [...leftPreparedValues.values, ...rightPreparedValues.values] };
         };
         this.left = left;

package/builders/requestBuilders/where/notEqWhere.d.ts

@@ -4,11 +4,8 @@ export default class NotEqWhere extends Expr {
     private left;
     private right;
     constructor(left: Expr, right: Expr);
-    toQuery: ({ position, tableCache, session, }: {
+    toQuery: ({ position, session, }: {
         position?: number | undefined;
-        tableCache?: {
-            [tableName: string]: string;
-        } | undefined;
         session: ISession;
     }) => {
         query: string;

package/builders/requestBuilders/where/notEqWhere.js

@@ -8,9 +8,9 @@ const where_1 = __importDefault(require("./where"));
 class NotEqWhere extends where_1.default {
     constructor(left, right) {
         super();
-        this.toQuery = ({ position, tableCache, session, }) => {
-            const rightPreparedValues = this.right.toQuery({ position, tableCache, session });
-            const leftPreparedValues = this.left.toQuery({ position, tableCache, session });
+        this.toQuery = ({ position, session, }) => {
+            const rightPreparedValues = this.right.toQuery({ position, session });
+            const leftPreparedValues = this.left.toQuery({ position, session });
             return { query: `${leftPreparedValues.query}!=${rightPreparedValues.query}`, values: [...leftPreparedValues.values, ...rightPreparedValues.values] };
         };
         this.left = left;

package/builders/requestBuilders/where/or.d.ts

@@ -3,11 +3,8 @@ import { ISession } from '../../../db/session';
 export default class Or extends Expr {
     private expressions;
     constructor(expressions: Expr[]);
-    toQuery: ({ position, tableCache, session, }: {
+    toQuery: ({ position, session, }: {
         position?: number | undefined;
-        tableCache?: {
-            [tableName: string]: string;
-        } | undefined;
         session: ISession;
     }) => {
         query: string;

package/builders/requestBuilders/where/or.js

@@ -8,13 +8,13 @@ const where_1 = __importDefault(require("./where"));
 class Or extends where_1.default {
     constructor(expressions) {
         super();
-        this.toQuery = ({ position, tableCache, session, }) => {
+        this.toQuery = ({ position, session, }) => {
             let nextPosition = position || 1;
             const result = ['('];
             const valuesResult = [];
             for (let i = 0; i < this.expressions.length; i += 1) {
                 const expression = this.expressions[i];
-                const expressionResult = expression.toQuery({ position: nextPosition, tableCache, session });
+                const expressionResult = expression.toQuery({ position: nextPosition, session });
                 valuesResult.push(...expressionResult.values);
                 result.push(expressionResult.query);
                 nextPosition += expressionResult.values.length;

package/builders/requestBuilders/where/rawWhere.d.ts

@@ -3,11 +3,8 @@ import { ISession } from '../../../db/session';
 export default class RawWhere extends Expr {
     private custom;
     constructor(custom: string);
-    toQuery: ({ position, tableCache, session, }: {
+    toQuery: ({ position, session, }: {
         position?: number | undefined;
-        tableCache?: {
-            [tableName: string]: string;
-        } | undefined;
         session: ISession;
     }) => {
         query: string;

package/builders/requestBuilders/where/rawWhere.js

@@ -9,7 +9,7 @@ class RawWhere extends where_1.default {
     constructor(custom) {
         super();
         this.custom = custom;
-        this.toQuery = ({ position, tableCache, session, }) => ({ query: this.custom, values: [] });
+        this.toQuery = ({ position, session, }) => ({ query: this.custom, values: [] });
     }
 }
 exports.default = RawWhere;

package/builders/requestBuilders/where/static.d.ts

@@ -2,6 +2,7 @@ import { AbstractColumn } from '../../../columns/column';
 import ColumnType from '../../../columns/types/columnType';
 import { ExtractCodeType } from '../../../tables/inferTypes';
 import Expr from './where';
+export declare const onEq: <T extends AbstractColumn<ColumnType<any>, boolean, boolean, any>, T1 extends AbstractColumn<ColumnType<any>, boolean, boolean, any>>(left: T, right: T1) => Expr;
 export declare const eq: <T extends AbstractColumn<ColumnType<any>, boolean, boolean, any>>(left: T, value: ExtractCodeType<T>) => Expr;
 export declare const raw: (customQuery: string) => Expr;
 export declare const and: (expressions: Expr[]) => Expr;

package/builders/requestBuilders/where/static.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.notEq = exports.isNotNull = exports.isNull = exports.lessEq = exports.greaterEq = exports.less = exports.greater = exports.inArray = exports.like = exports.or = exports.and = exports.raw = exports.eq = void 0;
+exports.notEq = exports.isNotNull = exports.isNull = exports.lessEq = exports.greaterEq = exports.less = exports.greater = exports.inArray = exports.like = exports.or = exports.and = exports.raw = exports.eq = exports.onEq = void 0;
 const and_1 = __importDefault(require("./and"));
 const const_1 = __importDefault(require("./const"));
 const constArray_1 = __importDefault(require("./constArray"));
@@ -20,6 +20,8 @@ const notEqWhere_1 = __importDefault(require("./notEqWhere"));
 const or_1 = __importDefault(require("./or"));
 const rawWhere_1 = __importDefault(require("./rawWhere"));
 const var_1 = __importDefault(require("./var"));
+const onEq = (left, right) => new eqWhere_1.default(new var_1.default(left), new var_1.default(right));
+exports.onEq = onEq;
 // eslint-disable-next-line max-len
 const eq = (left, value) => new eqWhere_1.default(new var_1.default(left), new const_1.default(value));
 exports.eq = eq;

package/builders/requestBuilders/where/var.d.ts

@@ -5,11 +5,8 @@ import { ISession } from '../../../db/session';
 export default class Var<T extends AbstractColumn<ColumnType<any>, boolean, boolean>> extends Expr {
     private column;
     constructor(column: T);
-    toQuery: ({ position, tableCache, session, }: {
+    toQuery: ({ position, session, }: {
         position?: number | undefined;
-        tableCache?: {
-            [tableName: string]: string;
-        } | undefined;
         session: ISession;
     }) => {
         query: string;

package/builders/requestBuilders/where/var.js

@@ -8,8 +8,8 @@ const where_1 = __importDefault(require("./where"));
 class Var extends where_1.default {
     constructor(column) {
         super();
-        this.toQuery = ({ position, tableCache, session, }) => {
-            const tableName = tableCache && tableCache[this.column.getParentName()] ? tableCache[this.column.getParentName()] : this.column.getParentName();
+        this.toQuery = ({ position, session, }) => {
+            const tableName = this.column.getParentName();
             return { query: `${tableName}.${ecranate_1.ecranate(this.column.getColumnName())}`, values: [] };
         };
         this.column = column;

package/builders/requestBuilders/where/where.d.ts

@@ -1,10 +1,7 @@
 import { ISession } from '../../../db/session';
 export default abstract class Expr {
-    abstract toQuery({ position, tableCache, session, }: {
+    abstract toQuery({ position, session, }: {
         position?: number;
-        tableCache?: {
-            [tableName: string]: string;
-        };
         session: ISession;
     }): {
         query: string;

package/db/dbConnector.js

@@ -17,10 +17,10 @@ class DbConnector {
         this.connect = async () => {
             try {
                 const pool = new pg_1.Pool(this.__config);
-                await pool.connect();
+                const connection = await pool.connect();
                 // console.log('Db connected!');
                 // check if table structure is the same as in code
-                return new db_1.default(new session_1.default(pool));
+                return new db_1.default(new session_1.default(pool, connection));
             }
             catch (e) {
                 // console.log(`Connection error: ${e.message}`);