drizzle-orm 0.10.44 → 0.10.45

package/db/session.d.ts

@@ -1,12 +1,13 @@
 import { Pool, QueryResult } from 'pg';
 export declare abstract class ISession {
     constructor();
-    abstract execute(query: string, values?: Array<any>): Promise<QueryResult<any>>;
+    execute(query: string, values?: Array<any>): Promise<QueryResult<any>>;
     abstract parametrized(num: number): string;
+    protected abstract _execute(query: string, values?: Array<any>): Promise<QueryResult<any>>;
 }
 export default class Session extends ISession {
     private pool;
     constructor(pool: Pool);
-    execute(query: string, values?: Array<any>): Promise<QueryResult<any>>;
     parametrized(num: number): string;
+    protected _execute(query: string, values?: Array<any>): Promise<QueryResult<any>>;
 }

package/db/session.js

@@ -5,6 +5,16 @@ class ISession {
     // eslint-disable-next-line @typescript-eslint/no-useless-constructor
     constructor() {
     }
+    async execute(query, values) {
+        const error = new Error();
+        try {
+            return await this._execute(query, values);
+        }
+        catch (e) {
+            error.message = e.message;
+            throw error;
+        }
+    }
 }
 exports.ISession = ISession;
 class Session extends ISession {
@@ -12,11 +22,11 @@ class Session extends ISession {
         super();
         this.pool = pool;
     }
-    async execute(query, values) {
-        return this.pool.query(query, values || []);
-    }
     parametrized(num) {
         return `$${num}`;
     }
+    async _execute(query, values) {
+        return this.pool.query(query, values || []);
+    }
 }
 exports.default = Session;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drizzle-orm",
-  "version": "0.10.44",
+  "version": "0.10.45",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -18,19 +18,21 @@
   "homepage": "https://github.com/lambda-direct/drizzle-orm#readme",
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "4.10.0",
+    "dotenv": "^16.0.0",
     "eslint": "7.15.0",
     "eslint-config-airbnb-typescript": "12.0.0",
     "eslint-plugin-import": "2.22.1",
     "eslint-plugin-prefer-arrow": "1.2.2",
     "ts-node": "^10.0.0",
-    "typescript": "4.2.4"
+    "typescript": "4.2.4",
+    "uvu": "^0.5.3"
   },
   "dependencies": {
     "@types/pg": "^8.6.1",
     "pg": "^8.6.0"
   },
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
+    "test": "uvu -r ts-node/register tests",
     "ts": "tsc",
     "lint": "eslint ./src --ext .ts",
     "run": "ts-node src/tables/newAbstractTable.ts"

package/test.js

@@ -7,7 +7,7 @@ const dbConnector_1 = __importDefault(require("./db/dbConnector"));
 const session_1 = require("./db/session");
 const usersTable_1 = __importDefault(require("./docs/tables/usersTable"));
 class KnexSession extends session_1.ISession {
-    execute(query, values) {
+    _execute(query, values) {
         console.log(query);
         console.log(values);
         return { rows: [] };
@@ -46,7 +46,7 @@ class KnexSession extends session_1.ISession {
             isArchived: false,
             role: 'bar',
             decimalField: 12,
-            phone: ' tedss\'t',
+            phone: '12',
             media: [' tes\'t', ' t\'es\'t'],
             createdAt: new Date(),
         }).execute();

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;