drizzle-orm 0.10.36 → 0.10.39

package/.pnpm-debug.log

@@ -0,0 +1,16 @@
+{
+  "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/columns/column.d.ts

@@ -3,11 +3,18 @@ import DB from '../db/db';
 import { AbstractTable } from '../tables';
 import ColumnType from './types/columnType';
 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;
+declare class RawSqlValue {
+    readonly value: any;
+    readonly escape: boolean;
+    constructor(value: any, escape: boolean);
+    toJSON(): string;
+}
+export declare const Defaults: {
+    CURRENT_TIMESTAMP: RawSqlValue;
+};
+export declare type ExtractColumnType<T extends ColumnType<any>> = T extends ColumnType<infer TCodeType> ? T extends PgTimes ? TCodeType : TCodeType : never;
+export declare const rawValue: (value: string) => RawSqlValue;
 export declare abstract class AbstractColumn<T extends ColumnType, TNullable extends boolean = true, TAutoIncrement extends boolean = false, TParent extends AbstractTable<any> = any> {
     isNullableFlag: boolean;
     primaryKeyName?: string;
@@ -18,7 +25,7 @@ export declare abstract class AbstractColumn<T extends ColumnType, TNullable ext
     protected parentTableName: string;
     protected columnType: T;
     protected columnName: string;
-    protected defaultParam: any;
+    protected defaultParam: RawSqlValue;
     protected referenced: AbstractColumn<T, boolean, boolean>;
     constructor(parent: TParent, columnName: string, columnType: T);
     getOnDelete: () => string | undefined;
@@ -34,17 +41,18 @@ export declare abstract class AbstractColumn<T extends ColumnType, TNullable ext
         onDelete?: 'CASCADE' | 'RESTRICT' | 'SET NULL' | 'SET DEFAULT';
         onUpdate?: 'CASCADE' | 'RESTRICT' | 'SET NULL' | 'SET DEFAULT';
     }): AbstractColumn<T, TNullable, TAutoIncrement, TParent>;
-    defaultValue: (value: ExtractColumnType<T>) => this;
+    defaultValue(value: ExtractColumnType<T> | RawSqlValue): AbstractColumn<T, boolean, boolean, TParent>;
     abstract primaryKey(): AbstractColumn<T, boolean, boolean, TParent>;
     unique: () => this;
     abstract notNull(): AbstractColumn<T, boolean, boolean, TParent>;
     getColumnName: () => string;
     getReferenced: () => AbstractColumn<T, boolean, boolean, TParent>;
     getColumnType: () => T;
-    getDefaultValue: () => any;
+    getDefaultValue: () => RawSqlValue;
 }
 export declare class Column<T extends ColumnType, TNullable extends boolean = true, TAutoIncrement extends boolean = false, TParent extends AbstractTable<any> = any> extends AbstractColumn<T, TNullable, TAutoIncrement, TParent> {
     constructor(parent: TParent, columnName: string, columnType: T);
+    defaultValue: (value: ExtractColumnType<T> | RawSqlValue) => Column<T, true, TAutoIncrement, TParent>;
     notNull(): Column<T, TAutoIncrement extends true ? true : TNullable extends true ? false : true, TAutoIncrement, TParent>;
     primaryKey(): Column<T, TAutoIncrement extends true ? true : false, TAutoIncrement, TParent>;
     foreignKey<ITable extends AbstractTable<ITable>>(table: new (db: DB) => ITable, callback: (table: ITable) => Column<any, boolean, boolean, ITable>, onConstraint?: {
@@ -58,6 +66,7 @@ export declare class Column<T extends ColumnType, TNullable extends boolean = tr
 }
 export declare class IndexedColumn<T extends ColumnType, TNullable extends boolean = true, TAutoIncrement extends boolean = false, TParent extends AbstractTable<any> = any> extends AbstractColumn<T, TNullable, TAutoIncrement, TParent> {
     constructor(parent: TParent, columnName: string, columnType: T, nullable: TNullable);
+    defaultValue: (value: ExtractColumnType<T> | RawSqlValue) => IndexedColumn<T, true, TAutoIncrement, TParent>;
     notNull(): IndexedColumn<T, TAutoIncrement extends true ? true : TNullable extends true ? false : true, TAutoIncrement, TParent>;
     primaryKey(): IndexedColumn<T, TAutoIncrement extends true ? true : false, TAutoIncrement, TParent>;
     foreignKey<ITable extends AbstractTable<ITable>>(table: new (db: DB) => ITable, callback: (table: ITable) => Column<any, boolean, boolean, ITable>, onConstraint?: {

package/columns/column.js

@@ -1,32 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.IndexedColumn = exports.Column = exports.AbstractColumn = exports.Defaults = void 0;
-var Defaults;
-(function (Defaults) {
-    Defaults["CURRENT_TIMESTAMP"] = "CURRENT_TIMESTAMP";
-})(Defaults = exports.Defaults || (exports.Defaults = {}));
+exports.IndexedColumn = exports.Column = exports.AbstractColumn = exports.rawValue = exports.Defaults = void 0;
+class RawSqlValue {
+    constructor(value, escape) {
+        this.value = value;
+        this.escape = escape;
+    }
+    toJSON() {
+        return this.escape ? `'${this.value}'` : this.value;
+    }
+}
+exports.Defaults = {
+    CURRENT_TIMESTAMP: new RawSqlValue('CURRENT_TIMESTAMP', false),
+};
+const rawValue = (value) => new RawSqlValue(value, false);
+exports.rawValue = rawValue;
 // eslint-disable-next-line max-len
 class AbstractColumn {
     constructor(parent, columnName, columnType) {
         this.isNullableFlag = true;
-        this.defaultParam = null;
         this.getOnDelete = () => this.onDelete;
         this.getOnUpdate = () => this.onUpdate;
         this.getAlias = () => `${this.parentTableName.replace('.', '_')}_${this.columnName}`;
         this.getParent = () => this.parent;
         this.getParentName = () => this.parentTableName;
-        this.defaultValue = (value) => {
-            if (Defaults[value] !== undefined) {
-                this.defaultParam = value;
-            }
-            else if (typeof value === 'boolean' || typeof value === 'number' || typeof value === 'bigint') {
-                this.defaultParam = value;
-            }
-            else {
-                this.defaultParam = `'${value}'`;
-            }
-            return this;
-        };
         this.unique = () => {
             this.uniqueKeyName = this.columnName;
             return this;
@@ -40,12 +37,28 @@ class AbstractColumn {
         this.parentTableName = parent.tableName();
         this.parent = parent;
     }
+    defaultValue(value) {
+        if (value instanceof RawSqlValue) {
+            this.defaultParam = value;
+        }
+        else if (typeof value === 'boolean' || typeof value === 'number' || typeof value === 'bigint') {
+            this.defaultParam = new RawSqlValue(value, false);
+        }
+        else {
+            this.defaultParam = new RawSqlValue(`${value}`, true);
+        }
+        return this;
+    }
 }
 exports.AbstractColumn = AbstractColumn;
 // eslint-disable-next-line max-len
 class Column extends AbstractColumn {
     constructor(parent, columnName, columnType) {
         super(parent, columnName, columnType);
+        this.defaultValue = (value) => {
+            super.defaultValue(value);
+            return this;
+        };
     }
     notNull() {
         this.isNullableFlag = false;
@@ -74,6 +87,10 @@ exports.Column = Column;
 class IndexedColumn extends AbstractColumn {
     constructor(parent, columnName, columnType, nullable) {
         super(parent, columnName, columnType);
+        this.defaultValue = (value) => {
+            super.defaultValue(value);
+            return this;
+        };
     }
     notNull() {
         this.isNullableFlag = false;

package/columns/index.d.ts

@@ -1,4 +1,4 @@
-export { Column, ExtractColumnType, Defaults } from './column';
+export { Column, ExtractColumnType, Defaults, rawValue, } 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

@@ -3,10 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 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.Defaults = exports.Column = void 0;
+exports.PgVarChar = exports.PgTimestamp = exports.PgTime = exports.PgText = exports.PgJsonb = exports.PgInteger = exports.PgBoolean = exports.PgBigInt = exports.PgBigDecimal = exports.rawValue = exports.Defaults = exports.Column = void 0;
+/* eslint-disable import/no-cycle */
 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; } });
+Object.defineProperty(exports, "rawValue", { enumerable: true, get: function () { return column_1.rawValue; } });
 var pgBigDecimal_1 = require("./types/pgBigDecimal");
 Object.defineProperty(exports, "PgBigDecimal", { enumerable: true, get: function () { return __importDefault(pgBigDecimal_1).default; } });
 var pgBigInt_1 = require("./types/pgBigInt");

package/data/citiesTable.d.ts

@@ -0,0 +1,9 @@
+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

@@ -0,0 +1,22 @@
+"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

@@ -0,0 +1,7 @@
+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

@@ -0,0 +1,15 @@
+"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

@@ -0,0 +1,17 @@
+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

@@ -0,0 +1,31 @@
+"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

@@ -0,0 +1,7 @@
+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

@@ -0,0 +1,20 @@
+"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;

package/package.json

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

package/serializer/serializer.js

@@ -10,9 +10,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const columns_1 = require("../columns");
 const tableIndex_1 = __importDefault(require("../indexes/tableIndex"));
-const serialiseForeignKey = (fkName, table, column, onDelete, onUpdate) => {
-    return `${fkName};${table};${column};${onDelete !== null && onDelete !== void 0 ? onDelete : ''};${onUpdate !== null && onUpdate !== void 0 ? onUpdate : ''}`;
-};
+// eslint-disable-next-line max-len
+const serialiseForeignKey = (fkName, table, column, onDelete, onUpdate) => `${fkName};${table};${column};${onDelete !== null && onDelete !== void 0 ? onDelete : ''};${onUpdate !== null && onUpdate !== void 0 ? onUpdate : ''}`;
 class MigrationSerializer {
     constructor() {
         this.generate = (tables, enums) => {
@@ -49,7 +48,7 @@ class MigrationSerializer {
                             notNull: !value.isNullableFlag,
                         };
                         if (value.getDefaultValue() !== undefined && value.getDefaultValue() !== null) {
-                            columnToReturn[value.getColumnName()].default = value.getDefaultValue();
+                            columnToReturn[value.getColumnName()].default = value.getDefaultValue().toJSON();
                         }
                         if (value.uniqueKeyName) {
                             const indexName = `${value.getParent().tableName()}_${value.getColumnName()}_index`;
@@ -66,11 +65,12 @@ class MigrationSerializer {
                         const referenced = value.getReferenced();
                         if (referenced) {
                             const fkName = `${value.getParent().tableName()}_${value.getColumnName()}_fkey`;
-                            const table = referenced.getParentName();
+                            const tableParentName = referenced.getParentName();
                             const column = referenced.getColumnName();
                             const onDelete = value.getOnDelete();
                             const onUpdate = value.getOnUpdate();
-                            const referenceString = serialiseForeignKey(fkName, table, column, onDelete, onUpdate);
+                            // eslint-disable-next-line max-len
+                            const referenceString = serialiseForeignKey(fkName, tableParentName, column, onDelete, onUpdate);
                             columnToReturn[value.getColumnName()].references = referenceString;
                         }
                     }
@@ -162,6 +162,7 @@ class MigrationSerializer {
                         const foreignKeyName = fk.constraint_name;
                         const onUpdate = fk.update_rule;
                         const onDelete = fk.delete_rule;
+                        // eslint-disable-next-line max-len
                         const references = serialiseForeignKey(foreignKeyName, tableTo, columnTo, onDelete, onUpdate);
                         mappedRefernces[columnFrom] = references;
                     }

package/test.js

@@ -3,47 +3,46 @@ 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"));
+const serializer_1 = __importDefault(require("./serializer/serializer"));
 (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 usersTable = new usersTable_1.default(db);
+        // const citiesTable = new CitiesTable(db);
+        // await usersTable.insert({
+        // });
+        // 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 serializer_1.default();
+        const res = ser.generate([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])
+        // const res = await usersTable.select()
+        //   .leftJoin(UsersTable, (table) => table.id, (table) => table.id)
+        //   .leftJoin(UsersTable, CitiesTable, (table) => table.id, (table) => table.id)
         //   .execute();
         // const res = await usersTable.select()
         //   // .groupBy((table, join1, join2, join3) => [table.id, join1.id, join1.phone])