drizzle-orm 0.10.1 → 0.10.5

package/columns/column.d.ts

@@ -19,7 +19,7 @@ export declare abstract class AbstractColumn<T extends ColumnType, TNullable ext
     protected columnType: T;
     protected columnName: string;
     protected defaultParam: any;
-    protected referenced: AbstractColumn<T, boolean, boolean>;
+    protected referenced: AbstractColumn<T, boolean, boolean, TParent>;
     constructor(parent: TParent, columnName: string, columnType: T);
     getOnDelete: () => string | undefined;
     getOnUpdate: () => string | undefined;
@@ -28,16 +28,16 @@ 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>, onConstraint: {
+    }, callback: (table: ITable) => AbstractColumn<T, boolean, boolean, TParent>, onConstraint: {
         onDelete?: 'CASCADE' | 'RESTRICT' | 'SET NULL' | 'SET DEFAULT';
         onUpdate?: 'CASCADE' | 'RESTRICT' | 'SET NULL' | 'SET DEFAULT';
     }): AbstractColumn<T, TNullable, TAutoIncrement>;
     defaultValue: (value: ExtractColumnType<T>) => this;
-    abstract primaryKey(): AbstractColumn<T, boolean, boolean>;
+    abstract primaryKey(): AbstractColumn<T, boolean, boolean, TParent>;
     unique: () => this;
-    abstract notNull(): AbstractColumn<T, boolean, boolean>;
+    abstract notNull(): AbstractColumn<T, boolean, boolean, TParent>;
     getColumnName: () => string;
-    getReferenced: () => AbstractColumn<T, boolean, boolean>;
+    getReferenced: () => AbstractColumn<T, boolean, boolean, TParent>;
     getColumnType: () => T;
     getDefaultValue: () => any;
 }

package/columns/types/pgInteger.d.ts

@@ -4,5 +4,5 @@ export default class PgInteger extends ColumnType<number> {
     constructor();
     getDbName: () => string;
     insertStrategy: (value: number) => string;
-    selectStrategy(value: string): number | undefined;
+    selectStrategy(value: number): number | undefined;
 }

package/columns/types/pgInteger.js

@@ -9,7 +9,7 @@ class PgInteger extends columnType_1.default {
         this.dbName = 'INT';
     }
     selectStrategy(value) {
-        return value ? parseInt(value, 10) : undefined;
+        return value;
     }
 }
 exports.default = PgInteger;

package/columns/types/pgSerial.d.ts

@@ -4,5 +4,5 @@ export default class PgSerial extends ColumnType<number> {
     constructor();
     getDbName: () => string;
     insertStrategy: (value: number) => string;
-    selectStrategy(value: string): number | undefined;
+    selectStrategy(value: number): number | undefined;
 }

package/columns/types/pgSerial.js

@@ -9,7 +9,7 @@ class PgSerial extends columnType_1.default {
         this.dbName = 'SERIAL';
     }
     selectStrategy(value) {
-        return value ? parseInt(value, 10) : undefined;
+        return value;
     }
 }
 exports.default = PgSerial;

package/columns/types/pgSmallInt.d.ts

@@ -4,5 +4,5 @@ export default class PgSmallInt extends ColumnType<number> {
     constructor();
     getDbName: () => string;
     insertStrategy: (value: number) => string;
-    selectStrategy(value: string): number | undefined;
+    selectStrategy(value: number): number | undefined;
 }

package/columns/types/pgSmallInt.js

@@ -9,7 +9,7 @@ class PgSmallInt extends columnType_1.default {
         this.dbName = 'SMALLINT';
     }
     selectStrategy(value) {
-        return value ? parseInt(value, 10) : undefined;
+        return value;
     }
 }
 exports.default = PgSmallInt;

package/data/tables/citiesTable.d.ts

@@ -0,0 +1,14 @@
+import AbstractTable from '../../tables/abstractTable';
+interface CityMeta {
+    population: number;
+    connection: string;
+}
+export default class CitiesTable extends AbstractTable<CitiesTable> {
+    id: import("../..").Column<import("../../columns/types/pgSerial").default, true, true, this>;
+    foundationDate: import("../..").Column<import("../..").PgTimestamp, false, false, this>;
+    location: import("../..").Column<import("../..").PgVarChar, true, false, this>;
+    userId: import("../..").Column<import("../..").PgInteger, true, false, this>;
+    metadata: import("../..").Column<import("../..").PgJsonb<CityMeta>, true, false, this>;
+    tableName(): string;
+}
+export {};

package/data/tables/citiesTable.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const abstractTable_1 = require("../../tables/abstractTable");
+class CitiesTable extends abstractTable_1.default {
+    constructor() {
+        super(...arguments);
+        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(CitiesTable, (table) => table.id, { onUpdate: 'CASCADE' });
+        this.metadata = this.jsonb('metadata');
+    }
+    tableName() {
+        return 'cities';
+    }
+}
+exports.default = CitiesTable;

package/data/tables/userGroupsTable.d.ts

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

package/data/tables/userGroupsTable.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const abstractTable_1 = require("../../tables/abstractTable");
+class UserGroupsTable extends abstractTable_1.default {
+    constructor() {
+        super(...arguments);
+        this.id = this.serial('id').primaryKey();
+        this.name = this.varchar('name');
+        this.description = this.varchar('description');
+    }
+    tableName() {
+        return 'user_groups';
+    }
+}
+exports.default = UserGroupsTable;

package/data/tables/usersTable.d.ts

@@ -0,0 +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("../..").Column<import("../../columns/types/pgSerial").default, true, true, this>;
+    fullName: import("../..").Column<import("../..").PgText, true, false, this>;
+    phone: import("../..").Column<import("../..").PgVarChar, true, false, this>;
+    media: import("../..").Column<import("../..").PgJsonb<string[]>, true, false, this>;
+    decimalField: import("../..").Column<import("../..").PgBigDecimal, false, false, this>;
+    bigIntField: import("../..").Column<import("../..").PgBigInt, true, true, this>;
+    createdAt: import("../..").Column<import("../..").PgTimestamp, false, false, this>;
+    createdAtWithTimezone: import("../..").Column<import("../../columns/types/pgTimestamptz").default, true, false, this>;
+    isArchived: import("../..").Column<import("../..").PgBoolean, true, false, this>;
+    phoneFullNameIndex: import("../../indexes/tableIndex").default;
+    phoneIndex: import("../../indexes/tableIndex").default;
+    tableName(): string;
+}

package/data/tables/usersTable.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.rolesEnum = void 0;
+/* eslint-disable max-classes-per-file */
+// import { Defaults } from '../../columns/column';
+const abstractTable_1 = require("../../tables/abstractTable");
+const type_1 = require("../../types/type");
+// import { rolesEnum } from '../types/rolesType';
+exports.rolesEnum = type_1.createEnum({ alias: 'test-enum', values: ['user', 'guest', 'admin'] });
+class UsersTable extends abstractTable_1.default {
+    constructor() {
+        super(...arguments);
+        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', { 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();
+        this.createdAtWithTimezone = this.timestamptz('created_at_time_zone');
+        // public updatedAt = this.timestamp('updated_at').defaultValue(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);
+    }
+    tableName() {
+        return 'users';
+    }
+}
+exports.default = UsersTable;

package/data/tables/usersToUserGroups.d.ts

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

package/data/tables/usersToUserGroups.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+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, { 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() {
+        return 'users_to_user_groups';
+    }
+}
+exports.default = UsersToUserGroupsTable;

package/data/types/rolesType.d.ts

@@ -0,0 +1 @@
+export declare const rolesEnum: import("../../types/type").default<"foo" | "bar" | "baz">;

package/data/types/rolesType.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.rolesEnum = void 0;
+const type_1 = require("../../types/type");
+// eslint-disable-next-line import/prefer-default-export
+exports.rolesEnum = type_1.createEnum({ alias: 'test-enum', values: ['foo', 'bar', 'baz'] });

package/mappers/responseMapper.js

@@ -13,7 +13,7 @@ QueryResponseMapper.map = (mappedServiceToDb, queryResult, joinId) => {
             const column = mappedServiceToDb[key];
             const alias = `${column.getAlias()}${joinId ? `_${joinId}` : ''}`;
             const value = column.getColumnType().selectStrategy(row[alias]);
-            mappedRow[key] = value;
+            mappedRow[key] = value === null ? undefined : value;
         });
         response.push(mappedRow);
     });
@@ -27,7 +27,7 @@ QueryResponseMapper.partialMap = (partial, queryResult, joinId) => {
             const column = partial[key];
             const alias = `${column.getAlias()}${joinId ? `_${joinId}` : ''}`;
             const value = column.getColumnType().selectStrategy(row[alias]);
-            mappedRow[key] = value;
+            mappedRow[key] = value === null ? undefined : value;
         });
         response.push(mappedRow);
     });

package/migrator/migrator.js

@@ -22,7 +22,7 @@ class Migrator {
                 const entry = split.trim().split(':');
                 const key = entry[0];
                 const value = entry[1].trim().replace(/['"]+/g, '');
-                if (key === 'migrationFolder') {
+                if (key === 'migrationRootFolder') {
                     // proceed value
                     migrationFolderTo = value;
                 }
@@ -48,7 +48,15 @@ class Migrator {
                 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();
+                const year = Number(migrationFolder.slice(0, 4));
+                // second param for Date() is month index, that started from 0, so we need
+                // to decrement a value for month
+                const month = Number(migrationFolder.slice(4, 6)) - 1;
+                const day = Number(migrationFolder.slice(6, 8));
+                const hour = Number(migrationFolder.slice(8, 10));
+                const min = Number(migrationFolder.slice(10, 12));
+                const sec = Number(migrationFolder.slice(12, 14));
+                const folderAsMillis = new Date(year, month, day, hour, min, sec).getTime();
                 if (!lastDbMigration || lastDbMigration.createdAt < folderAsMillis) {
                     await this.db.session().execute(query);
                     await migrationTable.insert({

package/package.json

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

package/serializer/serializer.js

@@ -38,10 +38,22 @@ class MigrationSerializer {
                             name: value.getColumnName(),
                             type: value.getColumnType().getDbName(),
                             primaryKey: !!value.primaryKeyName,
-                            unique: !!value.uniqueKeyName,
+                            // unique: !!value.uniqueKeyName,
                             default: value.getDefaultValue() === null ? undefined : value.getDefaultValue(),
                             notNull: !value.isNullableFlag,
                         };
+                        if (value.uniqueKeyName) {
+                            const indexName = `${value.getParent().tableName()}_${value.getColumnName()}_index`;
+                            const indexColumnToReturn = {};
+                            indexColumnToReturn[value.getColumnName()] = {
+                                name: value.getColumnName(),
+                            };
+                            indexToReturn[indexName] = {
+                                name: indexName,
+                                columns: indexColumnToReturn,
+                                isUnique: true,
+                            };
+                        }
                         const referenced = value.getReferenced();
                         if (referenced) {
                             columnToReturn[value.getColumnName()].references = {

package/tables/abstractTable.d.ts

@@ -19,6 +19,7 @@ import { AbstractColumn, Column } from '../columns/column';
 import TableIndex from '../indexes/tableIndex';
 import { ExtractModel } from './inferTypes';
 import Enum, { ExtractEnumValues } from '../types/type';
+import PgSmallInt from '../columns/types/pgSmallInt';
 import PgSerial from '../columns/types/pgSerial';
 import PgTimestamptz from '../columns/types/pgTimestamptz';
 import PgBigSerial53, { PgBigSerial64 } from '../columns/types/pgBigSerial';
@@ -47,7 +48,7 @@ export default abstract class AbstractTable<TTable extends AbstractTable<TTable>
         size?: number;
     }): Column<PgVarChar, true, false, this>;
     protected int(name: string): Column<PgInteger, true, false, this>;
-    protected smallInt(name: string): Column<PgInteger, true, false, this>;
+    protected smallInt(name: string): Column<PgSmallInt, true, false, this>;
     protected serial(name: string): Column<PgSerial, true, true, this>;
     protected bigSerial(name: string, maxBytes: 'max_bytes_53'): Column<PgBigSerial53, true, true, this>;
     protected bigSerial(name: string, maxBytes: 'max_bytes_64'): Column<PgBigSerial64, true, true, this>;

package/test.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const _1 = require(".");
-const usersToUserGroups_1 = require("./docs/tables/usersToUserGroups");
+const citiesTable_1 = require("./docs/tables/citiesTable");
+const usersTable_1 = require("./docs/tables/usersTable");
 const consoleLogger_1 = require("./logger/consoleLogger");
-const serializer_1 = require("./serializer/serializer");
 // import { Pool } from 'pg';
 // import { DB } from '.';
 // import { DB, DbConnector } from '.';
@@ -21,19 +21,82 @@ const fromTypeFile = (filepath) => {
 (async () => {
     try {
         const db = await new _1.DbConnector()
-            .connectionString('postgresql://postgres@127.0.0.1/migrator')
+            .connectionString('postgresql://postgres@127.0.0.1/drizzle-docs')
             .connect();
         db.useLogger(new consoleLogger_1.default());
-        const table = new usersToUserGroups_1.default(db);
-        const serializer = new serializer_1.default();
-        const res = serializer.generate([table], []);
-        console.log(JSON.stringify(res, null, 2));
+        const table = new usersTable_1.default(db);
+        const citiesTable = new citiesTable_1.default(db);
+        // const res = await table.insert({
+        //   decimalField: 12.4,
+        //   createdAt: new Date(),
+        // }).all();
+        // console.log(res);
+        const res1 = await citiesTable.select().leftJoin(usersTable_1.default, (cities) => cities.userId, (users) => users.id).execute();
+        // eslint-disable-next-line array-callback-return
+        res1.map((city, user) => {
+            console.log(city);
+            console.log(user.decimalField);
+        });
+        // await table.insertMany([{
+        //   decimalField: 12.4,
+        //   createdAt: new Date(),
+        //   role: 'foo',
+        // },
+        // {
+        //   decimalField: 13.4,
+        //   createdAt: new Date(),
+        //   role: 'foo',
+        // }]).all();
+        // const d = await table.update().where(and([
+        //   or([
+        //     notEq(table.id, 1),
+        //     eq(table.bigIntField, 1)]),
+        //   or([notEq(table.id, 2),
+        //     eq(table.bigIntField, 1),
+        //     and([notEq(table.id, 1),
+        //       eq(table.isArchived, true),
+        //     ]),
+        //   ])])).set({
+        //   // phone: 'updated',
+        //   bigIntField: 1,
+        //   decimalField: 1.2,
+        // }).all();
+        // console.log(d);
+        // await table.delete().where(eq(table.id, 4)).all();
+        // const cities = new CitiesTable(db);
+        // const d = new UsersToUserGroupsTable(db);
+        // SELECT * FROM users WHERE id = $1 and name = $2
+        // const res = notEq(table.id, 1).toQuery();
+        // const res1 = and([notEq(table.id, 1), like(table.phone, 'phone')]).toQuery();
+        // const res2 = and([
+        //   or([
+        //     notEq(table.id, 1),
+        //     like(table.phone, 'phone')]),
+        //   or([notEq(table.id, 2),
+        //     like(table.phone, 'phone2'),
+        //     and([notEq(table.id, 1),
+        //       eq(table.isArchived, true),
+        //     ]),
+        //   ]),
+        // ]).toQuery();
+        // const res3 = and([notEq(table.id, 2),
+        //   like(table.phone, 'phone2'),
+        //   or([
+        //     notEq(table.id, 1),
+        //     like(table.phone, 'phone')]),
+        // ]).toQuery();
+        // // console.log(res);
+        // console.log(res2);
+        // console.log(res3);
+        // const serializer = new MigrationSerializer();
+        // const res = serializer.generate([table], []);
+        // console.log(JSON.stringify(res, null, 2));
         // 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('drizzle.config.yaml');
+        // await drizzle.migrator(db).smigrate('drizzle.config.yml');
         // await drizzle.migrator(db).migrate({ migrationFolder: 'drizzle' });
         // const typesFileNames = fs.readdirSync('/Users/andrewsherman/IdeaProjects/datalayer-orm/src/examples/types');
         // typesFileNames.forEach((filename) => {