drizzle-orm 0.9.13 → 0.9.17

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/db/index.d.ts

@@ -1,3 +1,4 @@
 export { default as DB } from './db';
 export { default as DbConnector } from './dbConnector';
 export { default as DBStringConnector } from './dbStringConnector';
+export { ISession } from './session';

package/db/index.js

@@ -1,9 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DBStringConnector = exports.DbConnector = exports.DB = void 0;
+exports.ISession = exports.DBStringConnector = exports.DbConnector = exports.DB = void 0;
 var db_1 = require("./db");
 Object.defineProperty(exports, "DB", { enumerable: true, get: function () { return db_1.default; } });
 var dbConnector_1 = require("./dbConnector");
 Object.defineProperty(exports, "DbConnector", { enumerable: true, get: function () { return dbConnector_1.default; } });
 var dbStringConnector_1 = require("./dbStringConnector");
 Object.defineProperty(exports, "DBStringConnector", { enumerable: true, get: function () { return dbStringConnector_1.default; } });
+var session_1 = require("./session");
+Object.defineProperty(exports, "ISession", { enumerable: true, get: function () { return session_1.ISession; } });

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.13",
+  "version": "0.9.17",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/serializer/serializer.d.ts

@@ -1,5 +1,12 @@
+import { DB } from '../db';
 import { AbstractTable } from '../tables';
 import Enum from '../types/type';
+interface EnumsAsObject {
+    [name: string]: {
+        name: string;
+        values: string[];
+    };
+}
 interface ColumnAsObject {
     [name: string]: {
         name?: string;
@@ -37,5 +44,10 @@ export default class MigrationSerializer {
             [key: string]: Enum<any>;
         };
     };
+    fromDatabase: (db: DB) => Promise<{
+        version: string;
+        tables: TableAsObject;
+        enums: EnumsAsObject;
+    }>;
 }
 export {};