drizzle-orm 0.9.2 → 0.9.6

package/columns/column.d.ts

@@ -2,21 +2,21 @@ import DB from '../db/db';
 import { AbstractTable } from '../tables';
 import ColumnType from './types/columnType';
 declare type ExtractColumnType<T extends ColumnType> = T extends ColumnType<infer TCodeType> ? TCodeType : never;
-declare type OnConstraint = OnDelete | OnUpdate;
 export declare enum OnDelete {
-    RESTRICT = 0,
-    CASCADE = 1
+    RESTRICT = "ON DELETE RESTRICT",
+    CASCADE = "ON DELETE CASCADE"
 }
 export declare enum OnUpdate {
-    RESTRICT = 0,
-    CASCADE = 1
+    RESTRICT = "ON UPDATE RESTRICT",
+    CASCADE = "ON UPDATE RESTRICT"
 }
 export declare abstract class AbstractColumn<T extends ColumnType, TNullable extends boolean = true, TAutoIncrement extends boolean = false> {
     isNullableFlag: TNullable;
     autoIncrementType: TAutoIncrement;
     primaryKeyName?: string;
     uniqueKeyName?: string;
-    protected onConstraint?: OnConstraint;
+    protected onDelete?: string;
+    protected onUpdate?: string;
     protected parent: AbstractTable<any>;
     protected parentTableName: string;
     protected columnType: T;
@@ -25,12 +25,14 @@ export declare abstract class AbstractColumn<T extends ColumnType, TNullable ext
     protected defaultParam: any;
     protected referenced: AbstractColumn<T, boolean, boolean>;
     constructor(parent: AbstractTable<any>, columnName: string, columnType: T, nullable: TNullable);
+    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>, onConstraint?: OnConstraint): AbstractColumn<T, TNullable, TAutoIncrement>;
+    }, callback: (table: ITable) => AbstractColumn<T, boolean, boolean>, onDelete?: OnDelete, onUpdate?: OnUpdate): AbstractColumn<T, TNullable, TAutoIncrement>;
     defaultValue: (value: ExtractColumnType<T>) => this;
     abstract autoIncrement(): AbstractColumn<T, boolean, boolean>;
     abstract primaryKey(): AbstractColumn<T, boolean, boolean>;
@@ -46,14 +48,14 @@ 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>, onConstraint?: OnConstraint): Column<T, TNullable, 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>;
     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>, onConstraint?: OnConstraint): IndexedColumn<T, TNullable, 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>;
     autoIncrement(): IndexedColumn<T, true, true>;
 }
 export {};

package/columns/column.js

@@ -3,19 +3,21 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.IndexedColumn = exports.Column = exports.AbstractColumn = exports.OnUpdate = exports.OnDelete = void 0;
 var OnDelete;
 (function (OnDelete) {
-    OnDelete[OnDelete["RESTRICT"] = 0] = "RESTRICT";
-    OnDelete[OnDelete["CASCADE"] = 1] = "CASCADE";
+    OnDelete["RESTRICT"] = "ON DELETE RESTRICT";
+    OnDelete["CASCADE"] = "ON DELETE CASCADE";
 })(OnDelete = exports.OnDelete || (exports.OnDelete = {}));
 var OnUpdate;
 (function (OnUpdate) {
-    OnUpdate[OnUpdate["RESTRICT"] = 0] = "RESTRICT";
-    OnUpdate[OnUpdate["CASCADE"] = 1] = "CASCADE";
+    OnUpdate["RESTRICT"] = "ON UPDATE RESTRICT";
+    OnUpdate["CASCADE"] = "ON UPDATE RESTRICT";
 })(OnUpdate = exports.OnUpdate || (exports.OnUpdate = {}));
 // eslint-disable-next-line max-len
 class AbstractColumn {
     constructor(parent, columnName, columnType, nullable) {
         this.autoIncrementFlag = false;
         this.defaultParam = null;
+        this.getOnDelete = () => this.onDelete;
+        this.getOnUpdate = () => this.onUpdate;
         this.getAlias = () => `${this.parentTableName.replace('.', '_')}_${this.columnName}`;
         this.getParent = () => this.parent;
         this.getParentName = () => this.parentTableName;
@@ -54,10 +56,11 @@ class Column extends AbstractColumn {
         // eslint-disable-next-line max-len
         return this;
     }
-    foreignKey(table, callback, onConstraint) {
+    foreignKey(table, callback, onDelete, onUpdate) {
         const tableInstance = this.getParent().db.create(table);
         this.referenced = callback(tableInstance);
-        this.onConstraint = onConstraint;
+        this.onDelete = onDelete;
+        this.onUpdate = onUpdate;
         return this;
     }
     autoIncrement() {
@@ -80,10 +83,11 @@ class IndexedColumn extends AbstractColumn {
         // eslint-disable-next-line max-len
         return this;
     }
-    foreignKey(table, callback, onConstraint) {
+    foreignKey(table, callback, onDelete, onUpdate) {
         // eslint-disable-next-line new-cap
         this.referenced = callback(this.getParent().db.create(table));
-        this.onConstraint = onConstraint;
+        this.onDelete = onDelete;
+        this.onUpdate = onUpdate;
         return this;
     }
     autoIncrement() {

package/package.json

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

package/serializer/serializer.d.ts

@@ -5,11 +5,13 @@ interface ColumnAsObject {
         name?: string;
         type?: string;
         primaryKey?: boolean;
-        autoincrement?: boolean;
         unique?: boolean;
         default?: any;
         notNull?: boolean;
         references?: {
+            foreignKeyName: string;
+            onDelete?: string;
+            onUpdate?: string;
             table: string;
             column: string;
         };

package/serializer/serializer.js

@@ -35,9 +35,8 @@ class MigrationSerializer {
                     if (value instanceof columns_1.Column) {
                         columnToReturn[key] = {
                             name: value.getColumnName(),
-                            type: value.getColumnType().getDbName(),
+                            type: value.isAutoIncrement() ? 'serial' : value.getColumnType().getDbName(),
                             primaryKey: !!value.primaryKeyName,
-                            autoincrement: value.isAutoIncrement(),
                             unique: !!value.uniqueKeyName,
                             default: value.getDefaultValue() === null ? undefined : value.getDefaultValue(),
                             notNull: !value.isNullableFlag,
@@ -45,8 +44,11 @@ class MigrationSerializer {
                         const referenced = value.getReferenced();
                         if (referenced) {
                             columnToReturn[key].references = {
+                                foreignKeyName: `${value.getParent().tableName()}_${value.getColumnName()}_fk`,
                                 table: referenced.getParentName(),
                                 column: referenced.getColumnName(),
+                                onDelete: value.getOnDelete(),
+                                onUpdate: value.getOnUpdate(),
                             };
                         }
                     }