drizzle-orm 0.10.35 → 0.10.36

package/migrator/migrator.js

@@ -37,6 +37,7 @@ class Migrator {
         this.db = db;
     }
     async migrate(configPath) {
+        var _a;
         let migrationFolderTo;
         if (typeof configPath === 'string') {
             const configAsString = fs.readFileSync(path.resolve('.', configPath), 'utf8');
@@ -64,8 +65,8 @@ class Migrator {
             .limit(1)
             .orderBy((table) => table.createdAt, order_1.default.DESC)
             .all();
-        const lastDbMigration = dbMigrations[0];
-        console.log('Last migration in database: ', lastDbMigration.hash);
+        const lastDbMigration = (_a = dbMigrations[0]) !== null && _a !== void 0 ? _a : undefined;
+        console.log('last migration: ', lastDbMigration === null || lastDbMigration === void 0 ? void 0 : lastDbMigration.hash);
         const files = fs.readdirSync(migrationFolderTo);
         const transaction = new transaction_1.default(this.db.session());
         await transaction.begin();
@@ -83,10 +84,9 @@ class Migrator {
                 const min = Number(migrationFolder.slice(10, 12));
                 const sec = Number(migrationFolder.slice(12, 14));
                 const folderAsMillis = Date.UTC(year, month, day, hour, min, sec);
-                console.log(`Check if migration ${migrationFolder} should be executed.`);
-                console.log(`Folder name to millis = ${folderAsMillis}`);
+                console.log(`check migration ${migrationFolder} {folderAsMillis}`);
                 if (!lastDbMigration || lastDbMigration.createdAt < folderAsMillis) {
-                    console.log(`Executing ${migrationFolder} migration`);
+                    console.log(`executing ${migrationFolder}`);
                     await this.db.session().execute(query);
                     await migrationTable.insert({
                         hash: this.generateHash(query),

package/package.json

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

package/test.d.ts

@@ -0,0 +1 @@
+export {};

package/test.js

@@ -1,66 +1,65 @@
 "use strict";
-// import { eq } from './builders/requestBuilders/where/static';
-// import DbConnector from './db/dbConnector';
-// import CitiesTable from './docs/tables/citiesTable';
-// import UsersTable from './docs/tables/usersTable';
-// import ConsoleLogger from './logger/consoleLogger';
-// (async () => {
-//   try {
-//     const db = await new DbConnector()
-//       .connectionString('postgresql://postgres@127.0.0.1/migrator')
-//       .connect();
-//     db.useLogger(new ConsoleLogger());
-//     // const usersTable = new UsersTable(db);
-//     const citiesTable = new CitiesTable(db);
-//     const res = await citiesTable.update()
-//       // .groupBy((table, join1, join2, join3) => [table.id, join1.id, join1.phone])
-//       .where(eq(citiesTable.location, 'YR'))
-//       .set({
-//         metadata: [{
-//           fallback_image: true,
-//           team_image: 'https://files.slack.com/files-pri/T016CCC3FE3-F03461UR9M5/clinic_team_photo_1.jpg?pub_secret=560c098bfb',
-//           image_alt_text: 'Generic Physiotherapy Clinic image 1',
-//           logo: '',
-//           logo_alt_text: ''
-//         }],
-//       })
-//       // .leftJoin(CitiesTable, UsersTable, (table) => table.userId, (table) => table.id)
-//       // .leftJoin(UsersTable, UsersTable, (table) => table.id, (table) => table.id)
-//       .execute();
-//     // console.log(res);
-//     // const ser = new MigrationSerializer();
-//     // const res = ser.generate([usersTable as AbstractTable<UsersTable>], []);
-//     // console.log(JSON.stringify(res, null, 2));
-//     // const f = {
-//     //   id: count(usersTable.id),
-//     // };
-//     // type d = ExtractModel<typeof f>;
-//     // const res = await usersTable.select({
-//     //   piska: count(),
-//     //   mongodibil: count(usersTable.phone),
-//     // })
-//     //   .where({
-//     //     piska: eq(),
-//     //     mongodibil: eq(usersTable.phone),
-//     //   }).leftJoin(UsersTable, (table) => table.id, (table) => table.id)
-//     //   .leftJoin(UsersTable, UsersTable, (table) => table.id, (table) => table.id)
-//     //   .groupBy((table, join1, join2, join3) => [table.id, join1.id, join1.phone])
-//     //   .orderBy((table, join1, join2, join3) => [{table.id}, join1.id, join1.phone])
-//     //   .execute();
-//     // const res = await usersTable.select()
-//     //   // .groupBy((table, join1, join2, join3) => [table.id, join1.id, join1.phone])
-//     //   .leftJoin(UsersTable, (table) => table.foundationDate, (table) => table.id)
-//     //   .leftJoin(UsersTable, UsersTable, (table) => table.role, (table) => table.id)
-//     //   .leftJoin(UsersTable, UsersTable, (table) => table.role, (table) => table.id)
-//     //   // .groupBy({
-//     //   //   usersTable: usersTable.id,
-//     //   //   firstJoin: [usersTable.id],
-//     //   //   secondJoin: usersTable.id,
-//     //   //   thirdJoin: usersTable.id,
-//     //   // })
-//     //   .execute();
-//     // console.log(res);
-//   } catch (e) {
-//     console.log(e);
-//   }
-// })();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const static_1 = require("./builders/requestBuilders/where/static");
+const dbConnector_1 = __importDefault(require("./db/dbConnector"));
+const citiesTable_1 = __importDefault(require("./docs/tables/citiesTable"));
+const usersTable_1 = __importDefault(require("./docs/tables/usersTable"));
+const consoleLogger_1 = __importDefault(require("./logger/consoleLogger"));
+(async () => {
+    try {
+        const db = await new dbConnector_1.default()
+            .connectionString('postgresql://postgres@127.0.0.1/migrator')
+            .connect();
+        const usersTable = new usersTable_1.default(db);
+        const citiesTable = new citiesTable_1.default(db);
+        db.useLogger(new consoleLogger_1.default());
+        const phone = undefined;
+        const res = await usersTable.update()
+            // .groupBy((table, join1, join2, join3) => [table.id, join1.id, join1.phone])
+            .where(static_1.eq(usersTable.id, 16))
+            .set({
+            phone,
+        })
+            // .leftJoin(CitiesTable, UsersTable, (table) => table.userId, (table) => table.id)
+            // .leftJoin(UsersTable, UsersTable, (table) => table.id, (table) => table.id)
+            .execute();
+        // const ser = new MigrationSerializer();
+        // const res = ser.generate([usersTable as AbstractTable<UsersTable>], []);
+        // console.log(JSON.stringify(res, null, 2));
+        // const f = {
+        //   id: count(usersTable.id),
+        // };
+        // type d = ExtractModel<typeof f>;
+        // const res = await usersTable.select({
+        //   piska: count(),
+        //   mongodibil: count(usersTable.phone),
+        // })
+        //   .where({
+        //     piska: eq(),
+        //     mongodibil: eq(usersTable.phone),
+        //   }).leftJoin(UsersTable, (table) => table.id, (table) => table.id)
+        //   .leftJoin(UsersTable, UsersTable, (table) => table.id, (table) => table.id)
+        //   .groupBy((table, join1, join2, join3) => [table.id, join1.id, join1.phone])
+        //   .orderBy((table, join1, join2, join3) => [{table.id}, join1.id, join1.phone])
+        //   .execute();
+        // const res = await usersTable.select()
+        //   // .groupBy((table, join1, join2, join3) => [table.id, join1.id, join1.phone])
+        //   .leftJoin(UsersTable, (table) => table.foundationDate, (table) => table.id)
+        //   .leftJoin(UsersTable, UsersTable, (table) => table.role, (table) => table.id)
+        //   .leftJoin(UsersTable, UsersTable, (table) => table.role, (table) => table.id)
+        //   // .groupBy({
+        //   //   usersTable: usersTable.id,
+        //   //   firstJoin: [usersTable.id],
+        //   //   secondJoin: usersTable.id,
+        //   //   thirdJoin: usersTable.id,
+        //   // })
+        //   .execute();
+        // console.log(res);
+    }
+    catch (e) {
+        console.log(e);
+    }
+})();

package/.pnpm-debug.log

@@ -1,16 +0,0 @@
-{
-  "0 debug pnpm:scope": {
-    "selected": 1,
-    "workspacePrefix": "/Users/andrewsherman/IdeaProjects/datalayer-orm"
-  },
-  "1 error pnpm": {
-    "code": "ERR_PNPM_GIT_NOT_UNCLEAN",
-    "hint": "If you want to disable Git checks on publish, set the \"git-checks\" setting to \"false\", or run again with \"--no-git-checks\".",
-    "err": {
-      "name": "pnpm",
-      "message": "Unclean working tree. Commit or stash changes first.",
-      "code": "ERR_PNPM_GIT_NOT_UNCLEAN",
-      "stack": "pnpm: Unclean working tree. Commit or stash changes first.\n    at Object.handler [as publish] (/Users/andrewsherman/.nvm/versions/node/v12.20.1/lib/node_modules/pnpm/dist/pnpm.cjs:177118:17)\n    at processTicksAndRejections (internal/process/task_queues.js:97:5)\n    at async /Users/andrewsherman/.nvm/versions/node/v12.20.1/lib/node_modules/pnpm/dist/pnpm.cjs:182194:21\n    at async run (/Users/andrewsherman/.nvm/versions/node/v12.20.1/lib/node_modules/pnpm/dist/pnpm.cjs:182168:34)\n    at async runPnpm (/Users/andrewsherman/.nvm/versions/node/v12.20.1/lib/node_modules/pnpm/dist/pnpm.cjs:182387:5)\n    at async /Users/andrewsherman/.nvm/versions/node/v12.20.1/lib/node_modules/pnpm/dist/pnpm.cjs:182379:7"
-    }
-  }
-}

package/data/citiesTable.d.ts

@@ -1,9 +0,0 @@
-import { AbstractTable } from '..';
-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<any[]>, true, false, this>;
-    tableName(): string;
-}

package/data/citiesTable.js

@@ -1,22 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const __1 = require("..");
-const usersTable_1 = __importDefault(require("./usersTable"));
-class CitiesTable extends __1.AbstractTable {
-    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(usersTable_1.default, (table) => table.id, { onUpdate: 'CASCADE' });
-        this.metadata = this.jsonb('metadata');
-    }
-    // public metadataArray = this.jsonb<CityMeta[]>('metadata_array');
-    tableName() {
-        return 'cities';
-    }
-}
-exports.default = CitiesTable;

package/data/userGroupsTable.d.ts

@@ -1,7 +0,0 @@
-import { AbstractTable } from "..";
-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/userGroupsTable.js

@@ -1,15 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const __1 = require("..");
-class UserGroupsTable extends __1.AbstractTable {
-    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/usersTable.d.ts

@@ -1,17 +0,0 @@
-import { AbstractTable } from "..";
-export declare const rolesEnum: import("../types/type").default<"foo" | "bar" | "baz">;
-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, false, this>;
-    role: import("..").Column<import("../columns/types/pgEnum").default<"foo" | "bar" | "baz">, false, false, this>;
-    createdAt: import("..").Column<import("..").PgTimestamp, false, false, this>;
-    updatedAt: import("..").Column<import("..").PgTimestamp, 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/usersTable.js

@@ -1,31 +0,0 @@
-"use strict";
-/* eslint-disable max-classes-per-file */
-// import { Defaults } from '../../columns/column';
-// import { rolesEnum } from '../types/rolesType';
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.rolesEnum = void 0;
-const __1 = require("..");
-const type_1 = require("../types/type");
-exports.rolesEnum = type_1.createEnum({ alias: 'test-enum', values: ['foo', 'bar', 'baz'] });
-class UsersTable extends __1.AbstractTable {
-    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');
-        this.role = this.type(exports.rolesEnum, 'name_in_table').notNull();
-        this.createdAt = this.timestamp('created_at').notNull();
-        // public createdAtWithTimezone = this.timestamptz('created_at');
-        this.updatedAt = this.timestamp('updated_at').defaultValue(__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);
-    }
-    tableName() {
-        return 'users';
-    }
-}
-exports.default = UsersTable;

package/data/usersToUserGroups.d.ts

@@ -1,7 +0,0 @@
-import { AbstractTable } from '..';
-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/usersToUserGroups.js

@@ -1,20 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const __1 = require("..");
-const userGroupsTable_1 = __importDefault(require("./userGroupsTable"));
-const usersTable_1 = __importDefault(require("./usersTable"));
-class UsersToUserGroupsTable extends __1.AbstractTable {
-    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;