drizzle-orm 0.10.45 → 0.10.46

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drizzle-orm",
-  "version": "0.10.45",
+  "version": "0.10.46",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -19,6 +19,9 @@
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "4.10.0",
     "dotenv": "^16.0.0",
+    "drizzle-kit": "^0.9.47",
+    "esbuild": "^0.14.2",
+    "esbuild-register": "^3.3.2",
     "eslint": "7.15.0",
     "eslint-config-airbnb-typescript": "12.0.0",
     "eslint-plugin-import": "2.22.1",
@@ -32,7 +35,7 @@
     "pg": "^8.6.0"
   },
   "scripts": {
-    "test": "uvu -r ts-node/register tests",
+    "test": "uvu -r esbuild-register tests",
     "ts": "tsc",
     "lint": "eslint ./src --ext .ts",
     "run": "ts-node src/tables/newAbstractTable.ts"

package/{builders → src/builders}/highLvlBuilders/abstractRequestBuilder.d.ts

@@ -21,6 +21,7 @@ export default abstract class TableRequestBuilder<TTable extends AbstractTable<T
     /**
      * Current function will return an element only if response is of length 1
      * If there are more or less than 1 element, will throw an Error
+     * @deprecated Use `.execute()` or `.all()` instead
      */
     findOne: () => Promise<[keyof TPartial] extends [never] ? ExtractModel<TTable> : ExtractModel<TPartial>>;
     protected abstract _execute(): Promise<Array<[keyof TPartial] extends [never] ? ExtractModel<TTable> : ExtractModel<TPartial>>>;

package/{builders → src/builders}/highLvlBuilders/abstractRequestBuilder.js

@@ -9,6 +9,7 @@ class TableRequestBuilder {
         /**
          * Current function will return an element only if response is of length 1
          * If there are more or less than 1 element, will throw an Error
+         * @deprecated Use `.execute()` or `.all()` instead
          */
         this.findOne = async () => {
             const executionRes = await this._execute();

package/{builders → src/builders}/highLvlBuilders/selectRequestBuilder.js

@@ -70,6 +70,8 @@ class SelectTRB extends abstractRequestBuilder_1.default {
             catch (e) {
                 throw new builderError_1.default(builderError_1.BuilderType.SELECT, this._table.tableName(), this._columns, e, this._session, this._filter);
             }
+            console.log(query);
+            console.log(values);
             if (this._logger) {
                 this._logger.info(`Selecting from ${this._table.tableName()} using query:\n ${query}`);
                 this._logger.info(`Values for query:\n ${values}`);

package/{builders → src/builders}/joinBuilders/builders/abstractJoinBuilder.d.ts

@@ -1,4 +1,4 @@
-import BaseLogger from 'orm/src/logger/abstractLogger';
+import BaseLogger from '@/logger/abstractLogger';
 import { QueryResult } from 'pg';
 import { AbstractColumn } from '../../../columns/column';
 import ColumnType from '../../../columns/types/columnType';

package/{builders → src/builders}/joinBuilders/builders/selectWithFiveJoins.d.ts

@@ -1,4 +1,4 @@
-import BaseLogger from 'orm/src/logger/abstractLogger';
+import BaseLogger from '@/logger/abstractLogger';
 import { QueryResult } from 'pg';
 import { AbstractColumn } from '../../../columns/column';
 import ColumnType from '../../../columns/types/columnType';

package/{builders → src/builders}/joinBuilders/builders/selectWithFourJoins.d.ts

@@ -1,4 +1,4 @@
-import BaseLogger from 'orm/src/logger/abstractLogger';
+import BaseLogger from '@/logger/abstractLogger';
 import { QueryResult } from 'pg';
 import { AbstractColumn } from '../../../columns/column';
 import ColumnType from '../../../columns/types/columnType';

package/{builders → src/builders}/joinBuilders/builders/selectWithJoin.d.ts

@@ -1,4 +1,4 @@
-import BaseLogger from 'orm/src/logger/abstractLogger';
+import BaseLogger from '@/logger/abstractLogger';
 import { QueryResult } from 'pg';
 import { AbstractColumn } from '../../../columns/column';
 import ColumnType from '../../../columns/types/columnType';

package/{builders → src/builders}/joinBuilders/builders/selectWithThreeJoins.d.ts

@@ -1,4 +1,4 @@
-import BaseLogger from 'orm/src/logger/abstractLogger';
+import BaseLogger from '@/logger/abstractLogger';
 import { QueryResult } from 'pg';
 import { AbstractColumn } from '../../../columns/column';
 import ColumnType from '../../../columns/types/columnType';

package/{builders → src/builders}/joinBuilders/builders/selectWithTwoJoins.d.ts

@@ -1,4 +1,4 @@
-import BaseLogger from 'orm/src/logger/abstractLogger';
+import BaseLogger from '@/logger/abstractLogger';
 import { QueryResult } from 'pg';
 import { AbstractColumn } from '../../../columns/column';
 import ColumnType from '../../../columns/types/columnType';

package/{db → src/db}/dbConnector.js

@@ -17,10 +17,10 @@ class DbConnector {
         this.connect = async () => {
             try {
                 const pool = new pg_1.Pool(this.__config);
-                await pool.connect();
+                const connection = await pool.connect();
                 // console.log('Db connected!');
                 // check if table structure is the same as in code
-                return new db_1.default(new session_1.default(pool));
+                return new db_1.default(new session_1.default(pool, connection));
             }
             catch (e) {
                 // console.log(`Connection error: ${e.message}`);

package/{db → src/db}/session.d.ts

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

package/{db → src/db}/session.js

@@ -18,13 +18,20 @@ class ISession {
 }
 exports.ISession = ISession;
 class Session extends ISession {
-    constructor(pool) {
+    constructor(pool, connection) {
         super();
         this.pool = pool;
+        this.connection = connection;
     }
     parametrized(num) {
         return `$${num}`;
     }
+    async closeConnection() {
+        if (this.connection) {
+            this.connection.release();
+        }
+        await this.pool.end();
+    }
     async _execute(query, values) {
         return this.pool.query(query, values || []);
     }