drizzle-orm 0.10.39 → 0.10.42

package/builders/aggregators/deleteAggregator.js

@@ -13,7 +13,7 @@ class DeleteAggregator extends abstractAggregator_1.default {
         this._delete = ['DELETE'];
         this.filters = (filters) => {
             if (filters) {
-                const filterQuery = filters.toQuery();
+                const filterQuery = filters.toQuery({ session: this._table.db.session() });
                 this._filters.push('WHERE ');
                 this._filters.push(filterQuery.query);
                 this._values = filterQuery.values;

package/builders/aggregators/insertAggregator.js

@@ -43,7 +43,7 @@ class InsertAggregator extends abstractAggregator_1.default {
                     if (isKeyExistsInValue) {
                         if (valueToInsert !== undefined && valueToInsert !== null) {
                             position += 1;
-                            this._query.push(`$${position}`);
+                            this._query.push(this._table.db.session().parametrized(position));
                             this._values.push(column.getColumnType().insertStrategy(valueToInsert));
                         }
                         else {
@@ -73,7 +73,10 @@ class InsertAggregator extends abstractAggregator_1.default {
                 if (updates) {
                     const currentPointerPosition = this._values.length > 0
                         ? this._values.length + 1 : undefined;
-                    const updatesQuery = updates.toQuery(currentPointerPosition);
+                    const updatesQuery = updates.toQuery({
+                        position: currentPointerPosition,
+                        session: this._table.db.session(),
+                    });
                     this._onConflict.push('DO UPDATE\n');
                     this._onConflict.push(`SET ${updatesQuery.query}`);
                     this._values.push(...updatesQuery.values);

package/builders/aggregators/selectAggregator.js

@@ -24,7 +24,7 @@ class SelectAggregator extends abstractAggregator_1.default {
         this._joinCache = {};
         this.filters = (filters) => {
             if (filters) {
-                const queryBuilder = filters.toQuery(1, this._joinCache);
+                const queryBuilder = filters.toQuery({ position: 1, tableCache: this._joinCache, session: this._table.db.session() });
                 this._filters.push('WHERE ');
                 this._filters.push(queryBuilder.query);
                 this._values = queryBuilder.values;

package/builders/aggregators/updateAggregator.js

@@ -15,7 +15,10 @@ class UpdateAggregator extends abstractAggregator_1.default {
         this.where = (filters) => {
             if (filters) {
                 const currentPointerPosition = this._values.length > 0 ? this._values.length + 1 : undefined;
-                const filterQuery = filters.toQuery(currentPointerPosition);
+                const filterQuery = filters.toQuery({
+                    position: currentPointerPosition,
+                    session: this._table.db.session(),
+                });
                 this._filters.push('WHERE ');
                 this._filters.push(filterQuery.query);
                 this._values.push(...filterQuery.values);
@@ -28,7 +31,7 @@ class UpdateAggregator extends abstractAggregator_1.default {
             return this;
         };
         this.set = (updates) => {
-            const setQuery = updates.toQuery();
+            const setQuery = updates.toQuery({ session: this._table.db.session() });
             this._updates.push(`\nSET ${setQuery.query}`);
             this._values.push(...setQuery.values);
             return this;

package/builders/highLvlBuilders/deleteRequestBuilder.js

@@ -48,7 +48,7 @@ class DeleteTRB extends abstractRequestBuilder_1.default {
                 values = builderResult.values;
             }
             catch (e) {
-                throw new builderError_1.default(builderError_1.BuilderType.DELETE, this._table.tableName(), this._columns, e, this._filter);
+                throw new builderError_1.default(builderError_1.BuilderType.DELETE, this._table.tableName(), this._columns, e, this._session, this._filter);
             }
             if (this._logger) {
                 this._logger.info(`Deleting from ${this._table.tableName()} using query:\n ${query}`);

package/builders/highLvlBuilders/insertRequestBuilder.js

@@ -59,7 +59,7 @@ class InsertTRB extends abstractRequestBuilder_1.default {
                 values = builderResult.values;
             }
             catch (e) {
-                throw new builderError_1.default(builderError_1.BuilderType.INSERT, this._table.tableName(), this._columns, e);
+                throw new builderError_1.default(builderError_1.BuilderType.INSERT, this._table.tableName(), this._columns, e, this._session);
             }
             if (this._logger) {
                 this._logger.info(`Inserting to ${this._table.tableName()} using query:\n ${query}\n${values}`);

package/builders/highLvlBuilders/selectRequestBuilder.js

@@ -68,10 +68,11 @@ class SelectTRB extends abstractRequestBuilder_1.default {
                 values = builderResult.values;
             }
             catch (e) {
-                throw new builderError_1.default(builderError_1.BuilderType.SELECT, this._table.tableName(), this._columns, e, this._filter);
+                throw new builderError_1.default(builderError_1.BuilderType.SELECT, this._table.tableName(), this._columns, e, this._session, this._filter);
             }
             if (this._logger) {
                 this._logger.info(`Selecting from ${this._table.tableName()} using query:\n ${query}`);
+                this._logger.info(`Values for query:\n ${values}`);
             }
             const result = await this._session.execute(query, values);
             if (this.__partial) {

package/builders/highLvlBuilders/updateRequestBuilder.js

@@ -66,11 +66,11 @@ class UpdateTRB extends abstractRequestBuilder_1.default {
                 values = builderResult.values;
             }
             catch (e) {
-                throw new builderError_1.default(builderError_1.BuilderType.UPDATE, this._table.tableName(), this._columns, e, this._filter);
+                throw new builderError_1.default(builderError_1.BuilderType.UPDATE, this._table.tableName(), this._columns, e, this._session, this._filter);
             }
             if (this._logger) {
                 this._logger.info(`Updating ${this._table.tableName()} using query:\n ${query}`);
-                console.log(values);
+                this._logger.info(`Values used for update:\n ${values}`);
             }
             const result = await this._session.execute(query, values);
             return responseMapper_1.default.map(this._mappedServiceToDb, result);

package/builders/joinBuilders/builders/abstractJoinBuilder.js

@@ -52,10 +52,8 @@ class AbstractJoined {
                 values = builderResult.values;
             }
             catch (e) {
-                throw new builderError_1.default(builderError_1.BuilderType.JOINED_SELECT, this._table.tableName(), Object.values(this._table.mapServiceToDb()), e, this._filter);
+                throw new builderError_1.default(builderError_1.BuilderType.JOINED_SELECT, this._table.tableName(), Object.values(this._table.mapServiceToDb()), e, this._session, this._filter);
             }
-            console.log(query);
-            console.log(values);
             const result = await this._session.execute(query, values);
             return this.mapResponse(result);
         };

package/builders/requestBuilders/updates/combine.d.ts

@@ -1,8 +1,12 @@
 import { UpdateExpr } from './updates';
+import { ISession } from '../../../db/session';
 export default class Combine extends UpdateExpr {
     private _setters;
     constructor(setters: Array<UpdateExpr>);
-    toQuery: (position?: number | undefined) => {
+    toQuery: ({ position, session, }: {
+        position?: number | undefined;
+        session: ISession;
+    }) => {
         query: string;
         values: Array<any>;
     };

package/builders/requestBuilders/updates/combine.js

@@ -4,13 +4,13 @@ const updates_1 = require("./updates");
 class Combine extends updates_1.UpdateExpr {
     constructor(setters) {
         super();
-        this.toQuery = (position) => {
+        this.toQuery = ({ position, session, }) => {
             let nextPosition = position || 1;
             const response = [];
             const valuesResult = [];
             for (let index = 0; index < this._setters.length; index += 1) {
                 const setter = this._setters[index];
-                const expressionResult = setter.toQuery(nextPosition);
+                const expressionResult = setter.toQuery({ position: nextPosition, session });
                 valuesResult.push(...expressionResult.values);
                 response.push(expressionResult.query);
                 nextPosition += expressionResult.values.length;

package/builders/requestBuilders/updates/increment.d.ts

@@ -1,12 +1,16 @@
 import { AbstractColumn } from '../../../columns/column';
 import ColumnType from '../../../columns/types/columnType';
 import { UpdateCustomExpr } from './updates';
+import { ISession } from '../../../db/session';
 export default class Increment<T extends AbstractColumn<ColumnType<any>, boolean, boolean>> extends UpdateCustomExpr<T> {
     private _column;
     private _value;
     constructor(value: number);
     setColumn: (column: T) => UpdateCustomExpr<T>;
-    toQuery: () => {
+    toQuery: ({ position, session, }: {
+        position?: number | undefined;
+        session: ISession;
+    }) => {
         query: string;
         values: Array<any>;
     };

package/builders/requestBuilders/updates/increment.js

@@ -8,7 +8,7 @@ class Increment extends updates_1.UpdateCustomExpr {
             this._column = column;
             return this;
         };
-        this.toQuery = () => {
+        this.toQuery = ({ position, session, }) => {
             const query = `${this._column.getColumnName()} = ${this._column.getColumnName()} + ${this._value}`;
             return { query, values: [] };
         };

package/builders/requestBuilders/updates/setObjects.d.ts

@@ -1,11 +1,15 @@
 import { AbstractColumn } from '../../../columns/column';
 import ColumnType from '../../../columns/types/columnType';
 import { UpdateExpr } from './updates';
+import { ISession } from '../../../db/session';
 export default class SetObject<T extends AbstractColumn<ColumnType<any>, boolean, boolean>> extends UpdateExpr {
     private _column;
     private _value;
     constructor(column: T, value: any);
-    toQuery: (position?: number | undefined) => {
+    toQuery: ({ position, session, }: {
+        position?: number | undefined;
+        session: ISession;
+    }) => {
         query: string;
         values: Array<any>;
     };

package/builders/requestBuilders/updates/setObjects.js

@@ -4,12 +4,12 @@ const updates_1 = require("./updates");
 class SetObject extends updates_1.UpdateExpr {
     constructor(column, value) {
         super();
-        this.toQuery = (position) => {
+        this.toQuery = ({ position, session, }) => {
             const nextPosition = position || 1;
             const valueToInsert = this._value === null || this._value === undefined
                 ? this._value
                 : this._column.getColumnType().insertStrategy(this._value);
-            const query = `"${this._column.getColumnName()}"=$${nextPosition}`;
+            const query = `"${this._column.getColumnName()}"=${session.parametrized(nextPosition)}`;
             return { query, values: [valueToInsert] };
         };
         this._column = column;

package/builders/requestBuilders/updates/updates.d.ts

@@ -1,5 +1,9 @@
+import { ISession } from '../../../db/session';
 export declare abstract class UpdateExpr {
-    abstract toQuery(position?: number): {
+    abstract toQuery({ position, session, }: {
+        position?: number;
+        session: ISession;
+    }): {
         query: string;
         values: Array<any>;
     };

package/builders/requestBuilders/updates/updates.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UpdateCustomExpr = exports.UpdateExpr = void 0;
-/* eslint-disable max-classes-per-file */
 class UpdateExpr {
 }
 exports.UpdateExpr = UpdateExpr;

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

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

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) => {
+        this.toQuery = ({ position, tableCache, 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(nextPosition, tableCache);
+                const expressionResult = expression.toQuery({ position: nextPosition, tableCache, session });
                 valuesResult.push(...expressionResult.values);
                 result.push(expressionResult.query);
                 nextPosition += expressionResult.values.length;

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

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

package/builders/requestBuilders/where/const.js

@@ -3,21 +3,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-/* eslint-disable no-return-assign */
 const ecranate_1 = require("../../../utils/ecranate");
 const where_1 = __importDefault(require("./where"));
 class Const extends where_1.default {
     constructor(value) {
         super();
-        this.toQuery = (position) => {
+        this.toQuery = ({ position, tableCache, session, }) => {
             const nextPosition = position || 1;
             if (this.value instanceof Date) {
-                return { query: `$${nextPosition}`, values: [`${this.value.toISOString()}`] };
+                return { query: session.parametrized(nextPosition), values: [`${this.value.toISOString()}`] };
             }
             if (ecranate_1.shouldEcranate(this.value)) {
-                return { query: `$${nextPosition}`, values: [`${this.value.toString()}`] };
+                return { query: session.parametrized(nextPosition), values: [`${this.value.toString()}`] };
             }
-            return { query: `$${nextPosition}`, values: [this.value] };
+            return { query: session.parametrized(nextPosition), values: [this.value] };
         };
         this.value = value;
     }

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

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

package/builders/requestBuilders/where/constArray.js

@@ -8,22 +8,22 @@ const where_1 = __importDefault(require("./where"));
 class ConstArray extends where_1.default {
     constructor(values) {
         super();
-        this.toQuery = (position) => {
+        this.toQuery = ({ position, tableCache, session, }) => {
             let nextPosition = position || 1;
             const finalArray = [];
             const finalValues = [];
             for (let i = 0; i < this.values.length; i += 1) {
                 const value = this.values[i];
                 if (value instanceof Date) {
-                    finalArray.push(`$${nextPosition}`);
+                    finalArray.push(session.parametrized(nextPosition));
                     finalValues.push(`${value.toISOString()}`);
                 }
                 else if (ecranate_1.shouldEcranate(value)) {
-                    finalArray.push(`$${nextPosition}`);
+                    finalArray.push(session.parametrized(nextPosition));
                     finalValues.push(`${value.toString()}`);
                 }
                 else {
-                    finalArray.push(`$${nextPosition}`);
+                    finalArray.push(session.parametrized(nextPosition));
                     finalValues.push(value);
                 }
                 if (i < this.values.length - 1) {

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

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

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) => {
-            const rightPreparedValues = this.right.toQuery(position, tableCache);
-            const leftPreparedValues = this.left.toQuery(position, tableCache);
+        this.toQuery = ({ position, tableCache, session, }) => {
+            const rightPreparedValues = this.right.toQuery({ position, tableCache, session });
+            const leftPreparedValues = this.left.toQuery({ position, tableCache, session });
             return { query: `${leftPreparedValues.query}=${rightPreparedValues.query}`, values: [...leftPreparedValues.values, ...rightPreparedValues.values] };
         };
         this.left = left;

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

@@ -1,4 +1,5 @@
 import Expr from './where';
+import { ISession } from '../../../db/session';
 export default class Greater extends Expr {
     private left;
     private right;
@@ -6,9 +7,13 @@ export default class Greater extends Expr {
         left: Expr;
         right: Expr;
     });
-    toQuery: (position: number, tableCache?: {
-        [tableName: string]: string;
-    } | undefined) => {
+    toQuery: ({ position, tableCache, session, }: {
+        position?: number | undefined;
+        tableCache?: {
+            [tableName: string]: string;
+        } | undefined;
+        session: ISession;
+    }) => {
         query: string;
         values: Array<any>;
     };

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) => {
-            const rightPreparedValues = this.right.toQuery(position, tableCache);
-            const leftPreparedValues = this.left.toQuery(position, tableCache);
+        this.toQuery = ({ position, tableCache, session, }) => {
+            const rightPreparedValues = this.right.toQuery({ position, tableCache, session });
+            const leftPreparedValues = this.left.toQuery({ position, tableCache, session });
             return { query: `${leftPreparedValues.query} > ${rightPreparedValues.query}`, values: [...leftPreparedValues.values, ...rightPreparedValues.values] };
         };
         this.left = left;

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

@@ -1,4 +1,5 @@
 import Expr from './where';
+import { ISession } from '../../../db/session';
 export default class GreaterEq extends Expr {
     private left;
     private right;
@@ -6,9 +7,13 @@ export default class GreaterEq extends Expr {
         left: Expr;
         right: Expr;
     });
-    toQuery: (position: number, tableCache?: {
-        [tableName: string]: string;
-    } | undefined) => {
+    toQuery: ({ position, tableCache, session, }: {
+        position?: number | undefined;
+        tableCache?: {
+            [tableName: string]: string;
+        } | undefined;
+        session: ISession;
+    }) => {
         query: string;
         values: Array<any>;
     };

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) => {
-            const rightPreparedValues = this.right.toQuery(position, tableCache);
-            const leftPreparedValues = this.left.toQuery(position, tableCache);
+        this.toQuery = ({ position, tableCache, session, }) => {
+            const rightPreparedValues = this.right.toQuery({ position, tableCache, session });
+            const leftPreparedValues = this.left.toQuery({ position, tableCache, session });
             return { query: `${leftPreparedValues.query} >= ${rightPreparedValues.query}`, values: [...leftPreparedValues.values, ...rightPreparedValues.values] };
         };
         this.left = left;

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

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

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) => {
-            const rightPreparedValues = this.right.toQuery(position, tableCache);
-            const leftPreparedValues = this.left.toQuery(position, tableCache);
+        this.toQuery = ({ position, tableCache, session, }) => {
+            const rightPreparedValues = this.right.toQuery({ position, tableCache, session });
+            const leftPreparedValues = this.left.toQuery({ position, tableCache, session });
             return { query: `${leftPreparedValues.query} in (${rightPreparedValues.query})`, values: [...leftPreparedValues.values, ...rightPreparedValues.values] };
         };
         this.left = left;

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

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

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) => {
-            const leftPreparedValues = this.left.toQuery(position, tableCache);
+        this.toQuery = ({ position, tableCache, session, }) => {
+            const leftPreparedValues = this.left.toQuery({ position, tableCache, session });
             return { query: `${leftPreparedValues.query} is not null`, values: leftPreparedValues.values };
         };
         this.left = left;

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

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

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) => {
-            const leftPreparedValues = this.left.toQuery(position, tableCache);
+        this.toQuery = ({ position, tableCache, session, }) => {
+            const leftPreparedValues = this.left.toQuery({ position, tableCache, session });
             return { query: `${leftPreparedValues.query} is null`, values: leftPreparedValues.values };
         };
         this.left = left;

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

@@ -1,4 +1,5 @@
 import Expr from './where';
+import { ISession } from '../../../db/session';
 export default class Less extends Expr {
     private left;
     private right;
@@ -6,9 +7,13 @@ export default class Less extends Expr {
         left: Expr;
         right: Expr;
     });
-    toQuery: (position?: number | undefined, tableCache?: {
-        [tableName: string]: string;
-    } | undefined) => {
+    toQuery: ({ position, tableCache, session, }: {
+        position?: number | undefined;
+        tableCache?: {
+            [tableName: string]: string;
+        } | undefined;
+        session: ISession;
+    }) => {
         query: string;
         values: Array<any>;
     };

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) => {
-            const rightPreparedValues = this.right.toQuery(position, tableCache);
-            const leftPreparedValues = this.left.toQuery(position, tableCache);
+        this.toQuery = ({ position, tableCache, session, }) => {
+            const rightPreparedValues = this.right.toQuery({ position, tableCache, session });
+            const leftPreparedValues = this.left.toQuery({ position, tableCache, session });
             return { query: `${leftPreparedValues.query} < ${rightPreparedValues.query}`, values: [...leftPreparedValues.values, ...rightPreparedValues.values] };
         };
         this.left = left;

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

@@ -1,4 +1,5 @@
 import Expr from './where';
+import { ISession } from '../../../db/session';
 export default class LessEq extends Expr {
     private left;
     private right;
@@ -6,9 +7,13 @@ export default class LessEq extends Expr {
         left: Expr;
         right: Expr;
     });
-    toQuery: (position?: number | undefined, tableCache?: {
-        [tableName: string]: string;
-    } | undefined) => {
+    toQuery: ({ position, tableCache, session, }: {
+        position?: number | undefined;
+        tableCache?: {
+            [tableName: string]: string;
+        } | undefined;
+        session: ISession;
+    }) => {
         query: string;
         values: Array<any>;
     };

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) => {
-            const rightPreparedValues = this.right.toQuery(position, tableCache);
-            const leftPreparedValues = this.left.toQuery(position, tableCache);
+        this.toQuery = ({ position, tableCache, session, }) => {
+            const rightPreparedValues = this.right.toQuery({ position, tableCache, session });
+            const leftPreparedValues = this.left.toQuery({ position, tableCache, session });
             return { query: `${leftPreparedValues.query} <= ${rightPreparedValues.query}`, values: [...leftPreparedValues.values, ...rightPreparedValues.values] };
         };
         this.left = left;

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

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

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) => {
-            const rightPreparedValues = this.right.toQuery(position, tableCache);
-            const leftPreparedValues = this.left.toQuery(position, tableCache);
+        this.toQuery = ({ position, tableCache, session, }) => {
+            const rightPreparedValues = this.right.toQuery({ position, tableCache, session });
+            const leftPreparedValues = this.left.toQuery({ position, tableCache, session });
             return { query: `${leftPreparedValues.query} like ${rightPreparedValues.query}`, values: [...leftPreparedValues.values, ...rightPreparedValues.values] };
         };
         this.left = left;

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

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

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) => {
-            const rightPreparedValues = this.right.toQuery(position, tableCache);
-            const leftPreparedValues = this.left.toQuery(position, tableCache);
+        this.toQuery = ({ position, tableCache, session, }) => {
+            const rightPreparedValues = this.right.toQuery({ position, tableCache, session });
+            const leftPreparedValues = this.left.toQuery({ position, tableCache, session });
             return { query: `${leftPreparedValues.query}!=${rightPreparedValues.query}`, values: [...leftPreparedValues.values, ...rightPreparedValues.values] };
         };
         this.left = left;

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

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

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) => {
+        this.toQuery = ({ position, tableCache, 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(nextPosition, tableCache);
+                const expressionResult = expression.toQuery({ position: nextPosition, tableCache, session });
                 valuesResult.push(...expressionResult.values);
                 result.push(expressionResult.query);
                 nextPosition += expressionResult.values.length;

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

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

package/builders/requestBuilders/where/rawWhere.js

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

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

@@ -1,12 +1,17 @@
 import { AbstractColumn } from '../../../columns/column';
 import ColumnType from '../../../columns/types/columnType';
 import Expr from './where';
+import { ISession } from '../../../db/session';
 export default class Var<T extends AbstractColumn<ColumnType<any>, boolean, boolean>> extends Expr {
     private column;
     constructor(column: T);
-    toQuery: (postition?: number | undefined, tableCache?: {
-        [tableName: string]: string;
-    } | undefined) => {
+    toQuery: ({ position, tableCache, session, }: {
+        position?: number | undefined;
+        tableCache?: {
+            [tableName: string]: string;
+        } | undefined;
+        session: ISession;
+    }) => {
         query: string;
         values: Array<any>;
     };

package/builders/requestBuilders/where/var.js

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

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

@@ -1,6 +1,11 @@
+import { ISession } from '../../../db/session';
 export default abstract class Expr {
-    abstract toQuery(position?: number, tableCache?: {
-        [tableName: string]: string;
+    abstract toQuery({ position, tableCache, session, }: {
+        position?: number;
+        tableCache?: {
+            [tableName: string]: string;
+        };
+        session: ISession;
     }): {
         query: string;
         values: Array<any>;

package/builders/requestBuilders/where/where.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-/* eslint-disable max-classes-per-file */
 class Expr {
 }
 exports.default = Expr;

package/db/session.d.ts

@@ -1,9 +1,12 @@
 import { Pool, QueryResult } from 'pg';
 export declare abstract class ISession {
+    constructor();
     abstract execute(query: string, values?: Array<any>): Promise<QueryResult<any>>;
+    abstract parametrized(num: number): string;
 }
 export default class Session extends ISession {
     private pool;
     constructor(pool: Pool);
     execute(query: string, values?: Array<any>): Promise<QueryResult<any>>;
+    parametrized(num: number): string;
 }

package/db/session.js

@@ -2,6 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ISession = void 0;
 class ISession {
+    // eslint-disable-next-line @typescript-eslint/no-useless-constructor
+    constructor() {
+    }
 }
 exports.ISession = ISession;
 class Session extends ISession {
@@ -12,5 +15,8 @@ class Session extends ISession {
     async execute(query, values) {
         return this.pool.query(query, values || []);
     }
+    parametrized(num) {
+        return `$${num}`;
+    }
 }
 exports.default = Session;

package/errors/builderError.d.ts

@@ -1,6 +1,7 @@
 import Expr from '../builders/requestBuilders/where/where';
 import { AbstractColumn } from '../columns/column';
 import ColumnType from '../columns/types/columnType';
+import { ISession } from '../db/session';
 export declare enum BuilderType {
     SELECT = 0,
     JOINED_SELECT = 1,
@@ -10,5 +11,5 @@ export declare enum BuilderType {
     UPDATE = 5
 }
 export default class BuilderError extends Error {
-    constructor(builderType: BuilderType, tableName: string, columns: AbstractColumn<ColumnType>[], reason: Error, filter?: Expr);
+    constructor(builderType: BuilderType, tableName: string, columns: AbstractColumn<ColumnType>[], reason: Error, session: ISession, filter?: Expr);
 }

package/errors/builderError.js

@@ -11,14 +11,14 @@ var BuilderType;
     BuilderType[BuilderType["UPDATE"] = 5] = "UPDATE";
 })(BuilderType = exports.BuilderType || (exports.BuilderType = {}));
 class BuilderError extends Error {
-    constructor(builderType, tableName, columns, reason, filter) {
+    constructor(builderType, tableName, columns, reason, session, filter) {
         super('');
         this.message = ` Error while building select query from ${tableName}\n-----\nIf you see current error, please create [github issue](https://github.com/lambda-direct/drizzle-orm/issues) and provide following information\n
 Reason: ${reason.message}
 Query builder: ${BuilderType[builderType]}
 Table name: ${tableName}
-Filter query: ${filter ? filter.toQuery().query : 'undefined'}
-Values: ${filter ? filter.toQuery().values : 'undefined'}
+Filter query: ${filter ? filter.toQuery({ session }).query : 'undefined'}
+Values: ${filter ? filter.toQuery({ session }).values : 'undefined'}
 Column names: ${columns.map((column) => column.getColumnName()).join(', ')}\n-----\n`;
     }
 }

package/index.d.ts

@@ -5,6 +5,8 @@ export * from './db';
 export * from './builders';
 export * from './columns';
 export * from './tables';
+export * from './logger/consoleLogger';
+export * from './logger/abstractLogger';
 export declare const drizzle: {
     connect(config: ClientConfig): Promise<DB>;
     migrator(db: DB): Migrator;

package/index.js

@@ -20,6 +20,8 @@ __exportStar(require("./db"), exports);
 __exportStar(require("./builders"), exports);
 __exportStar(require("./columns"), exports);
 __exportStar(require("./tables"), exports);
+__exportStar(require("./logger/consoleLogger"), exports);
+__exportStar(require("./logger/abstractLogger"), exports);
 exports.drizzle = {
     async connect(config) {
         const dbConnector = new db_1.DbConnector().params(config);

package/migrator/migrator.js

@@ -22,6 +22,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+/* eslint-disable no-continue */
 /* eslint-disable no-restricted-syntax */
 /* eslint-disable import/export */
 /* eslint-disable max-classes-per-file */
@@ -72,6 +73,9 @@ class Migrator {
         await transaction.begin();
         try {
             for await (const migrationFolder of files) {
+                if (migrationFolder === '.DS_Store') {
+                    continue;
+                }
                 const migrationFiles = fs.readdirSync(`${migrationFolderTo}/${migrationFolder}`);
                 const migrationFile = migrationFiles.filter((file) => file === 'migration.sql')[0];
                 const query = fs.readFileSync(`${migrationFolderTo}/${migrationFolder}/${migrationFile}`).toString();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drizzle-orm",
-  "version": "0.10.39",
+  "version": "0.10.42",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/test.d.ts

@@ -1 +0,0 @@
-export {};

package/test.js

@@ -1,64 +1,104 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const dbConnector_1 = __importDefault(require("./db/dbConnector"));
-const usersTable_1 = __importDefault(require("./docs/tables/usersTable"));
-const consoleLogger_1 = __importDefault(require("./logger/consoleLogger"));
-const serializer_1 = __importDefault(require("./serializer/serializer"));
-(async () => {
-    try {
-        const db = await new dbConnector_1.default()
-            .connectionString('postgresql://postgres@127.0.0.1/migrator')
-            .connect();
-        db.useLogger(new consoleLogger_1.default());
-        const usersTable = new usersTable_1.default(db);
-        // const citiesTable = new CitiesTable(db);
-        // await usersTable.insert({
-        // });
-        // const res = await citiesTable.update()
-        //   // .groupBy((table, join1, join2, join3) => [table.id, join1.id, join1.phone])
-        //   .where(eq(citiesTable.location, 'YR'))
-        //   .set({
-        //     metadata: [{
-        //       fallback_image: true,
-        //       team_image: 'https://files.slack.com/files-pri/T016CCC3FE3-F03461UR9M5/clinic_team_photo_1.jpg?pub_secret=560c098bfb',
-        //       image_alt_text: 'Generic Physiotherapy Clinic image 1',
-        //       logo: '',
-        //       logo_alt_text: ''
-        //     }],
-        //   })
-        //   // .leftJoin(CitiesTable, UsersTable, (table) => table.userId, (table) => table.id)
-        //   // .leftJoin(UsersTable, UsersTable, (table) => table.id, (table) => table.id)
-        //   .execute();
-        // console.log(res);
-        const ser = new serializer_1.default();
-        const res = ser.generate([usersTable], []);
-        console.log(JSON.stringify(res, null, 2));
-        // const f = {
-        //   id: count(usersTable.id),
-        // };
-        // type d = ExtractModel<typeof f>;
-        // const res = await usersTable.select()
-        //   .leftJoin(UsersTable, (table) => table.id, (table) => table.id)
-        //   .leftJoin(UsersTable, CitiesTable, (table) => table.id, (table) => table.id)
-        //   .execute();
-        // const res = await usersTable.select()
-        //   // .groupBy((table, join1, join2, join3) => [table.id, join1.id, join1.phone])
-        //   .leftJoin(UsersTable, (table) => table.foundationDate, (table) => table.id)
-        //   .leftJoin(UsersTable, UsersTable, (table) => table.role, (table) => table.id)
-        //   .leftJoin(UsersTable, UsersTable, (table) => table.role, (table) => table.id)
-        //   // .groupBy({
-        //   //   usersTable: usersTable.id,
-        //   //   firstJoin: [usersTable.id],
-        //   //   secondJoin: usersTable.id,
-        //   //   thirdJoin: usersTable.id,
-        //   // })
-        //   .execute();
-        // console.log(res);
-    }
-    catch (e) {
-        console.log(e);
-    }
-})();
+// import { QueryResult } from 'pg';
+// import { drizzle } from '.';
+// import {
+//   and, eq, greater, isNotNull, less, or,
+// } from './builders';
+// import { DB } from './db';
+// import DbConnector from './db/dbConnector';
+// import Session, { ISession } from './db/session';
+// import UsersTable from './docs/tables/usersTable';
+// import ConsoleLogger from './logger/consoleLogger';
+// class KnexSession extends ISession {
+//   public execute(query: string, values?: any[]): Promise<QueryResult<any>> {
+//     console.log(query);
+//     console.log(values);
+//     return { rows: [] } as any;
+//   }
+//   public parametrized(num: number): string {
+//     return `?${num}`;
+//   }
+// }
+// (async () => {
+//   try {
+//     // const db = await new DbConnector()
+//     //   .connectionString('postgresql://postgres@127.0.0.1/migrator')
+//     //   .connect();
+//     const db = new DB(new KnexSession());
+//     // db.useLogger(new ConsoleLogger());
+//     const usersTable = new UsersTable(db);
+//     await usersTable.select().where(or([
+//       and([eq(usersTable.role, 'bar'), less(usersTable.phone, 'd')]),
+//       eq(usersTable.role, 'bar'),
+//       greater(usersTable.decimalField, 1),
+//     ])).execute();
+//     await usersTable.delete().where(or([
+//       and([eq(usersTable.role, 'bar'), less(usersTable.phone, 'd')]),
+//       eq(usersTable.role, 'bar'),
+//       greater(usersTable.decimalField, 1),
+//     ])).execute();
+//     await usersTable.update().where(or([
+//       and([eq(usersTable.role, 'bar'), less(usersTable.phone, 'd')]),
+//       eq(usersTable.role, 'bar'),
+//       greater(usersTable.decimalField, 1),
+//     ])).set({
+//       isArchived: false,
+//       role: 'bar',
+//     }).execute();
+//     await usersTable.insert({
+//       isArchived: false,
+//       role: 'bar',
+//       decimalField: 12,
+//       createdAt: new Date(),
+//     }).execute();
+//     // drizzle.migrator(db).migrate({ migrationFolder: 'drizzle' });
+//     // type g = ReturnType<typeof usersTable.updatedAt.getColumnType>['codeType'];
+//     // type f = ExtractColumnType<typeof usersTable.updatedAt>;
+//     // type f1 = ExtractColumnType1<f>;
+//     // const citiesTable = new CitiesTable(db);
+//     // await usersTable.insert({
+//     // });
+//     // const res = await citiesTable.update()
+//     //   // .groupBy((table, join1, join2, join3) => [table.id, join1.id, join1.phone])
+//     //   .where(eq(citiesTable.location, 'YR'))
+//     //   .set({
+//     //     metadata: [{
+//     //       fallback_image: true,
+//     //       team_image: 'https://files.slack.com/files-pri/T016CCC3FE3-F03461UR9M5/clinic_team_photo_1.jpg?pub_secret=560c098bfb',
+//     //       image_alt_text: 'Generic Physiotherapy Clinic image 1',
+//     //       logo: '',
+//     //       logo_alt_text: ''
+//     //     }],
+//     //   })
+//     //   // .leftJoin(CitiesTable, UsersTable, (table) => table.userId, (table) => table.id)
+//     //   // .leftJoin(UsersTable, UsersTable, (table) => table.id, (table) => table.id)
+//     //   .execute();
+//     // console.log(res);
+//     // const ser = new MigrationSerializer();
+//     // const res = ser.generate([usersTable as AbstractTable<UsersTable>], []);
+//     // console.log(JSON.stringify(res, null, 2));
+//     // const f = {
+//     //   id: count(usersTable.id),
+//     // };
+//     // type d = ExtractModel<typeof f>;
+//     // const res = await usersTable.select()
+//     //   .leftJoin(UsersTable, (table) => table.id, (table) => table.id)
+//     //   .leftJoin(UsersTable, CitiesTable, (table) => table.id, (table) => table.id)
+//     //   .execute();
+//     // const res = await usersTable.select()
+//     //   // .groupBy((table, join1, join2, join3) => [table.id, join1.id, join1.phone])
+//     //   .leftJoin(UsersTable, (table) => table.foundationDate, (table) => table.id)
+//     //   .leftJoin(UsersTable, UsersTable, (table) => table.role, (table) => table.id)
+//     //   .leftJoin(UsersTable, UsersTable, (table) => table.role, (table) => table.id)
+//     //   // .groupBy({
+//     //   //   usersTable: usersTable.id,
+//     //   //   firstJoin: [usersTable.id],
+//     //   //   secondJoin: usersTable.id,
+//     //   //   thirdJoin: usersTable.id,
+//     //   // })
+//     //   .execute();
+//     // console.log(res);
+//   } catch (e) {
+//     console.log(e);
+//   }
+// })();