drizzle-orm 0.10.15 → 0.10.18

package/builders/index.d.ts

@@ -15,4 +15,4 @@ export { default as Insert } from './lowLvlBuilders/inserts/insert';
 export { default as Select } from './lowLvlBuilders/selects/select';
 export { default as Update } from './lowLvlBuilders/updates/update';
 export { set, combine } from './requestBuilders/updates/static';
-export { eq, inArray as in, and, or, like, greater, greaterEq, less, lessEq, raw, } from './requestBuilders/where/static';
+export { eq, inArray as in, and, or, like, greater, greaterEq, less, lessEq, raw, isNotNull, } from './requestBuilders/where/static';

package/builders/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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.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 deleteRequestBuilder_1.default; } });
@@ -48,3 +48,4 @@ Object.defineProperty(exports, "greaterEq", { enumerable: true, get: function ()
 Object.defineProperty(exports, "less", { enumerable: true, get: function () { return static_3.less; } });
 Object.defineProperty(exports, "lessEq", { enumerable: true, get: function () { return static_3.lessEq; } });
 Object.defineProperty(exports, "raw", { enumerable: true, get: function () { return static_3.raw; } });
+Object.defineProperty(exports, "isNotNull", { enumerable: true, get: function () { return static_3.isNotNull; } });

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

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

package/builders/requestBuilders/where/isNotNull.js

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

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

@@ -13,4 +13,5 @@ export declare const less: <T extends AbstractColumn<ColumnType<any>, boolean, b
 export declare const greaterEq: <T extends AbstractColumn<ColumnType<any>, boolean, boolean, any>>(left: T, value: ExtractCodeType<T>) => Expr;
 export declare const lessEq: <T extends AbstractColumn<ColumnType<any>, boolean, boolean, any>>(left: T, value: ExtractCodeType<T>) => Expr;
 export declare const isNull: <T extends AbstractColumn<ColumnType<any>, boolean, boolean, any>>(left: T) => Expr;
+export declare const isNotNull: <T extends AbstractColumn<ColumnType<any>, boolean, boolean, any>>(left: T) => Expr;
 export declare const notEq: <T extends AbstractColumn<ColumnType<any>, boolean, boolean, any>>(left: T, value: ExtractCodeType<T>) => Expr;

package/builders/requestBuilders/where/static.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.notEq = 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 = void 0;
 const and_1 = require("./and");
 const const_1 = require("./const");
 const constArray_1 = require("./constArray");
@@ -8,6 +8,7 @@ const eqWhere_1 = require("./eqWhere");
 const greater_1 = require("./greater");
 const greaterEq_1 = require("./greaterEq");
 const in_1 = require("./in");
+const isNotNull_1 = require("./isNotNull");
 const isNull_1 = require("./isNull");
 const less_1 = require("./less");
 const lessEq_1 = require("./lessEq");
@@ -39,5 +40,7 @@ const lessEq = (left, value) => new lessEq_1.default({ left: new var_1.default(l
 exports.lessEq = lessEq;
 const isNull = (left) => new isNull_1.default(new var_1.default(left));
 exports.isNull = isNull;
+const isNotNull = (left) => new isNotNull_1.default(new var_1.default(left));
+exports.isNotNull = isNotNull;
 const notEq = (left, value) => new notEqWhere_1.default(new var_1.default(left), new const_1.default(value));
 exports.notEq = notEq;

package/columns/column.d.ts

@@ -19,19 +19,21 @@ export declare abstract class AbstractColumn<T extends ColumnType, TNullable ext
     protected columnType: T;
     protected columnName: string;
     protected defaultParam: any;
-    protected referenced: AbstractColumn<T, boolean, boolean, TParent>;
+    protected referenced: AbstractColumn<T, boolean, boolean>;
     constructor(parent: TParent, columnName: string, columnType: T);
     getOnDelete: () => string | undefined;
     getOnUpdate: () => string | undefined;
     getAlias: () => string;
     getParent: () => AbstractTable<any>;
     getParentName: () => string;
-    abstract foreignKey<ITable extends AbstractTable<ITable>>(table: {
-        new (db: DB): ITable;
-    }, callback: (table: ITable) => AbstractColumn<T, boolean, boolean, TParent>, onConstraint: {
+    abstract foreignKey<ITable extends AbstractTable<ITable>>(table: new (db: DB) => ITable, callback: (table: ITable) => Column<any, boolean, boolean, ITable>, onConstraint?: {
         onDelete?: 'CASCADE' | 'RESTRICT' | 'SET NULL' | 'SET DEFAULT';
         onUpdate?: 'CASCADE' | 'RESTRICT' | 'SET NULL' | 'SET DEFAULT';
-    }): AbstractColumn<T, TNullable, TAutoIncrement>;
+    }): AbstractColumn<T, TNullable, TAutoIncrement, TParent>;
+    abstract selfForeignKey(column: Column<any, boolean, boolean, TParent>, onConstraint?: {
+        onDelete?: 'CASCADE' | 'RESTRICT' | 'SET NULL' | 'SET DEFAULT';
+        onUpdate?: 'CASCADE' | 'RESTRICT' | 'SET NULL' | 'SET DEFAULT';
+    }): AbstractColumn<T, TNullable, TAutoIncrement, TParent>;
     defaultValue: (value: ExtractColumnType<T>) => this;
     abstract primaryKey(): AbstractColumn<T, boolean, boolean, TParent>;
     unique: () => this;
@@ -45,11 +47,11 @@ export declare class Column<T extends ColumnType, TNullable extends boolean = tr
     constructor(parent: TParent, columnName: string, columnType: T);
     notNull(): Column<T, TAutoIncrement extends true ? true : TNullable extends true ? false : true, TAutoIncrement, TParent>;
     primaryKey(): Column<T, TAutoIncrement extends true ? true : false, TAutoIncrement, TParent>;
-    foreignKey(table: new (db: DB) => TParent, callback: (table: this) => Column<T, boolean, boolean, TParent>, onConstraint?: {
+    foreignKey<ITable extends AbstractTable<ITable>>(table: new (db: DB) => ITable, callback: (table: ITable) => Column<any, boolean, boolean, ITable>, onConstraint?: {
         onDelete?: 'CASCADE' | 'RESTRICT' | 'SET NULL' | 'SET DEFAULT';
         onUpdate?: 'CASCADE' | 'RESTRICT' | 'SET NULL' | 'SET DEFAULT';
     }): Column<T, TNullable, TAutoIncrement, TParent>;
-    foreignKey<ITable extends AbstractTable<ITable>>(table: new (db: DB) => ITable, callback: (table: ITable) => Column<T, boolean, boolean, ITable>, onConstraint?: {
+    selfForeignKey(column: Column<any, boolean, boolean, TParent>, onConstraint?: {
         onDelete?: 'CASCADE' | 'RESTRICT' | 'SET NULL' | 'SET DEFAULT';
         onUpdate?: 'CASCADE' | 'RESTRICT' | 'SET NULL' | 'SET DEFAULT';
     }): Column<T, TNullable, TAutoIncrement, TParent>;
@@ -58,7 +60,11 @@ export declare class IndexedColumn<T extends ColumnType, TNullable extends boole
     constructor(parent: TParent, columnName: string, columnType: T, nullable: TNullable);
     notNull(): IndexedColumn<T, TAutoIncrement extends true ? true : TNullable extends true ? false : true, TAutoIncrement, TParent>;
     primaryKey(): IndexedColumn<T, TAutoIncrement extends true ? true : false, TAutoIncrement, TParent>;
-    foreignKey<ITable extends AbstractTable<ITable>>(table: new (db: DB) => ITable, callback: (table: ITable) => IndexedColumn<T, boolean, boolean, TParent>, onConstraint?: {
+    foreignKey<ITable extends AbstractTable<ITable>>(table: new (db: DB) => ITable, callback: (table: ITable) => Column<any, boolean, boolean, ITable>, onConstraint?: {
+        onDelete?: 'CASCADE' | 'RESTRICT' | 'SET NULL' | 'SET DEFAULT';
+        onUpdate?: 'CASCADE' | 'RESTRICT' | 'SET NULL' | 'SET DEFAULT';
+    }): IndexedColumn<T, TNullable, TAutoIncrement, TParent>;
+    selfForeignKey<ITable extends AbstractTable<ITable>>(column: Column<any, boolean, boolean, TParent>, onConstraint?: {
         onDelete?: 'CASCADE' | 'RESTRICT' | 'SET NULL' | 'SET DEFAULT';
         onUpdate?: 'CASCADE' | 'RESTRICT' | 'SET NULL' | 'SET DEFAULT';
     }): IndexedColumn<T, TNullable, TAutoIncrement, TParent>;

package/columns/column.js

@@ -56,19 +56,18 @@ class Column extends AbstractColumn {
         return this;
     }
     foreignKey(table, callback, onConstraint) {
-        let tableInstance;
-        // eslint-disable-next-line new-cap
-        if (typeof this !== typeof this.getParent()) {
-            tableInstance = this.getParent().db.create(table);
-        }
-        else {
-            tableInstance = this;
-        }
+        const tableInstance = this.getParent().db.create(table);
         this.referenced = callback(tableInstance);
         this.onDelete = (onConstraint === null || onConstraint === void 0 ? void 0 : onConstraint.onDelete) ? `ON DELETE ${onConstraint.onDelete}` : undefined;
         this.onUpdate = (onConstraint === null || onConstraint === void 0 ? void 0 : onConstraint.onUpdate) ? `ON UPDATE ${onConstraint.onUpdate}` : undefined;
         return this;
     }
+    selfForeignKey(column, onConstraint) {
+        this.referenced = column;
+        this.onDelete = (onConstraint === null || onConstraint === void 0 ? void 0 : onConstraint.onDelete) ? `ON DELETE ${onConstraint.onDelete}` : undefined;
+        this.onUpdate = (onConstraint === null || onConstraint === void 0 ? void 0 : onConstraint.onUpdate) ? `ON UPDATE ${onConstraint.onUpdate}` : undefined;
+        return this;
+    }
 }
 exports.Column = Column;
 // eslint-disable-next-line max-len
@@ -92,5 +91,11 @@ class IndexedColumn extends AbstractColumn {
         this.onUpdate = (onConstraint === null || onConstraint === void 0 ? void 0 : onConstraint.onUpdate) ? `ON UPDATE ${onConstraint.onUpdate}` : undefined;
         return this;
     }
+    selfForeignKey(column, onConstraint) {
+        this.referenced = column;
+        this.onDelete = (onConstraint === null || onConstraint === void 0 ? void 0 : onConstraint.onDelete) ? `ON DELETE ${onConstraint.onDelete}` : undefined;
+        this.onUpdate = (onConstraint === null || onConstraint === void 0 ? void 0 : onConstraint.onUpdate) ? `ON UPDATE ${onConstraint.onUpdate}` : undefined;
+        return this;
+    }
 }
 exports.IndexedColumn = IndexedColumn;

package/package.json

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

package/test.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const dbConnector_1 = require("./db/dbConnector");
-const usersTable_1 = require("./docs/tables/usersTable");
+const citiesTable_1 = require("./docs/tables/citiesTable");
 const consoleLogger_1 = require("./logger/consoleLogger");
 const serializer_1 = require("./serializer/serializer");
 (async () => {
@@ -9,7 +9,7 @@ const serializer_1 = require("./serializer/serializer");
         const db = await new dbConnector_1.default()
             .connectionString('postgresql://postgres@127.0.0.1/migrator')
             .connect();
-        const usersTable = new usersTable_1.default(db);
+        const usersTable = new citiesTable_1.default(db);
         db.useLogger(new consoleLogger_1.default());
         const ser = new serializer_1.default();
         const res = ser.generate([usersTable], []);