drizzle-orm 0.9.15 → 0.9.16

package/README.md

@@ -60,17 +60,20 @@ const db = await new DbConnector()
 export const rolesEnum = createEnum({ alias: 'test-enum', values: ['user', 'guest', 'admin'] });
 
 export default class UsersTable extends AbstractTable<UsersTable> {
-  public id = this.int('id').autoIncrement().primaryKey();
+  public id = this.serial('id').primaryKey();
   public fullName = this.text('full_name');
 
   public phone = this.varchar('phone', { size: 256 });
   public media = this.jsonb<string[]>('media');
-  public decimalField = this.decimal('test', { notNull: true, precision: 100, scale: 2 });
-  public bigIntField = this.bigint('test1');
-  public role = this.type(rolesEnum, 'name_in_table', { notNull: true });
+  public decimalField = this.decimal('test', { precision: 100, scale: 2 }).notNull();
+  public bigIntField = this.bigint('test1', 'max_bytes_53');
+  public role = this.type(rolesEnum, 'name_in_table').notNull();
 
-  public createdAt = this.timestamp('created_at', { notNull: true });
-  public updatedAt = this.timestamp('updated_at');
+  public createdAt = this.timestamp('created_at').notNull();
+
+  public createdAtWithTimezone = this.timestamptz('created_at_time_zone');
+
+  public updatedAt = this.timestamp('updated_at').defaultValue(Defaults.CURRENT_TIMESTAMP);
   public isArchived = this.bool('is_archived').defaultValue(false);
 
   public phoneFullNameIndex = this.index([this.phone, this.fullName]);
@@ -90,12 +93,12 @@ interface CityMeta {
 }
 
 export default class CitiesTable extends AbstractTable<CitiesTable> {
-  public id = this.int('id').autoIncrement().primaryKey();
+  public id = this.serial('id').primaryKey();
 
-  public foundationDate = this.timestamp('name', { notNull: true });
+  public foundationDate = this.timestamp('name').notNull();
   public location = this.varchar('page', { size: 256 });
 
-  public userId = this.int('user_id').foreignKey(UsersTable, (table) => table.id, OnDelete.CASCADE);
+  public userId = this.int('user_id').foreignKey(UsersTable, (table) => table.id, { onUpdate: 'CASCADE' });
 
   public metadata = this.jsonb<CityMeta>('metadata');
 
@@ -108,7 +111,7 @@ export default class CitiesTable extends AbstractTable<CitiesTable> {
 ---
 ```typescript
 export default class UserGroupsTable extends AbstractTable<UserGroupsTable> {
-  public id = this.int('id').autoIncrement().primaryKey();
+  public id = this.serial('id').primaryKey();
 
   public name = this.varchar('name');
   public description = this.varchar('description');
@@ -123,8 +126,8 @@ export default class UserGroupsTable extends AbstractTable<UserGroupsTable> {
 #### Many to many connection between Users and User Groups
 ```typescript
 export default class UsersToUserGroupsTable extends AbstractTable<UsersToUserGroupsTable> {
-  public groupId = this.int('city_id').foreignKey(UserGroupsTable, (table) => table.id, OnDelete.CASCADE);
-  public userId = this.int('user_id').foreignKey(UsersTable, (table) => table.id, OnDelete.CASCADE);
+  public groupId = this.int('city_id').foreignKey(UserGroupsTable, (table) => table.id, { onDelete: 'CASCADE' });
+  public userId = this.int('user_id').foreignKey(UsersTable, (table) => table.id, { onDelete: 'CASCADE' });
 
   public manyToManyIndex = this.index([this.groupId, this.userId]);
 
@@ -382,4 +385,15 @@ const citiesWithUserObject = userWithCities.map((city, user) => ({ ...city, user
       ...userGroupWithUsers.one,
       users: userGroupWithUsers.many,
     };
+```
+
+## Migrations
+#### To run migrations generated by drizzle-kit you could use `Migtator` class
+##### Provide drizzle-kit config path
+```typescript
+await drizzle.migrator(db).migrate('src/drizzle.config.yaml');
+```
+##### Provide object with path to folder with migrations
+```typescript
+await drizzle.migrator(db).migrate({ migrationFolder: 'drizzle' });
 ```

package/builders/lowLvlBuilders/create.js

@@ -38,7 +38,7 @@ class Create {
                     }
                     this.columnsBuilder.push(ecranate_1.ecranate(column.getColumnName()));
                     this.columnsBuilder.push(' ');
-                    this.columnsBuilder.push(column.isAutoIncrement() ? 'SERIAL' : column.getColumnType().getDbName());
+                    this.columnsBuilder.push(column.getColumnType().getDbName());
                     this.columnsBuilder.push(' ');
                     this.columnsBuilder.push(column.getDefaultValue() != null ? `DEFAULT ${column.getColumnType().insertStrategy(column.getDefaultValue())}` : '');
                     this.columnsBuilder.push(column.isNullableFlag ? '' : ' NOT NULL');

package/columns/column.d.ts

@@ -1,18 +1,15 @@
+import { PgTime, PgTimestamp } from '.';
 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;
-export declare enum OnDelete {
-    RESTRICT = "ON DELETE RESTRICT",
-    CASCADE = "ON DELETE CASCADE"
-}
-export declare enum OnUpdate {
-    RESTRICT = "ON UPDATE RESTRICT",
-    CASCADE = "ON UPDATE RESTRICT"
+import PgTimestamptz from './types/pgTimestamptz';
+export declare enum Defaults {
+    CURRENT_TIMESTAMP = "CURRENT_TIMESTAMP"
 }
+declare type PgTimes = PgTimestamptz | PgTime | PgTimestamp;
+export declare type ExtractColumnType<T extends ColumnType> = T extends ColumnType<infer TCodeType> ? T extends PgTimes ? TCodeType | Defaults : TCodeType : never;
 export declare abstract class AbstractColumn<T extends ColumnType, TNullable extends boolean = true, TAutoIncrement extends boolean = false> {
-    isNullableFlag: TNullable;
-    autoIncrementType: TAutoIncrement;
+    isNullableFlag: boolean;
     primaryKeyName?: string;
     uniqueKeyName?: string;
     protected onDelete?: string;
@@ -21,10 +18,9 @@ export declare abstract class AbstractColumn<T extends ColumnType, TNullable ext
     protected parentTableName: string;
     protected columnType: T;
     protected columnName: string;
-    protected autoIncrementFlag: boolean;
     protected defaultParam: any;
     protected referenced: AbstractColumn<T, boolean, boolean>;
-    constructor(parent: AbstractTable<any>, columnName: string, columnType: T, nullable: TNullable);
+    constructor(parent: AbstractTable<any>, columnName: string, columnType: T);
     getOnDelete: () => string | undefined;
     getOnUpdate: () => string | undefined;
     getAlias: () => string;
@@ -33,38 +29,34 @@ export declare abstract class AbstractColumn<T extends ColumnType, TNullable ext
     abstract foreignKey<ITable extends AbstractTable<ITable>>(table: {
         new (db: DB): ITable;
     }, callback: (table: ITable) => AbstractColumn<T, boolean, boolean>, onConstraint: {
-        onDelete?: 'CASCADE' | 'RESTRICT';
-        onUpdate?: 'CASCADE' | 'RESTRICT';
+        onDelete?: 'CASCADE' | 'RESTRICT' | 'SET NULL' | 'SET DEFAULT';
+        onUpdate?: 'CASCADE' | 'RESTRICT' | 'SET NULL' | 'SET DEFAULT';
     }): AbstractColumn<T, TNullable, TAutoIncrement>;
     defaultValue: (value: ExtractColumnType<T>) => this;
-    abstract autoIncrement(): AbstractColumn<T, boolean, boolean>;
     abstract primaryKey(): AbstractColumn<T, boolean, boolean>;
-    abstract serial(): AbstractColumn<T, boolean, boolean>;
     unique: () => this;
-    isAutoIncrement: () => boolean;
+    abstract notNull(): AbstractColumn<T, boolean, boolean>;
     getColumnName: () => string;
     getReferenced: () => AbstractColumn<T, boolean, boolean>;
     getColumnType: () => T;
     getDefaultValue: () => any;
 }
 export declare class Column<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(): Column<T, false, true>;
+    constructor(parent: AbstractTable<any>, columnName: string, columnType: T);
+    notNull(): Column<T, TAutoIncrement extends true ? true : TNullable extends true ? false : true, TAutoIncrement>;
     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?: {
-        onDelete?: 'CASCADE' | 'RESTRICT';
-        onUpdate?: 'CASCADE' | 'RESTRICT';
+        onDelete?: 'CASCADE' | 'RESTRICT' | 'SET NULL' | 'SET DEFAULT';
+        onUpdate?: 'CASCADE' | 'RESTRICT' | 'SET NULL' | 'SET DEFAULT';
     }): 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>;
+    notNull(): IndexedColumn<T, TAutoIncrement extends true ? true : TNullable extends true ? false : true, TAutoIncrement>;
     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?: {
-        onDelete?: 'CASCADE' | 'RESTRICT';
-        onUpdate?: 'CASCADE' | 'RESTRICT';
+        onDelete?: 'CASCADE' | 'RESTRICT' | 'SET NULL' | 'SET DEFAULT';
+        onUpdate?: 'CASCADE' | 'RESTRICT' | 'SET NULL' | 'SET DEFAULT';
     }): IndexedColumn<T, TNullable, TAutoIncrement>;
-    autoIncrement(): IndexedColumn<T, true, true>;
 }
 export {};

package/columns/column.js

@@ -1,20 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.IndexedColumn = exports.Column = exports.AbstractColumn = exports.OnUpdate = exports.OnDelete = void 0;
-var OnDelete;
-(function (OnDelete) {
-    OnDelete["RESTRICT"] = "ON DELETE RESTRICT";
-    OnDelete["CASCADE"] = "ON DELETE CASCADE";
-})(OnDelete = exports.OnDelete || (exports.OnDelete = {}));
-var OnUpdate;
-(function (OnUpdate) {
-    OnUpdate["RESTRICT"] = "ON UPDATE RESTRICT";
-    OnUpdate["CASCADE"] = "ON UPDATE RESTRICT";
-})(OnUpdate = exports.OnUpdate || (exports.OnUpdate = {}));
+exports.IndexedColumn = exports.Column = exports.AbstractColumn = exports.Defaults = void 0;
+var Defaults;
+(function (Defaults) {
+    Defaults["CURRENT_TIMESTAMP"] = "CURRENT_TIMESTAMP";
+})(Defaults = exports.Defaults || (exports.Defaults = {}));
 // eslint-disable-next-line max-len
 class AbstractColumn {
-    constructor(parent, columnName, columnType, nullable) {
-        this.autoIncrementFlag = false;
+    constructor(parent, columnName, columnType) {
+        this.isNullableFlag = true;
         this.defaultParam = null;
         this.getOnDelete = () => this.onDelete;
         this.getOnUpdate = () => this.onUpdate;
@@ -29,7 +23,6 @@ class AbstractColumn {
             this.uniqueKeyName = this.columnName;
             return this;
         };
-        this.isAutoIncrement = () => this.autoIncrementFlag;
         this.getColumnName = () => this.columnName;
         this.getReferenced = () => this.referenced;
         this.getColumnType = () => this.columnType;
@@ -38,17 +31,16 @@ class AbstractColumn {
         this.columnName = columnName;
         this.parentTableName = parent.tableName();
         this.parent = parent;
-        this.isNullableFlag = nullable;
     }
 }
 exports.AbstractColumn = AbstractColumn;
 // eslint-disable-next-line max-len
 class Column extends AbstractColumn {
-    constructor(parent, columnName, columnType, nullable) {
-        super(parent, columnName, columnType, nullable);
+    constructor(parent, columnName, columnType) {
+        super(parent, columnName, columnType);
     }
-    serial() {
-        this.autoIncrementFlag = true;
+    notNull() {
+        this.isNullableFlag = false;
         return this;
     }
     primaryKey() {
@@ -63,19 +55,15 @@ class Column extends AbstractColumn {
         this.onUpdate = (onConstraint === null || onConstraint === void 0 ? void 0 : onConstraint.onUpdate) ? `ON UPDATE ${onConstraint.onUpdate}` : undefined;
         return this;
     }
-    autoIncrement() {
-        this.autoIncrementFlag = true;
-        return this;
-    }
 }
 exports.Column = Column;
 // eslint-disable-next-line max-len
 class IndexedColumn extends AbstractColumn {
     constructor(parent, columnName, columnType, nullable) {
-        super(parent, columnName, columnType, nullable);
+        super(parent, columnName, columnType);
     }
-    serial() {
-        this.autoIncrementFlag = true;
+    notNull() {
+        this.isNullableFlag = false;
         return this;
     }
     primaryKey() {
@@ -90,9 +78,5 @@ class IndexedColumn extends AbstractColumn {
         this.onUpdate = (onConstraint === null || onConstraint === void 0 ? void 0 : onConstraint.onUpdate) ? `ON UPDATE ${onConstraint.onUpdate}` : undefined;
         return this;
     }
-    autoIncrement() {
-        this.autoIncrementFlag = true;
-        return this;
-    }
 }
 exports.IndexedColumn = IndexedColumn;

package/columns/index.d.ts

@@ -1,4 +1,4 @@
-export { Column } from './column';
+export { Column, ExtractColumnType, Defaults } from './column';
 export { default as PgBigDecimal } from './types/pgBigDecimal';
 export { default as PgBigInt } from './types/pgBigInt';
 export { default as PgBoolean } from './types/pgBoolean';

package/columns/index.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PgVarChar = exports.PgTimestamp = exports.PgTime = exports.PgText = exports.PgJsonb = exports.PgInteger = exports.PgBoolean = exports.PgBigInt = exports.PgBigDecimal = exports.Column = void 0;
+exports.PgVarChar = exports.PgTimestamp = exports.PgTime = exports.PgText = exports.PgJsonb = exports.PgInteger = exports.PgBoolean = exports.PgBigInt = exports.PgBigDecimal = exports.Defaults = exports.Column = void 0;
 var column_1 = require("./column");
 Object.defineProperty(exports, "Column", { enumerable: true, get: function () { return column_1.Column; } });
+Object.defineProperty(exports, "Defaults", { enumerable: true, get: function () { return column_1.Defaults; } });
 var pgBigDecimal_1 = require("./types/pgBigDecimal");
 Object.defineProperty(exports, "PgBigDecimal", { enumerable: true, get: function () { return pgBigDecimal_1.default; } });
 var pgBigInt_1 = require("./types/pgBigInt");

package/columns/types/pgBigInt.d.ts

@@ -1,8 +1,15 @@
 import ColumnType from './columnType';
-export default class PgBigInt extends ColumnType<number> {
+export default class PgBigInt53 extends ColumnType<number> {
     dbName: string;
     constructor();
-    getDbName(): string;
+    getDbName: () => string;
     insertStrategy: (value: number) => string;
     selectStrategy(value: string): number | undefined;
 }
+export declare class PgBigInt64 extends ColumnType<bigint> {
+    dbName: string;
+    constructor();
+    getDbName: () => string;
+    insertStrategy: (value: bigint) => string;
+    selectStrategy(value: string): bigint | undefined;
+}

package/columns/types/pgBigInt.js

@@ -1,17 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.PgBigInt64 = void 0;
+// eslint-disable-next-line max-classes-per-file
 const columnType_1 = require("./columnType");
-class PgBigInt extends columnType_1.default {
+class PgBigInt53 extends columnType_1.default {
     constructor() {
         super();
+        this.getDbName = () => this.dbName;
         this.insertStrategy = (value) => `${value}`;
         this.dbName = 'BIGINT';
     }
-    getDbName() {
-        return this.dbName;
-    }
     selectStrategy(value) {
         return value ? parseInt(value, 10) : undefined;
     }
 }
-exports.default = PgBigInt;
+exports.default = PgBigInt53;
+class PgBigInt64 extends columnType_1.default {
+    constructor() {
+        super();
+        this.getDbName = () => this.dbName;
+        this.insertStrategy = (value) => `${value}`;
+        this.dbName = 'BIGINT';
+    }
+    selectStrategy(value) {
+        return value ? BigInt(value) : undefined;
+    }
+}
+exports.PgBigInt64 = PgBigInt64;

package/columns/types/pgBigSerial.d.ts

@@ -0,0 +1,15 @@
+import ColumnType from './columnType';
+export default class PgBigSerial53 extends ColumnType<number> {
+    dbName: string;
+    constructor();
+    getDbName: () => string;
+    insertStrategy: (value: number) => string;
+    selectStrategy(value: string): number | undefined;
+}
+export declare class PgBigSerial64 extends ColumnType<bigint> {
+    dbName: string;
+    constructor();
+    getDbName: () => string;
+    insertStrategy: (value: bigint) => string;
+    selectStrategy(value: string): bigint | undefined;
+}

package/columns/types/pgBigSerial.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PgBigSerial64 = void 0;
+/* eslint-disable max-classes-per-file */
+const columnType_1 = require("./columnType");
+class PgBigSerial53 extends columnType_1.default {
+    constructor() {
+        super();
+        this.getDbName = () => this.dbName;
+        this.insertStrategy = (value) => `${value}`;
+        this.dbName = 'BIGSERIAL';
+    }
+    selectStrategy(value) {
+        return value ? parseInt(value, 10) : undefined;
+    }
+}
+exports.default = PgBigSerial53;
+class PgBigSerial64 extends columnType_1.default {
+    constructor() {
+        super();
+        this.getDbName = () => this.dbName;
+        this.insertStrategy = (value) => `${value}`;
+        this.dbName = 'BIGSERIAL';
+    }
+    selectStrategy(value) {
+        return value ? BigInt(value) : undefined;
+    }
+}
+exports.PgBigSerial64 = PgBigSerial64;

package/columns/types/pgSerial.d.ts

@@ -0,0 +1,8 @@
+import ColumnType from './columnType';
+export default class PgSerial extends ColumnType<number> {
+    dbName: string;
+    constructor();
+    getDbName: () => string;
+    insertStrategy: (value: number) => string;
+    selectStrategy(value: string): number | undefined;
+}

package/columns/types/pgSerial.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const columnType_1 = require("./columnType");
+class PgSerial extends columnType_1.default {
+    constructor() {
+        super();
+        this.getDbName = () => this.dbName;
+        this.insertStrategy = (value) => `${value}`;
+        this.dbName = 'SERIAL';
+    }
+    selectStrategy(value) {
+        return value ? parseInt(value, 10) : undefined;
+    }
+}
+exports.default = PgSerial;

package/columns/types/pgTimestamptz.d.ts

@@ -0,0 +1,8 @@
+import ColumnType from './columnType';
+export default class PgTimestamptz extends ColumnType<Date> {
+    dbName: string;
+    constructor();
+    getDbName: () => string;
+    insertStrategy: (value: Date) => string;
+    selectStrategy(value: any): Date;
+}

package/columns/types/pgTimestamptz.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const columnType_1 = require("./columnType");
+class PgTimestamptz extends columnType_1.default {
+    constructor() {
+        super();
+        this.getDbName = () => this.dbName;
+        this.insertStrategy = (value) => `'${value.toISOString()}'`;
+        this.dbName = 'timestamp with time zone';
+    }
+    selectStrategy(value) {
+        return value;
+    }
+}
+exports.default = PgTimestamptz;

package/docs/cases/simple_join.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+/* eslint-disable max-len */
 /* eslint-disable @typescript-eslint/no-unused-vars */
 const __1 = require("../..");
 const builders_1 = require("../../builders");

package/docs/cases/simple_select.js

@@ -27,7 +27,7 @@ const usersTable_1 = require("../tables/usersTable");
         const greaterSelect = usersTable.select().where(static_1.greater(usersTable.bigIntField, 3)).all();
         const lessSelect = usersTable.select().where(static_1.less(usersTable.bigIntField, 3)).all();
         const greaterEqSelect = usersTable.select().where(static_1.greaterEq(usersTable.bigIntField, 3)).all();
-        const lessEqSelect = usersTable.select().where(static_1.lessEq(usersTable.bigIntField, 3)).all();
+        const lessEqSelect = usersTable.select().where(static_1.lessEq(usersTable.bigIntField, 3));
         const isNullSelect = usersTable.select().where(static_1.isNull(usersTable.phone)).all();
         const notEqSelect = usersTable.select().where(static_1.notEq(usersTable.phone, 'hello')).all();
         // ordered select

package/docs/tables/citiesTable.d.ts

@@ -4,7 +4,7 @@ interface CityMeta {
     connection: string;
 }
 export default class CitiesTable extends AbstractTable<CitiesTable> {
-    id: import("../../columns/column").IndexedColumn<import("../..").PgInteger, true, true>;
+    id: import("../..").Column<import("../../columns/types/pgSerial").default, true, true>;
     foundationDate: import("../..").Column<import("../..").PgTimestamp, false, false>;
     location: import("../..").Column<import("../..").PgVarChar, true, false>;
     userId: import("../..").Column<import("../..").PgInteger, true, false>;

package/docs/tables/citiesTable.js

@@ -5,8 +5,8 @@ const usersTable_1 = require("./usersTable");
 class CitiesTable extends abstractTable_1.default {
     constructor() {
         super(...arguments);
-        this.id = this.int('id').autoIncrement().primaryKey();
-        this.foundationDate = this.timestamp('name', { notNull: true });
+        this.id = this.serial('id').primaryKey();
+        this.foundationDate = this.timestamp('name').notNull();
         this.location = this.varchar('page', { size: 256 });
         this.userId = this.int('user_id').foreignKey(usersTable_1.default, (table) => table.id, { onUpdate: 'CASCADE' });
         this.metadata = this.jsonb('metadata');

package/docs/tables/userGroupsTable.d.ts

@@ -1,6 +1,6 @@
 import AbstractTable from '../../tables/abstractTable';
 export default class UserGroupsTable extends AbstractTable<UserGroupsTable> {
-    id: import("../../columns/column").IndexedColumn<import("../..").PgInteger, true, true>;
+    id: import("../..").Column<import("../../columns/types/pgSerial").default, true, true>;
     name: import("../..").Column<import("../..").PgVarChar, true, false>;
     description: import("../..").Column<import("../..").PgVarChar, true, false>;
     tableName(): string;

package/docs/tables/userGroupsTable.js

@@ -4,7 +4,7 @@ const abstractTable_1 = require("../../tables/abstractTable");
 class UserGroupsTable extends abstractTable_1.default {
     constructor() {
         super(...arguments);
-        this.id = this.int('id').autoIncrement().primaryKey();
+        this.id = this.serial('id').primaryKey();
         this.name = this.varchar('name');
         this.description = this.varchar('description');
     }

package/docs/tables/usersTable.d.ts

@@ -1,15 +1,16 @@
 import AbstractTable from '../../tables/abstractTable';
 export declare const rolesEnum: import("../../types/type").default<"user" | "guest" | "admin">;
 export default class UsersTable extends AbstractTable<UsersTable> {
-    id: import("../../columns/column").IndexedColumn<import("../..").PgInteger, true, true>;
-    fullName: import("../..").Column<import("../..").PgText, true, false>;
-    phone: import("../..").Column<import("../..").PgVarChar, true, false>;
-    media: import("../..").Column<import("../..").PgJsonb<string[]>, true, false>;
-    decimalField: import("../..").Column<import("../..").PgBigDecimal, false, false>;
-    bigIntField: import("../..").Column<import("../..").PgBigInt, true, false>;
-    createdAt: import("../..").Column<import("../..").PgTimestamp, false, false>;
-    updatedAt: import("../..").Column<import("../..").PgTimestamp, true, false>;
-    isArchived: import("../..").Column<import("../..").PgBoolean, true, false>;
+    id: import("../../columns/column").Column<import("../../columns/types/pgSerial").default, true, true>;
+    fullName: import("../../columns/column").Column<import("../..").PgText, true, false>;
+    phone: import("../../columns/column").Column<import("../..").PgVarChar, true, false>;
+    media: import("../../columns/column").Column<import("../..").PgJsonb<string[]>, true, false>;
+    decimalField: import("../../columns/column").Column<import("../..").PgBigDecimal, false, false>;
+    bigIntField: import("../../columns/column").Column<import("../..").PgBigInt, true, true>;
+    createdAt: import("../../columns/column").Column<import("../..").PgTimestamp, false, false>;
+    createdAtWithTimezone: import("../../columns/column").Column<import("../../columns/types/pgTimestamptz").default, true, false>;
+    updatedAt: import("../../columns/column").Column<import("../..").PgTimestamp, true, false>;
+    isArchived: import("../../columns/column").Column<import("../..").PgBoolean, true, false>;
     phoneFullNameIndex: import("../../indexes/tableIndex").default;
     phoneIndex: import("../../indexes/tableIndex").default;
     tableName(): string;

package/docs/tables/usersTable.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.rolesEnum = void 0;
 /* eslint-disable max-classes-per-file */
+const column_1 = require("../../columns/column");
 const abstractTable_1 = require("../../tables/abstractTable");
 const type_1 = require("../../types/type");
 // import { rolesEnum } from '../types/rolesType';
@@ -9,15 +10,16 @@ exports.rolesEnum = type_1.createEnum({ alias: 'test-enum', values: ['user', 'gu
 class UsersTable extends abstractTable_1.default {
     constructor() {
         super(...arguments);
-        this.id = this.int('id').autoIncrement().primaryKey();
+        this.id = this.serial('id').primaryKey();
         this.fullName = this.text('full_name');
         this.phone = this.varchar('phone', { size: 256 });
         this.media = this.jsonb('media');
-        this.decimalField = this.decimal('test', { notNull: true, precision: 100, scale: 2 });
-        this.bigIntField = this.bigint('test1');
+        this.decimalField = this.decimal('test', { precision: 100, scale: 2 }).notNull();
+        this.bigIntField = this.bigint('test1', 'max_bytes_53');
         // public role = this.type(rolesEnum, 'name_in_table', { notNull: true });
-        this.createdAt = this.timestamp('created_at', { notNull: true });
-        this.updatedAt = this.timestamp('updated_at');
+        this.createdAt = this.timestamp('created_at').notNull();
+        this.createdAtWithTimezone = this.timestamptz('created_at_time_zone');
+        this.updatedAt = this.timestamp('updated_at').defaultValue(column_1.Defaults.CURRENT_TIMESTAMP);
         this.isArchived = this.bool('is_archived').defaultValue(false);
         this.phoneFullNameIndex = this.index([this.phone, this.fullName]);
         this.phoneIndex = this.uniqueIndex(this.phone);

package/index.d.ts

@@ -1,9 +1,11 @@
 import { ClientConfig } from 'pg';
 import { DB } from './db';
+import Migrator from './migrator/migrator';
 export * from './db';
 export * from './builders';
 export * from './columns';
 export * from './tables';
 export declare const drizzle: {
     connect(config: ClientConfig): Promise<DB>;
+    migrator(db: DB): Migrator;
 };

package/index.js

@@ -12,6 +12,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.drizzle = void 0;
 const db_1 = require("./db");
+const migrator_1 = require("./migrator/migrator");
 __exportStar(require("./db"), exports);
 __exportStar(require("./builders"), exports);
 __exportStar(require("./columns"), exports);
@@ -21,4 +22,7 @@ exports.drizzle = {
         const dbConnector = new db_1.DbConnector().params(config);
         return dbConnector.connect();
     },
+    migrator(db) {
+        return new migrator_1.default(db);
+    },
 };

package/migrator/migrator.d.ts

@@ -1,16 +1,11 @@
 import Db from '../db/db';
-export declare class MigrationSession {
-    private finalQuery;
-    execute: (query: string) => void;
-    getQuery: () => string;
-}
+export declare type InCodeConfig = {
+    migrationFolder: string;
+};
 export default class Migrator {
-    private _db;
-    private migrationsPerVersion;
-    private session;
+    private db;
     constructor(db: Db);
-    chain: (tag: number, migration: (dbSession: MigrationSession) => void) => Migrator;
-    getResultScript: () => string[];
-    execute: () => Promise<boolean>;
+    migrate(configPath: string): Promise<void>;
+    migrate(config: InCodeConfig): Promise<void>;
     private generateHash;
 }

package/migrator/migrator.js

@@ -1,87 +1,76 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MigrationSession = void 0;
+/* eslint-disable no-restricted-syntax */
 /* eslint-disable import/export */
 /* eslint-disable max-classes-per-file */
-const create_1 = require("../builders/lowLvlBuilders/create");
+const fs = require("fs");
+const builders_1 = require("../builders");
 const transaction_1 = require("../builders/transaction/transaction");
-const migrationsTable_1 = require("../tables/migrationsTable");
-class MigrationSession {
-    constructor() {
-        this.finalQuery = '';
-        this.execute = (query) => {
-            this.finalQuery += query;
-            this.finalQuery += '\n';
-        };
-        this.getQuery = () => this.finalQuery;
-    }
-}
-exports.MigrationSession = MigrationSession;
+const tables_1 = require("../tables");
 class Migrator {
     constructor(db) {
-        this.migrationsPerVersion = new Map();
-        this.chain = (tag, migration) => {
-            const migrationSession = new MigrationSession();
-            migration(migrationSession);
-            this.migrationsPerVersion.set(+tag, migrationSession.getQuery());
-            return this;
-        };
-        this.getResultScript = () => {
-            const values = [];
-            // eslint-disable-next-line no-restricted-syntax
-            for (const value of this.migrationsPerVersion.values()) {
-                values.push(value);
-            }
-            return values;
-        };
-        this.execute = async () => {
-            const migrationsTable = new migrationsTable_1.default(this._db);
-            await this.session.execute(create_1.default.table(migrationsTable).build());
-            const migrations = await migrationsTable.select().all();
-            const transaction = new transaction_1.default(this.session);
-            await transaction.begin();
+        this.db = db;
+    }
+    async migrate(configPath, config) {
+        let migrationFolderTo;
+        if (configPath) {
+            const configAsString = fs.readFileSync(configPath, 'utf8');
+            const splitted = configAsString.trim().split('\n');
             // eslint-disable-next-line no-restricted-syntax
-            for await (const [key, value] of this.migrationsPerVersion) {
-                const dbMigrationByTag = migrations.find((it) => it.version === key);
-                if (dbMigrationByTag) {
-                    // const isHashSameAsInDb =
-                    // Buffer.from(dbMigrationByTag.hash, 'base64').toString('ascii') === value;
-                    // if (!isHashSameAsInDb) {
-                    //   throw Error(`Migration script was changed for version ${key}`);
-                    // }
+            for (const split of splitted) {
+                const entry = split.trim().split(':');
+                const key = entry[0];
+                const value = entry[1].trim().replace(/['"]+/g, '');
+                if (key === 'migrationFolder') {
+                    // proceed value
+                    migrationFolderTo = value;
                 }
-                else {
-                    try {
-                        const logger = this._db.logger();
-                        if (logger) {
-                            logger.info(`Executing migration with tag ${key} with query:\n${value}`);
-                        }
-                        await this._db.session().execute(value);
-                        await migrationsTable
-                            .insert({
-                            version: key,
-                            createdAt: new Date(),
-                            hash: Buffer.from(value).toString('base64'),
-                        }).execute();
-                    }
-                    catch (e) {
-                        await transaction.rollback();
-                        throw new Error(`Migration chain ${key} was not migrated sucessfully.\nMessage: ${e.message}`);
-                    }
+            }
+        }
+        if (config) {
+            migrationFolderTo = config.migrationFolder;
+        }
+        if (!migrationFolderTo) {
+            throw Error('no migration folder defined');
+        }
+        const migrationTable = new tables_1.MigrationsTable(this.db);
+        await this.db.session().execute(builders_1.Create.table(migrationTable).build());
+        const dbMigrations = await migrationTable.select().all();
+        const lastDbMigration = dbMigrations.length > 0
+            ? dbMigrations[dbMigrations.length - 1]
+            : undefined;
+        const files = fs.readdirSync(migrationFolderTo);
+        const transaction = new transaction_1.default(this.db.session());
+        await transaction.begin();
+        try {
+            for await (const migrationFolder of files) {
+                const migrationFiles = fs.readdirSync(`${migrationFolderTo}/${migrationFolder}`);
+                const migrationFile = migrationFiles.filter((file) => file === 'migration.sql')[0];
+                const query = fs.readFileSync(`${migrationFolderTo}/${migrationFolder}/${migrationFile}`).toString();
+                const folderAsMillis = new Date(migrationFolder).getTime();
+                if (!lastDbMigration || lastDbMigration.createdAt < folderAsMillis) {
+                    await this.db.session().execute(query);
+                    await migrationTable.insert({
+                        hash: this.generateHash(query),
+                        createdAt: folderAsMillis,
+                    }).execute();
                 }
             }
             await transaction.commit();
-            return true;
-        };
-        this._db = db;
-        this.session = db.session();
+        }
+        catch (e) {
+            if (this.db.logger()) {
+                this.db.logger().error(e);
+            }
+            transaction.rollback();
+        }
     }
     generateHash(value) {
         let hash = 0;
         let i;
         let chr;
         if (value.length === 0)
-            return hash;
+            return '';
         for (i = 0; i < value.length; i += 1) {
             chr = value.charCodeAt(i);
             // eslint-disable-next-line no-bitwise
@@ -89,7 +78,7 @@ class Migrator {
             // eslint-disable-next-line no-bitwise
             hash |= 0;
         }
-        return hash;
+        return Buffer.from(value).toString('base64');
     }
 }
 exports.default = Migrator;

package/package.json

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

package/serializer/serializer.js

@@ -34,7 +34,7 @@ class MigrationSerializer {
                     if (value instanceof columns_1.Column) {
                         columnToReturn[value.getColumnName()] = {
                             name: value.getColumnName(),
-                            type: value.isAutoIncrement() ? 'serial' : value.getColumnType().getDbName(),
+                            type: value.getColumnType().getDbName(),
                             primaryKey: !!value.primaryKeyName,
                             unique: !!value.uniqueKeyName,
                             default: value.getDefaultValue() === null ? undefined : value.getDefaultValue(),

package/tables/abstractTable.d.ts

@@ -11,7 +11,7 @@ import InsertTRB from '../builders/highLvlBuilders/insertRequestBuilder';
 import DeleteTRB from '../builders/highLvlBuilders/deleteRequestBuilder';
 import UpdateTRB from '../builders/highLvlBuilders/updateRequestBuilder';
 import SelectTRB from '../builders/highLvlBuilders/selectRequestBuilder';
-import PgBigInt from '../columns/types/pgBigInt';
+import PgBigInt53, { PgBigInt64 } from '../columns/types/pgBigInt';
 import BaseLogger from '../logger/abstractLogger';
 import PgEnum from '../columns/types/pgEnum';
 import DB from '../db/db';
@@ -19,6 +19,9 @@ import { AbstractColumn, Column } from '../columns/column';
 import TableIndex from '../indexes/tableIndex';
 import { ExtractModel } from './inferTypes';
 import Enum, { ExtractEnumValues } from '../types/type';
+import PgSerial from '../columns/types/pgSerial';
+import PgTimestamptz from '../columns/types/pgTimestamptz';
+import PgBigSerial53, { PgBigSerial64 } from '../columns/types/pgBigSerial';
 export default abstract class AbstractTable<TTable extends AbstractTable<TTable>> {
     db: DB;
     private _session;
@@ -43,102 +46,23 @@ export default abstract class AbstractTable<TTable extends AbstractTable<TTable>
     protected uniqueIndex(columns: Column<ColumnType, boolean, boolean>): TableIndex;
     protected varchar(name: string, params?: {
         size?: number;
-        notNull: false;
     }): Column<PgVarChar, true>;
-    protected varchar(name: string, params: {
-        size?: number;
-        notNull: true;
-    }): Column<PgVarChar, false>;
-    protected varchar(name: string, params?: {
-        size?: number;
-        notNull?: false;
-    }): Column<PgVarChar, true>;
-    protected varchar(name: string, params: {
-        size?: number;
-        notNull?: true;
-    }): Column<PgVarChar, false>;
-    protected int(name: string, params?: {
-        notNull: false;
-    }): Column<PgInteger, true>;
-    protected int(name: string, params: {
-        notNull: true;
-    }): Column<PgInteger, false>;
-    protected smallInt(name: string, params?: {
-        notNull: false;
-    }): Column<PgInteger, true>;
-    protected smallInt(name: string, params: {
-        notNull: true;
-    }): Column<PgInteger, false>;
-    protected timestamp(name: string, params?: {
-        notNull: false;
-    }): Column<PgTimestamp, true>;
-    protected timestamp(name: string, params: {
-        notNull: true;
-    }): Column<PgTimestamp, false>;
-    protected bigint(name: string, params?: {
-        notNull: false;
-    }): Column<PgBigInt, true>;
-    protected bigint(name: string, params: {
-        notNull: true;
-    }): Column<PgBigInt, false>;
-    protected type<ETtype extends string>(typeEnum: Enum<ETtype>, name: string, params?: {
-        notNull: false;
-    }): Column<PgEnum<ExtractEnumValues<Enum<ETtype>>>, true>;
-    protected type<ETtype extends string>(typeEnum: Enum<ETtype>, name: string, params: {
-        notNull: true;
-    }): Column<PgEnum<ExtractEnumValues<Enum<ETtype>>>, false>;
+    protected int(name: string): Column<PgInteger, true>;
+    protected smallInt(name: string): Column<PgInteger, true>;
+    protected serial(name: string): Column<PgSerial, true, true>;
+    protected bigSerial(name: string, maxBytes: 'max_bytes_53'): Column<PgBigSerial53, true, true>;
+    protected bigSerial(name: string, maxBytes: 'max_bytes_64'): Column<PgBigSerial64, true, true>;
+    protected timestamp(name: string): Column<PgTimestamp, true>;
+    protected timestamptz(name: string): Column<PgTimestamptz, true>;
+    protected bigint(name: string, maxBytes: 'max_bytes_53'): Column<PgBigInt53, true, true>;
+    protected bigint(name: string, maxBytes: 'max_bytes_64'): Column<PgBigInt64, true, true>;
+    protected type<ETtype extends string>(typeEnum: Enum<ETtype>, name: string): Column<PgEnum<ExtractEnumValues<Enum<ETtype>>>, true>;
     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 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;
-    }): Column<PgTime, true>;
-    protected time(name: string, params: {
-        notNull: true;
-    }): Column<PgTime, false>;
-    protected bool(name: string, params?: {
-        notNull: false;
-    }): Column<PgBoolean, true>;
-    protected bool(name: string, params: {
-        notNull: true;
-    }): Column<PgBoolean, false>;
-    protected text(name: string, params?: {
-        notNull: false;
-    }): Column<PgText, true>;
-    protected text(name: string, params: {
-        notNull: true;
-    }): Column<PgText, false>;
-    protected jsonb<TSubType>(name: string, params?: {
-        notNull: false;
-    }): Column<PgJsonb<TSubType>, true>;
-    protected jsonb<TSubType>(name: string, params: {
-        notNull: true;
-    }): Column<PgJsonb<TSubType>, false>;
+    protected time(name: string): Column<PgTime, true>;
+    protected bool(name: string): Column<PgBoolean, true>;
+    protected text(name: string): Column<PgText, true>;
+    protected jsonb<TSubType>(name: string): Column<PgJsonb<TSubType>, true>;
 }

package/tables/abstractTable.js

@@ -17,6 +17,9 @@ const pgEnum_1 = require("../columns/types/pgEnum");
 const column_1 = require("../columns/column");
 const tableIndex_1 = require("../indexes/tableIndex");
 const pgSmallInt_1 = require("../columns/types/pgSmallInt");
+const pgSerial_1 = require("../columns/types/pgSerial");
+const pgTimestamptz_1 = require("../columns/types/pgTimestamptz");
+const pgBigSerial_1 = require("../columns/types/pgBigSerial");
 class AbstractTable {
     constructor(db) {
         this.withLogger = (logger) => {
@@ -73,49 +76,53 @@ class AbstractTable {
         return new tableIndex_1.default(this.tableName(), columns instanceof Array ? columns : [columns]);
     }
     varchar(name, params = {}) {
-        var _a;
-        return new column_1.Column(this, name, new pgVarChar_1.default(params.size), (_a = !(params === null || params === void 0 ? void 0 : params.notNull)) !== null && _a !== void 0 ? _a : false);
+        return new column_1.Column(this, name, new pgVarChar_1.default(params.size));
     }
-    int(name, params = {}) {
-        var _a;
-        return new column_1.Column(this, name, new pgInteger_1.default(), (_a = !(params === null || params === void 0 ? void 0 : params.notNull)) !== null && _a !== void 0 ? _a : false);
+    int(name) {
+        return new column_1.Column(this, name, new pgInteger_1.default());
     }
-    smallInt(name, params = {}) {
-        var _a;
-        return new column_1.Column(this, name, new pgSmallInt_1.default(), (_a = !(params === null || params === void 0 ? void 0 : params.notNull)) !== null && _a !== void 0 ? _a : false);
+    smallInt(name) {
+        return new column_1.Column(this, name, new pgSmallInt_1.default());
     }
-    timestamp(name, params = {}) {
-        var _a;
-        return new column_1.Column(this, name, new pgTimestamp_1.default(), (_a = !(params === null || params === void 0 ? void 0 : params.notNull)) !== null && _a !== void 0 ? _a : false);
+    serial(name) {
+        return new column_1.Column(this, name, new pgSerial_1.default());
     }
-    bigint(name, params = {}) {
-        var _a;
-        return new column_1.Column(this, name, new pgBigInt_1.default(), (_a = !(params === null || params === void 0 ? void 0 : params.notNull)) !== null && _a !== void 0 ? _a : false);
+    bigSerial(name, maxBytes) {
+        if (maxBytes === 'max_bytes_53') {
+            return new column_1.Column(this, name, new pgBigSerial_1.default());
+        }
+        return new column_1.Column(this, name, new pgBigSerial_1.PgBigSerial64());
+    }
+    timestamp(name) {
+        return new column_1.Column(this, name, new pgTimestamp_1.default());
+    }
+    timestamptz(name) {
+        return new column_1.Column(this, name, new pgTimestamptz_1.default());
+    }
+    bigint(name, maxBytes) {
+        if (maxBytes === 'max_bytes_53') {
+            return new column_1.Column(this, name, new pgBigInt_1.default());
+        }
+        return new column_1.Column(this, name, new pgBigInt_1.PgBigInt64());
     }
-    type(typeEnum, name, params = {}) {
-        var _a;
+    type(typeEnum, name) {
         const pgEnum = new pgEnum_1.default(typeEnum.name);
-        return new column_1.Column(this, name, pgEnum, (_a = !(params === null || params === void 0 ? void 0 : params.notNull)) !== null && _a !== void 0 ? _a : false);
+        return new column_1.Column(this, name, pgEnum);
     }
     decimal(name, params = {}) {
-        var _a;
-        return new column_1.Column(this, name, new pgBigDecimal_1.default(params.precision, params.scale), (_a = !(params === null || params === void 0 ? void 0 : params.notNull)) !== null && _a !== void 0 ? _a : false);
+        return new column_1.Column(this, name, new pgBigDecimal_1.default(params.precision, params.scale));
     }
-    time(name, params = {}) {
-        var _a;
-        return new column_1.Column(this, name, new pgTime_1.default(), (_a = !(params === null || params === void 0 ? void 0 : params.notNull)) !== null && _a !== void 0 ? _a : false);
+    time(name) {
+        return new column_1.Column(this, name, new pgTime_1.default());
     }
-    bool(name, params = {}) {
-        var _a;
-        return new column_1.Column(this, name, new pgBoolean_1.default(), (_a = !(params === null || params === void 0 ? void 0 : params.notNull)) !== null && _a !== void 0 ? _a : false);
+    bool(name) {
+        return new column_1.Column(this, name, new pgBoolean_1.default());
     }
-    text(name, params = {}) {
-        var _a;
-        return new column_1.Column(this, name, new pgText_1.default(), (_a = !(params === null || params === void 0 ? void 0 : params.notNull)) !== null && _a !== void 0 ? _a : false);
+    text(name) {
+        return new column_1.Column(this, name, new pgText_1.default());
     }
-    jsonb(name, params = {}) {
-        var _a;
-        return new column_1.Column(this, name, new pgJsonb_1.default(), (_a = !(params === null || params === void 0 ? void 0 : params.notNull)) !== null && _a !== void 0 ? _a : false);
+    jsonb(name) {
+        return new column_1.Column(this, name, new pgJsonb_1.default());
     }
 }
 exports.default = AbstractTable;

package/tables/migrationsTable.d.ts

@@ -1,8 +1,7 @@
 import AbstractTable from './abstractTable';
 export default class MigrationsTable extends AbstractTable<MigrationsTable> {
-    id: import("../columns/column").IndexedColumn<import("..").PgInteger, true, true>;
-    version: import("..").Column<import("..").PgInteger, false, false>;
-    hash: import("..").Column<import("..").PgText, true, false>;
-    createdAt: import("..").Column<import("..").PgTimestamp, true, false>;
+    id: import("..").Column<import("../columns/types/pgSerial").default, true, true>;
+    hash: import("..").Column<import("..").PgText, false, false>;
+    createdAt: import("..").Column<import("..").PgBigInt, true, true>;
     tableName(): string;
 }

package/tables/migrationsTable.js

@@ -4,13 +4,12 @@ const abstractTable_1 = require("./abstractTable");
 class MigrationsTable extends abstractTable_1.default {
     constructor() {
         super(...arguments);
-        this.id = this.int('id').autoIncrement().primaryKey();
-        this.version = this.int('version', { notNull: true }).unique();
-        this.hash = this.text('hash');
-        this.createdAt = this.timestamp('created_at');
+        this.id = this.serial('id').primaryKey();
+        this.hash = this.text('hash').notNull();
+        this.createdAt = this.bigint('created_at', 'max_bytes_53');
     }
     tableName() {
-        return 'migrations';
+        return 'drizzle_migrations';
     }
 }
 exports.default = MigrationsTable;

package/test.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const _1 = require(".");
 // import { Pool } from 'pg';
 // import { DB } from '.';
 // import { DB, DbConnector } from '.';
@@ -16,11 +17,17 @@ const fromTypeFile = (filepath) => {
 };
 (async () => {
     try {
+        const db = await new _1.DbConnector()
+            .connectionString('postgresql://postgres@127.0.0.1/drizzle-docs')
+            .connect();
+        // const serializer = new MigrationSerializer();
+        // const res = await serializer.fromDatabase(db);
+        // fs.writeFileSync('introspected.json', JSON.stringify(res, null, 2), 'utf8');
         // 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');
+        await _1.drizzle.migrator(db).migrate({ migrationFolder: 'src/drizzle.config.yaml' });
         // drizzle.migrator(db).migrate({ migrationFolder: '' });
         // const typesFileNames = fs.readdirSync('/Users/andrewsherman/IdeaProjects/datalayer-orm/src/examples/types');
         // typesFileNames.forEach((filename) => {

package/docs/tables/citiesToUsers.d.ts

@@ -1,7 +0,0 @@
-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>;
-    manyToManyIndex: import("../../indexes/tableIndex").default;
-    tableName(): string;
-}

package/docs/tables/citiesToUsers.js

@@ -1,18 +0,0 @@
-"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.manyToManyIndex = this.index([this.groupId, this.userId]);
-    }
-    tableName() {
-        return 'users_to_user_groups';
-    }
-}
-exports.default = UsersToUserGroupsTable;