drizzle-orm 0.10.5 → 0.10.9

package/builders/requestBuilders/where/and.js

@@ -1,20 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+/* eslint-disable max-len */
 const where_1 = require("./where");
 class And extends where_1.default {
     constructor(expressions) {
         super();
-        this.toQuery = () => {
+        this.toQuery = (position, tableCache) => {
+            let nextPosition = position || 1;
             const result = ['('];
+            const valuesResult = [];
             for (let i = 0; i < this.expressions.length; i += 1) {
                 const expression = this.expressions[i];
-                result.push(expression.toQuery());
+                const expressionResult = expression.toQuery(nextPosition, tableCache);
+                valuesResult.push(...expressionResult.values);
+                result.push(expressionResult.query);
+                nextPosition += expressionResult.values.length;
                 if (i < this.expressions.length - 1) {
                     result.push(' and ');
                 }
             }
             result.push(')');
-            return result.join('');
+            return { query: result.join(''), values: valuesResult };
         };
         this.expressions = expressions;
     }

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

@@ -2,5 +2,8 @@ import Expr from './where';
 export default class Const extends Expr {
     private value;
     constructor(value: any);
-    toQuery: () => string;
+    toQuery: (position?: number | undefined) => {
+        query: string;
+        values: Array<any>;
+    };
 }

package/builders/requestBuilders/where/const.js

@@ -1,18 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+/* eslint-disable no-return-assign */
 const ecranate_1 = require("../../../utils/ecranate");
 const where_1 = require("./where");
 class Const extends where_1.default {
     constructor(value) {
         super();
-        this.toQuery = () => {
+        this.toQuery = (position) => {
+            const nextPosition = position || 1;
             if (this.value instanceof Date) {
-                return `'${this.value.toISOString()}'`;
+                return { query: `$${nextPosition}`, values: [`${this.value.toISOString()}`] };
             }
             if (ecranate_1.shouldEcranate(this.value)) {
-                return `'${this.value.toString()}'`;
+                return { query: `$${nextPosition}`, values: [`${this.value.toString()}`] };
             }
-            return this.value.toString();
+            return { query: `$${nextPosition}`, values: [this.value] };
         };
         this.value = value;
     }

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

@@ -2,5 +2,8 @@ import Expr from './where';
 export default class ConstArray extends Expr {
     private values;
     constructor(values: Array<any>);
-    toQuery: () => string;
+    toQuery: (position?: number | undefined) => {
+        query: string;
+        values: Array<any>;
+    };
 }

package/builders/requestBuilders/where/constArray.js

@@ -5,24 +5,30 @@ const where_1 = require("./where");
 class ConstArray extends where_1.default {
     constructor(values) {
         super();
-        this.toQuery = () => {
+        this.toQuery = (position) => {
+            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) {
-                    return `'${value.toISOString()}'`;
+                    finalArray.push(`$${nextPosition}`);
+                    finalValues.push(`${value.toISOString()}`);
                 }
                 if (ecranate_1.shouldEcranate(value)) {
-                    finalArray.push(`'${value.toString()}'`);
+                    finalArray.push(`$${nextPosition}`);
+                    finalValues.push(`${value.toString()}`);
                 }
                 else {
-                    finalArray.push(value.toString());
+                    finalArray.push(`$${nextPosition}`);
+                    finalValues.push(value);
                 }
                 if (i < this.values.length - 1) {
                     finalArray.push(',');
                 }
+                nextPosition += 1;
             }
-            return finalArray.join('');
+            return { query: finalArray.join(','), values: finalValues };
         };
         this.values = values;
     }

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

@@ -3,5 +3,10 @@ export default class EqWhere extends Expr {
     private left;
     private right;
     constructor(left: Expr, right: Expr);
-    toQuery: () => string;
+    toQuery: (position?: number | undefined, tableCache?: {
+        [tableName: string]: string;
+    } | undefined) => {
+        query: string;
+        values: Array<any>;
+    };
 }

package/builders/requestBuilders/where/eqWhere.js

@@ -1,10 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+/* eslint-disable max-len */
 const where_1 = require("./where");
 class EqWhere extends where_1.default {
     constructor(left, right) {
         super();
-        this.toQuery = () => `${this.left.toQuery()}=${this.right.toQuery()}`;
+        this.toQuery = (position, tableCache) => {
+            const rightPreparedValues = this.right.toQuery(position, tableCache);
+            const leftPreparedValues = this.left.toQuery(position, tableCache);
+            return { query: `${leftPreparedValues.query}=${rightPreparedValues.query}`, values: [...leftPreparedValues.values, ...rightPreparedValues.values] };
+        };
         this.left = left;
         this.right = right;
     }

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

@@ -6,5 +6,10 @@ export default class Greater extends Expr {
         left: Expr;
         right: Expr;
     });
-    toQuery: () => string;
+    toQuery: (position: number, tableCache?: {
+        [tableName: string]: string;
+    } | undefined) => {
+        query: string;
+        values: Array<any>;
+    };
 }

package/builders/requestBuilders/where/greater.js

@@ -1,10 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+/* eslint-disable max-len */
 const where_1 = require("./where");
 class Greater extends where_1.default {
     constructor({ left, right }) {
         super();
-        this.toQuery = () => `${this.left.toQuery()} > ${this.right.toQuery()}`;
+        this.toQuery = (position, tableCache) => {
+            const rightPreparedValues = this.right.toQuery(position, tableCache);
+            const leftPreparedValues = this.left.toQuery(position, tableCache);
+            return { query: `${leftPreparedValues.query} > ${rightPreparedValues.query}`, values: [...leftPreparedValues.values, ...rightPreparedValues.values] };
+        };
         this.left = left;
         this.right = right;
     }

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

@@ -6,5 +6,10 @@ export default class GreaterEq extends Expr {
         left: Expr;
         right: Expr;
     });
-    toQuery: () => string;
+    toQuery: (position: number, tableCache?: {
+        [tableName: string]: string;
+    } | undefined) => {
+        query: string;
+        values: Array<any>;
+    };
 }

package/builders/requestBuilders/where/greaterEq.js

@@ -1,10 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+/* eslint-disable max-len */
 const where_1 = require("./where");
 class GreaterEq extends where_1.default {
     constructor({ left, right }) {
         super();
-        this.toQuery = () => `${this.left.toQuery()} >= ${this.right.toQuery()}`;
+        this.toQuery = (position, tableCache) => {
+            const rightPreparedValues = this.right.toQuery(position, tableCache);
+            const leftPreparedValues = this.left.toQuery(position, tableCache);
+            return { query: `${leftPreparedValues.query} >= ${rightPreparedValues.query}`, values: [...leftPreparedValues.values, ...rightPreparedValues.values] };
+        };
         this.left = left;
         this.right = right;
     }

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

@@ -3,5 +3,10 @@ export default class In extends Expr {
     private left;
     private right;
     constructor(left: Expr, right: Expr);
-    toQuery: () => string;
+    toQuery: (position?: number | undefined, tableCache?: {
+        [tableName: string]: string;
+    } | undefined) => {
+        query: string;
+        values: Array<any>;
+    };
 }

package/builders/requestBuilders/where/in.js

@@ -1,10 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+/* eslint-disable max-len */
 const where_1 = require("./where");
 class In extends where_1.default {
     constructor(left, right) {
         super();
-        this.toQuery = () => `${this.left.toQuery()} in (${this.right.toQuery()})`;
+        this.toQuery = (position, tableCache) => {
+            const rightPreparedValues = this.right.toQuery(position, tableCache);
+            const leftPreparedValues = this.left.toQuery(position, tableCache);
+            return { query: `${leftPreparedValues.query} in (${rightPreparedValues.query})`, values: [...leftPreparedValues.values, ...rightPreparedValues.values] };
+        };
         this.left = left;
         this.right = right;
     }

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

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

package/builders/requestBuilders/where/isNull.js

@@ -1,10 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+/* eslint-disable max-len */
 const where_1 = require("./where");
 class IsNull extends where_1.default {
     constructor(left) {
         super();
-        this.toQuery = () => `${this.left.toQuery()} is null`;
+        this.toQuery = (position, tableCache) => {
+            const leftPreparedValues = this.left.toQuery(position, tableCache);
+            return { query: `${leftPreparedValues.query} is null`, values: leftPreparedValues.values };
+        };
         this.left = left;
     }
 }

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

@@ -6,5 +6,10 @@ export default class Less extends Expr {
         left: Expr;
         right: Expr;
     });
-    toQuery: () => string;
+    toQuery: (position?: number | undefined, tableCache?: {
+        [tableName: string]: string;
+    } | undefined) => {
+        query: string;
+        values: Array<any>;
+    };
 }

package/builders/requestBuilders/where/less.js

@@ -1,10 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+/* eslint-disable max-len */
 const where_1 = require("./where");
 class Less extends where_1.default {
     constructor({ left, right }) {
         super();
-        this.toQuery = () => `${this.left.toQuery()} < ${this.right.toQuery()}`;
+        this.toQuery = (position, tableCache) => {
+            const rightPreparedValues = this.right.toQuery(position, tableCache);
+            const leftPreparedValues = this.left.toQuery(position, tableCache);
+            return { query: `${leftPreparedValues.query} < ${rightPreparedValues.query}`, values: [...leftPreparedValues.values, ...rightPreparedValues.values] };
+        };
         this.left = left;
         this.right = right;
     }

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

@@ -6,5 +6,10 @@ export default class LessEq extends Expr {
         left: Expr;
         right: Expr;
     });
-    toQuery: () => string;
+    toQuery: (position?: number | undefined, tableCache?: {
+        [tableName: string]: string;
+    } | undefined) => {
+        query: string;
+        values: Array<any>;
+    };
 }

package/builders/requestBuilders/where/lessEq.js

@@ -1,10 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+/* eslint-disable max-len */
 const where_1 = require("./where");
 class LessEq extends where_1.default {
     constructor({ left, right }) {
         super();
-        this.toQuery = () => `${this.left.toQuery()} <= ${this.right.toQuery()}`;
+        this.toQuery = (position, tableCache) => {
+            const rightPreparedValues = this.right.toQuery(position, tableCache);
+            const leftPreparedValues = this.left.toQuery(position, tableCache);
+            return { query: `${leftPreparedValues.query} <= ${rightPreparedValues.query}`, values: [...leftPreparedValues.values, ...rightPreparedValues.values] };
+        };
         this.left = left;
         this.right = right;
     }

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

@@ -3,5 +3,10 @@ export default class Like extends Expr {
     private left;
     private right;
     constructor(left: Expr, right: Expr);
-    toQuery: () => string;
+    toQuery: (position?: number | undefined, tableCache?: {
+        [tableName: string]: string;
+    } | undefined) => {
+        query: string;
+        values: Array<any>;
+    };
 }

package/builders/requestBuilders/where/like.js

@@ -1,10 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+/* eslint-disable max-len */
 const where_1 = require("./where");
 class Like extends where_1.default {
     constructor(left, right) {
         super();
-        this.toQuery = () => `${this.left.toQuery()} like ${this.right.toQuery()}`;
+        this.toQuery = (position, tableCache) => {
+            const rightPreparedValues = this.right.toQuery(position, tableCache);
+            const leftPreparedValues = this.left.toQuery(position, tableCache);
+            return { query: `${leftPreparedValues.query} like ${rightPreparedValues.query}`, values: [...leftPreparedValues.values, ...rightPreparedValues.values] };
+        };
         this.left = left;
         this.right = right;
     }

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

@@ -3,5 +3,10 @@ export default class NotEqWhere extends Expr {
     private left;
     private right;
     constructor(left: Expr, right: Expr);
-    toQuery: () => string;
+    toQuery: (position?: number | undefined, tableCache?: {
+        [tableName: string]: string;
+    } | undefined) => {
+        query: string;
+        values: Array<any>;
+    };
 }

package/builders/requestBuilders/where/notEqWhere.js

@@ -1,10 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+/* eslint-disable max-len */
 const where_1 = require("./where");
 class NotEqWhere extends where_1.default {
     constructor(left, right) {
         super();
-        this.toQuery = () => `${this.left.toQuery()}!=${this.right.toQuery()}`;
+        this.toQuery = (position, tableCache) => {
+            const rightPreparedValues = this.right.toQuery(position, tableCache);
+            const leftPreparedValues = this.left.toQuery(position, tableCache);
+            return { query: `${leftPreparedValues.query}!=${rightPreparedValues.query}`, values: [...leftPreparedValues.values, ...rightPreparedValues.values] };
+        };
         this.left = left;
         this.right = right;
     }

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

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

package/builders/requestBuilders/where/or.js

@@ -1,20 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+/* eslint-disable max-len */
 const where_1 = require("./where");
 class Or extends where_1.default {
     constructor(expressions) {
         super();
-        this.toQuery = () => {
+        this.toQuery = (position, tableCache) => {
+            let nextPosition = position || 1;
             const result = ['('];
+            const valuesResult = [];
             for (let i = 0; i < this.expressions.length; i += 1) {
                 const expression = this.expressions[i];
-                result.push(expression.toQuery());
+                const expressionResult = expression.toQuery(nextPosition, tableCache);
+                valuesResult.push(...expressionResult.values);
+                result.push(expressionResult.query);
+                nextPosition += expressionResult.values.length;
                 if (i < this.expressions.length - 1) {
                     result.push(' or ');
                 }
             }
             result.push(')');
-            return result.join('');
+            return { query: result.join(''), values: valuesResult };
         };
         this.expressions = expressions;
     }

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

@@ -2,5 +2,8 @@ import Expr from './where';
 export default class RawWhere extends Expr {
     private custom;
     constructor(custom: string);
-    toQuery: () => string;
+    toQuery: () => {
+        query: string;
+        values: Array<any>;
+    };
 }

package/builders/requestBuilders/where/rawWhere.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+/* eslint-disable max-len */
 const where_1 = require("./where");
 class RawWhere extends where_1.default {
     constructor(custom) {
         super();
         this.custom = custom;
-        this.toQuery = () => this.custom;
+        this.toQuery = () => ({ query: this.custom, values: [] });
     }
 }
 exports.default = RawWhere;

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

@@ -4,5 +4,10 @@ import Expr from './where';
 export default class Var<T extends AbstractColumn<ColumnType<any>, boolean, boolean>> extends Expr {
     private column;
     constructor(column: T);
-    toQuery: () => string;
+    toQuery: (postition?: number | undefined, tableCache?: {
+        [tableName: string]: string;
+    } | undefined) => {
+        query: string;
+        values: Array<any>;
+    };
 }

package/builders/requestBuilders/where/var.js

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

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

@@ -1,3 +1,8 @@
 export default abstract class Expr {
-    abstract toQuery(): string;
+    abstract toQuery(position?: number, tableCache?: {
+        [tableName: string]: string;
+    }): {
+        query: string;
+        values: Array<any>;
+    };
 }

package/builders/requestBuilders/where/where.js

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

package/columns/types/pgEnum.js

@@ -5,7 +5,7 @@ class PgEnum extends columnType_1.default {
     constructor(dbName) {
         super();
         this.getDbName = () => this.dbName;
-        this.insertStrategy = (value) => `'${value}'`;
+        this.insertStrategy = (value) => `${value}`;
         this.dbName = dbName;
     }
     selectStrategy(value) {

package/columns/types/pgJsonb.js

@@ -1,11 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+/* eslint-disable max-len */
 const columnType_1 = require("./columnType");
 class PgJsonb extends columnType_1.default {
     constructor() {
         super();
         this.getDbName = () => this.dbName;
-        this.insertStrategy = (value) => `'${JSON.stringify(value).replace(/'/g, "''")}'::jsonb`;
+        // public insertStrategy = (value: TCodeType): string => `'${JSON.stringify(value).replace(/'/g, "''")}'::jsonb`;
+        this.insertStrategy = (value) => `${JSON.stringify(value).replace(/'/g, "''")}`;
         this.dbName = 'JSONB';
     }
     selectStrategy(value) {

package/columns/types/pgText.js

@@ -5,7 +5,7 @@ class PgText extends columnType_1.default {
     constructor() {
         super();
         this.getDbName = () => this.dbName;
-        this.insertStrategy = (value) => `'${value.replace(/'/g, "''")}'`;
+        this.insertStrategy = (value) => `${value.replace(/'/g, "''")}`;
         this.dbName = 'TEXT';
     }
     selectStrategy(value) {

package/columns/types/pgTimestamp.js

@@ -5,7 +5,7 @@ class PgTimestamp extends columnType_1.default {
     constructor() {
         super();
         this.getDbName = () => this.dbName;
-        this.insertStrategy = (value) => `'${value.toISOString()}'`;
+        this.insertStrategy = (value) => `${value.toISOString()}`;
         this.dbName = 'timestamp without time zone';
     }
     selectStrategy(value) {

package/columns/types/pgTimestamptz.js

@@ -5,7 +5,7 @@ class PgTimestamptz extends columnType_1.default {
     constructor() {
         super();
         this.getDbName = () => this.dbName;
-        this.insertStrategy = (value) => `'${value.toISOString()}'`;
+        this.insertStrategy = (value) => `${value.toISOString()}`;
         this.dbName = 'timestamp with time zone';
     }
     selectStrategy(value) {

package/columns/types/pgVarChar.js

@@ -5,7 +5,7 @@ class PgVarChar extends columnType_1.default {
     constructor(size) {
         super();
         this.getDbName = () => this.dbName;
-        this.insertStrategy = (value) => `'${value.replace(/'/g, "''")}'`;
+        this.insertStrategy = (value) => `${value.replace(/'/g, "''")}`;
         this.size = size;
         if (size) {
             this.dbName = `character varying(${size})`;

package/db/session.d.ts

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

package/db/session.js

@@ -9,8 +9,8 @@ class Session extends ISession {
         super();
         this.pool = pool;
     }
-    execute(query) {
-        return this.pool.query(query);
+    async execute(query, values) {
+        return this.pool.query(query, values || []);
     }
 }
 exports.default = Session;

package/docs/cases/simple_delete.js

@@ -3,22 +3,24 @@ Object.defineProperty(exports, "__esModule", { value: true });
 /* eslint-disable @typescript-eslint/no-unused-vars */
 const __1 = require("../..");
 const builders_1 = require("../../builders");
+const consoleLogger_1 = require("../../logger/consoleLogger");
 const citiesTable_1 = require("../tables/citiesTable");
 const userGroupsTable_1 = require("../tables/userGroupsTable");
 const usersTable_1 = require("../tables/usersTable");
 (async () => {
     try {
         const db = await new __1.DbConnector()
-            .connectionString('postgresql://postgres@127.0.0.1/drizzle')
+            .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_1.default(db);
         const userGroupsTable = new userGroupsTable_1.default(db);
         await usersTable.delete()
-            .where(builders_1.eq(usersTable.id, 1))
+            .where(builders_1.eq(usersTable.id, 6))
             .execute();
         const deletedCities = await citiesTable.delete()
-            .where(builders_1.eq(citiesTable.id, 2))
+            .where(builders_1.eq(citiesTable.id, 7))
             .all();
         const deletedUserGroup = await userGroupsTable.delete()
             .where(builders_1.eq(userGroupsTable.id, 3))