drizzle-orm 0.9.6 → 0.9.10

package/builders/aggregators/insertAggregator.d.ts

@@ -1,6 +1,6 @@
 import { AbstractTable } from '../../tables';
 import { Indexing } from '../../tables/inferTypes';
-import UpdateExpr from '../requestBuilders/updates/updates';
+import { UpdateExpr } from '../requestBuilders/updates/updates';
 import Aggregator from './abstractAggregator';
 export default class InsertAggregator extends Aggregator {
     private _onConflict;

package/builders/aggregators/updateAggregator.d.ts

@@ -1,5 +1,5 @@
 import { AbstractTable } from '../../tables';
-import UpdateExpr from '../requestBuilders/updates/updates';
+import { UpdateExpr } from '../requestBuilders/updates/updates';
 import Expr from '../requestBuilders/where/where';
 import Aggregator from './abstractAggregator';
 export default class UpdateAggregator extends Aggregator {

package/builders/highLvlBuilders/updateRequestBuilder.d.ts

@@ -3,7 +3,7 @@ import ColumnType from '../../columns/types/columnType';
 import Session from '../../db/session';
 import BaseLogger from '../../logger/abstractLogger';
 import { AbstractTable } from '../../tables';
-import { ExtractModel } from '../../tables/inferTypes';
+import { ExtractModel, ExtractUpdateModel } from '../../tables/inferTypes';
 import Expr from '../requestBuilders/where/where';
 import TableRequestBuilder from './abstractRequestBuilder';
 export default class UpdateTRB<TTable extends AbstractTable<TTable>> extends TableRequestBuilder<TTable> {
@@ -14,7 +14,7 @@ export default class UpdateTRB<TTable extends AbstractTable<TTable>> extends Tab
         [name in keyof ExtractModel<TTable>]: AbstractColumn<ColumnType>;
     }, logger?: BaseLogger);
     where: (expr: Expr) => UpdateTRB<TTable>;
-    set: (expr: Partial<ExtractModel<TTable>>) => UpdateTRB<TTable>;
+    set: (expr: Partial<ExtractUpdateModel<TTable>>) => UpdateTRB<TTable>;
     execute: () => Promise<void>;
     protected _execute: () => Promise<Array<ExtractModel<TTable> | undefined>>;
 }

package/builders/highLvlBuilders/updateRequestBuilder.js

@@ -5,6 +5,7 @@ const dbErrors_1 = require("../../errors/dbErrors");
 const responseMapper_1 = require("../../mappers/responseMapper");
 const update_1 = require("../lowLvlBuilders/updates/update");
 const static_1 = require("../requestBuilders/updates/static");
+const updates_1 = require("../requestBuilders/updates/updates");
 const abstractRequestBuilder_1 = require("./abstractRequestBuilder");
 class UpdateTRB extends abstractRequestBuilder_1.default {
     constructor(table, session, mappedServiceToDb, logger) {
@@ -17,7 +18,13 @@ class UpdateTRB extends abstractRequestBuilder_1.default {
             const updates = [];
             Object.entries(expr).forEach(([key, value]) => {
                 const column = this._mappedServiceToDb[key];
-                updates.push(static_1.set(column, value));
+                if (value instanceof updates_1.UpdateCustomExpr) {
+                    value.setColumn(column);
+                    updates.push(value);
+                }
+                else {
+                    updates.push(static_1.set(column, value));
+                }
             });
             this._update = static_1.combine(updates);
             return this;

package/builders/lowLvlBuilders/inserts/onConflictInsert.d.ts

@@ -1,6 +1,6 @@
 import { Indexing } from '../../../tables/inferTypes';
 import InsertAggregator from '../../aggregators/insertAggregator';
-import UpdateExpr from '../../requestBuilders/updates/updates';
+import { UpdateExpr } from '../../requestBuilders/updates/updates';
 export default class OnConflictInsert {
     private _aggregator;
     constructor(aggregator: InsertAggregator);

package/builders/lowLvlBuilders/inserts/valuesInsert.d.ts

@@ -1,6 +1,6 @@
 import { Indexing } from '../../../tables/inferTypes';
 import InsertAggregator from '../../aggregators/insertAggregator';
-import UpdateExpr from '../../requestBuilders/updates/updates';
+import { UpdateExpr } from '../../requestBuilders/updates/updates';
 import OnConflictInsert from './onConflictInsert';
 export default class ValuesInsert {
     private _aggregator;

package/builders/lowLvlBuilders/updates/updateIn.d.ts

@@ -1,5 +1,5 @@
 import UpdateAggregator from '../../aggregators/updateAggregator';
-import UpdateExpr from '../../requestBuilders/updates/updates';
+import { UpdateExpr } from '../../requestBuilders/updates/updates';
 import WhereSet from './whereSet';
 export default class UpdateIn {
     private _aggregator;

package/builders/lowLvlBuilders/updates/whereSet.d.ts

@@ -1,5 +1,5 @@
 import UpdateAggregator from '../../aggregators/updateAggregator';
-import UpdateExpr from '../../requestBuilders/updates/updates';
+import { UpdateExpr } from '../../requestBuilders/updates/updates';
 import Expr from '../../requestBuilders/where/where';
 import WhereSelect from './whereSelect';
 export default class WhereSet<SERVICE, DB> {

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

@@ -1,4 +1,4 @@
-import UpdateExpr from './updates';
+import { UpdateExpr } from './updates';
 export default class Combine extends UpdateExpr {
     private _setters;
     constructor(setters: Array<UpdateExpr>);

package/builders/requestBuilders/updates/combine.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const updates_1 = require("./updates");
-class Combine extends updates_1.default {
+class Combine extends updates_1.UpdateExpr {
     constructor(setters) {
         super();
         this.toQuery = () => {

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

@@ -0,0 +1,10 @@
+import { AbstractColumn } from '../../../columns/column';
+import ColumnType from '../../../columns/types/columnType';
+import { UpdateCustomExpr } from './updates';
+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: () => string;
+}

package/builders/requestBuilders/updates/increment.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const updates_1 = require("./updates");
+class Increment extends updates_1.UpdateCustomExpr {
+    constructor(value) {
+        super();
+        this.setColumn = (column) => {
+            this._column = column;
+            return this;
+        };
+        this.toQuery = () => `${this._column.getColumnName()} = ${this._column.getColumnName()} + ${this._value}`;
+        this._value = value;
+    }
+}
+exports.default = Increment;

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

@@ -1,6 +1,6 @@
 import { AbstractColumn } from '../../../columns/column';
 import ColumnType from '../../../columns/types/columnType';
-import UpdateExpr from './updates';
+import { UpdateExpr } from './updates';
 export default class SetObject<T extends AbstractColumn<ColumnType<any>, boolean, boolean>> extends UpdateExpr {
     private _column;
     private _value;

package/builders/requestBuilders/updates/setObjects.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const updates_1 = require("./updates");
-class SetObject extends updates_1.default {
+class SetObject extends updates_1.UpdateExpr {
     constructor(column, value) {
         super();
         this.toQuery = () => `"${this._column.getColumnName()}"=${this._value === null || this._value === undefined ? 'null' : this._column.getColumnType().insertStrategy(this._value)}`;

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

@@ -1,6 +1,7 @@
 import { AbstractColumn } from '../../../columns/column';
 import ColumnType from '../../../columns/types/columnType';
 import { ExtractCodeType } from '../../../tables/inferTypes';
-import UpdateExpr from './updates';
+import { UpdateCustomExpr, UpdateExpr } from './updates';
 export declare const set: <T extends AbstractColumn<ColumnType<any>, boolean, boolean>>(column: T, value: ExtractCodeType<T>) => UpdateExpr;
+export declare const incrementBy: <T extends AbstractColumn<ColumnType<any>, boolean, boolean>>(value: number) => UpdateCustomExpr<T>;
 export declare const combine: (updates: Array<UpdateExpr>) => UpdateExpr;

package/builders/requestBuilders/updates/static.js

@@ -1,9 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.combine = exports.set = void 0;
+exports.combine = exports.incrementBy = exports.set = void 0;
 const combine_1 = require("./combine");
+const increment_1 = require("./increment");
 const setObjects_1 = require("./setObjects");
 const set = (column, value) => new setObjects_1.default(column, value);
 exports.set = set;
+const incrementBy = (value) => new increment_1.default(value);
+exports.incrementBy = incrementBy;
 const combine = (updates) => new combine_1.default(updates);
 exports.combine = combine;

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

@@ -1,3 +1,6 @@
-export default abstract class UpdateExpr {
+export declare abstract class UpdateExpr {
     abstract toQuery(): string;
 }
+export declare abstract class UpdateCustomExpr<T> extends UpdateExpr {
+    abstract setColumn(column: T): UpdateCustomExpr<T>;
+}

package/builders/requestBuilders/updates/updates.js

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

package/columns/column.d.ts

@@ -32,7 +32,10 @@ export declare abstract class AbstractColumn<T extends ColumnType, TNullable ext
     getParentName: () => string;
     abstract foreignKey<ITable extends AbstractTable<ITable>>(table: {
         new (db: DB): ITable;
-    }, callback: (table: ITable) => AbstractColumn<T, boolean, boolean>, onDelete?: OnDelete, onUpdate?: OnUpdate): AbstractColumn<T, TNullable, TAutoIncrement>;
+    }, callback: (table: ITable) => AbstractColumn<T, boolean, boolean>, onConstraint: {
+        onDelete?: 'CASCADE' | 'RESTRICT';
+        onUpdate?: 'CASCADE' | 'RESTRICT';
+    }): AbstractColumn<T, TNullable, TAutoIncrement>;
     defaultValue: (value: ExtractColumnType<T>) => this;
     abstract autoIncrement(): AbstractColumn<T, boolean, boolean>;
     abstract primaryKey(): AbstractColumn<T, boolean, boolean>;
@@ -48,14 +51,20 @@ export declare class Column<T extends ColumnType, TNullable extends boolean = tr
     constructor(parent: AbstractTable<any>, columnName: string, columnType: T, nullable: TNullable);
     serial(): Column<T, false, true>;
     primaryKey(): Column<T, TAutoIncrement extends true ? true : false, TAutoIncrement>;
-    foreignKey<ITable extends AbstractTable<ITable>>(table: new (db: DB) => ITable, callback: (table: ITable) => Column<T, boolean, boolean>, onDelete?: OnDelete, onUpdate?: OnUpdate): Column<T, TNullable, TAutoIncrement>;
+    foreignKey<ITable extends AbstractTable<ITable>>(table: new (db: DB) => ITable, callback: (table: ITable) => Column<T, boolean, boolean>, onConstraint?: {
+        onDelete?: 'CASCADE' | 'RESTRICT';
+        onUpdate?: 'CASCADE' | 'RESTRICT';
+    }): Column<T, TNullable, TAutoIncrement>;
     autoIncrement(): IndexedColumn<T, true, true>;
 }
 export declare class IndexedColumn<T extends ColumnType, TNullable extends boolean = true, TAutoIncrement extends boolean = false> extends AbstractColumn<T, TNullable, TAutoIncrement> {
     constructor(parent: AbstractTable<any>, columnName: string, columnType: T, nullable: TNullable);
     serial(): IndexedColumn<T, false, true>;
     primaryKey(): IndexedColumn<T, TAutoIncrement extends true ? true : false, TAutoIncrement>;
-    foreignKey<ITable extends AbstractTable<ITable>>(table: new (db: DB) => ITable, callback: (table: ITable) => IndexedColumn<T, boolean, boolean>, onDelete?: OnDelete, onUpdate?: OnUpdate): IndexedColumn<T, TNullable, TAutoIncrement>;
+    foreignKey<ITable extends AbstractTable<ITable>>(table: new (db: DB) => ITable, callback: (table: ITable) => IndexedColumn<T, boolean, boolean>, onConstraint?: {
+        onDelete?: 'CASCADE' | 'RESTRICT';
+        onUpdate?: 'CASCADE' | 'RESTRICT';
+    }): IndexedColumn<T, TNullable, TAutoIncrement>;
     autoIncrement(): IndexedColumn<T, true, true>;
 }
 export {};

package/columns/column.js

@@ -56,11 +56,11 @@ class Column extends AbstractColumn {
         // eslint-disable-next-line max-len
         return this;
     }
-    foreignKey(table, callback, onDelete, onUpdate) {
+    foreignKey(table, callback, onConstraint) {
         const tableInstance = this.getParent().db.create(table);
         this.referenced = callback(tableInstance);
-        this.onDelete = onDelete;
-        this.onUpdate = onUpdate;
+        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;
     }
     autoIncrement() {
@@ -83,11 +83,11 @@ class IndexedColumn extends AbstractColumn {
         // eslint-disable-next-line max-len
         return this;
     }
-    foreignKey(table, callback, onDelete, onUpdate) {
+    foreignKey(table, callback, onConstraint) {
         // eslint-disable-next-line new-cap
         this.referenced = callback(this.getParent().db.create(table));
-        this.onDelete = onDelete;
-        this.onUpdate = onUpdate;
+        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;
     }
     autoIncrement() {

package/docs/tables/citiesTable.d.ts

@@ -5,10 +5,10 @@ interface CityMeta {
 }
 export default class CitiesTable extends AbstractTable<CitiesTable> {
     id: import("../../columns/column").IndexedColumn<import("../..").PgInteger, true, true>;
-    foundationDate: import("../../columns/column").Column<import("../..").PgTimestamp, false, false>;
-    location: import("../../columns/column").Column<import("../..").PgVarChar, true, false>;
-    userId: import("../../columns/column").Column<import("../..").PgInteger, true, false>;
-    metadata: import("../../columns/column").Column<import("../..").PgJsonb<CityMeta>, true, false>;
+    foundationDate: import("../..").Column<import("../..").PgTimestamp, false, false>;
+    location: import("../..").Column<import("../..").PgVarChar, true, false>;
+    userId: import("../..").Column<import("../..").PgInteger, true, false>;
+    metadata: import("../..").Column<import("../..").PgJsonb<CityMeta>, true, false>;
     tableName(): string;
 }
 export {};

package/docs/tables/citiesTable.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const column_1 = require("../../columns/column");
 const abstractTable_1 = require("../../tables/abstractTable");
 const usersTable_1 = require("./usersTable");
 class CitiesTable extends abstractTable_1.default {
@@ -9,7 +8,7 @@ class CitiesTable extends abstractTable_1.default {
         this.id = this.int('id').autoIncrement().primaryKey();
         this.foundationDate = this.timestamp('name', { notNull: true });
         this.location = this.varchar('page', { size: 256 });
-        this.userId = this.int('user_id').foreignKey(usersTable_1.default, (table) => table.id, column_1.OnDelete.CASCADE);
+        this.userId = this.int('user_id').foreignKey(usersTable_1.default, (table) => table.id, { onUpdate: 'CASCADE' });
         this.metadata = this.jsonb('metadata');
     }
     tableName() {

package/docs/tables/usersToUserGroups.d.ts

@@ -1,7 +1,7 @@
 import AbstractTable from '../../tables/abstractTable';
 export default class UsersToUserGroupsTable extends AbstractTable<UsersToUserGroupsTable> {
-    groupId: import("../../columns/column").Column<import("../..").PgInteger, true, false>;
-    userId: import("../../columns/column").Column<import("../..").PgInteger, true, false>;
+    groupId: import("../..").Column<import("../..").PgInteger, true, false>;
+    userId: import("../..").Column<import("../..").PgInteger, true, false>;
     manyToManyIndex: import("../../indexes/tableIndex").default;
     tableName(): string;
 }

package/docs/tables/usersToUserGroups.js

@@ -1,14 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const column_1 = require("../../columns/column");
 const abstractTable_1 = require("../../tables/abstractTable");
 const userGroupsTable_1 = require("./userGroupsTable");
 const usersTable_1 = require("./usersTable");
 class UsersToUserGroupsTable extends abstractTable_1.default {
     constructor() {
         super(...arguments);
-        this.groupId = this.int('city_id').foreignKey(userGroupsTable_1.default, (table) => table.id, column_1.OnDelete.CASCADE);
-        this.userId = this.int('user_id').foreignKey(usersTable_1.default, (table) => table.id, column_1.OnDelete.CASCADE);
+        this.groupId = this.int('city_id').foreignKey(userGroupsTable_1.default, (table) => table.id, { onDelete: 'CASCADE' });
+        this.userId = this.int('user_id').foreignKey(usersTable_1.default, (table) => table.id, { onDelete: 'CASCADE' });
         this.manyToManyIndex = this.index([this.groupId, this.userId]);
     }
     tableName() {

package/package.json

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

package/serializer/serializer.js

@@ -15,7 +15,6 @@ class MigrationSerializer {
                 const columnToReturn = {};
                 const indexToReturn = {};
                 for (const properties of tableEntries) {
-                    const key = properties[0];
                     const value = properties[1];
                     if (value instanceof tableIndex_1.default) {
                         const columns = value.getColumns();
@@ -33,7 +32,7 @@ class MigrationSerializer {
                         };
                     }
                     if (value instanceof columns_1.Column) {
-                        columnToReturn[key] = {
+                        columnToReturn[value.getColumnName()] = {
                             name: value.getColumnName(),
                             type: value.isAutoIncrement() ? 'serial' : value.getColumnType().getDbName(),
                             primaryKey: !!value.primaryKeyName,
@@ -43,7 +42,7 @@ class MigrationSerializer {
                         };
                         const referenced = value.getReferenced();
                         if (referenced) {
-                            columnToReturn[key].references = {
+                            columnToReturn[value.getColumnName()].references = {
                                 foreignKeyName: `${value.getParent().tableName()}_${value.getColumnName()}_fk`,
                                 table: referenced.getParentName(),
                                 column: referenced.getColumnName(),

package/tables/abstractTable.d.ts

@@ -82,14 +82,34 @@ export default abstract class AbstractTable<TTable extends AbstractTable<TTable>
         notNull: true;
     }): Column<PgEnum<ExtractEnumValues<Enum<ETtype>>>, false>;
     protected decimal(name: string, params?: {
-        notNull: false;
-        precision: number;
+        precision?: number;
         scale: number;
+        notNull?: false;
     }): Column<PgBigDecimal, true>;
     protected decimal(name: string, params: {
-        notNull: true;
-        precision: number;
+        precision?: number;
         scale: number;
+        notNull?: true;
+    }): Column<PgBigDecimal, false>;
+    protected decimal(name: string, params?: {
+        precision: number;
+        scale?: number;
+        notNull?: false;
+    }): Column<PgBigDecimal, true>;
+    protected decimal(name: string, params: {
+        precision: number;
+        scale?: number;
+        notNull?: true;
+    }): Column<PgBigDecimal, false>;
+    protected decimal(name: string, params?: {
+        precision?: number;
+        scale?: number;
+        notNull?: false;
+    }): Column<PgBigDecimal, true>;
+    protected decimal(name: string, params: {
+        precision?: number;
+        scale?: number;
+        notNull?: true;
     }): Column<PgBigDecimal, false>;
     protected time(name: string, params?: {
         notNull: false;

package/tables/inferTypes.d.ts

@@ -1,3 +1,4 @@
+import { UpdateCustomExpr } from '../builders/requestBuilders/updates/updates';
 import { AbstractColumn, Column, IndexedColumn } from '../columns/column';
 import ColumnType from '../columns/types/columnType';
 import TableIndex from '../indexes/tableIndex';
@@ -13,6 +14,11 @@ export declare type ExtractModel<TTable> = {
 } & {
     [Key in ExtractOptionalFieldNames<TTable>]?: ExtractCodeType<TTable[Key]>;
 };
+export declare type ExtractUpdateModel<TTable> = {
+    [Key in ExtractFieldNames<TTable>]: ExtractCodeType<TTable[Key]> | UpdateCustomExpr<TTable[Key]>;
+} & {
+    [Key in ExtractOptionalFieldNames<TTable>]?: ExtractCodeType<TTable[Key]> | UpdateCustomExpr<TTable[Key]>;
+};
 export declare type ExtractCodeType<T extends AbstractColumn<ColumnType<any>, boolean, boolean>> = T extends AbstractColumn<ColumnType<infer TCodeType>, infer TNullable, infer TAutoIncrement> ? TCodeType : never;
 export declare type ExtractTypeEnum<T extends Type<any>> = T extends Type<infer TEnum> ? TEnum : never;
 export declare type Indexing = IndexedColumn<ColumnType, boolean, boolean> | TableIndex;

package/test.js

@@ -1,8 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const _1 = require(".");
-const usersTable_1 = require("./docs/tables/usersTable");
-const serializer_1 = require("./serializer/serializer");
 // import { Pool } from 'pg';
 // import { DB } from '.';
 // import { DB, DbConnector } from '.';
@@ -20,12 +18,14 @@ const fromTypeFile = (filepath) => {
 (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();
-        const ser = new serializer_1.default();
-        const d = db.create(usersTable_1.default);
-        const f = ser.generate([d], []);
-        console.log(JSON.stringify(f, null, 2));
+        // const ser = new MigrationSerializer();
+        // const d = db.create(UsersTable) as unknown as AbstractTable<any>;
+        // const f = ser.generate([d], []);
+        // console.log(JSON.stringify(f, null, 2));
+        // await drizzle.migrator(db).migrate('src/drizzle.config.yaml');
+        // drizzle.migrator(db).migrate({ migrationFolder: '' });
         // const typesFileNames = fs.readdirSync('/Users/andrewsherman/IdeaProjects/datalayer-orm/src/examples/types');
         // typesFileNames.forEach((filename) => {
         //   const types = fromTypeFile(`./examples/types/${filename.split('.')[0]}`);