npm - typeorm - Versions diffs - 0.3.26-dev.abf8863 → 0.3.26-dev.aebc7eb - Mend

typeorm 0.3.26-dev.abf8863 → 0.3.26-dev.aebc7eb

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (151) hide show

package/browser/driver/react-native/ReactNativeQueryRunner.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"sources":["../browser/src/driver/react-native/ReactNativeQueryRunner.ts"],"names":[],"mappings":"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~~KAAK~~,~~EAAE,~~GAAQ,EAAE,EAAE;~~oBACf~~,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,aAAa,CACvC,GAAG,EACH,KAAK,EACL,UAAU,EACV,IAAI,CACP,CAAA;oBACD,IAAI,CAAC,WAAW,CAAC,wBAAwB,CACrC,iBAAiB,EACjB,KAAK,EACL,UAAU,EACV,KAAK,EACL,SAAS,EACT,SAAS,EACT,GAAG,CACN,CAAA;oBAED,IAAI,CAAC,IAAI,gBAAgB,CAAC,KAAK,EAAE,UAAU,EAAE,GAAG,CAAC,CAAC,CAAA;gBACtD,CAAC,CACJ,CAAA;YACL,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACX,IAAI,CAAC,GAAG,CAAC,CAAA;YACb,CAAC;oBAAS,CAAC;gBACP,MAAM,iBAAiB,CAAC,IAAI,EAAE,CAAA;YAClC,CAAC;QACL,CAAC,CAAC,CAAA;IACN,CAAC;IAED,4EAA4E;IAC5E,oBAAoB;IACpB,4EAA4E;IAE5E;;OAEG;IACO,WAAW,CACjB,aAA4B,EAC5B,aAAqB,CAAC;QAEtB,OAAO,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,CAAA;IAC5E,CAAC;CACJ","file":"ReactNativeQueryRunner.js","sourcesContent":["import { ObjectLiteral } from \"../../common/ObjectLiteral\"\nimport { QueryFailedError } from \"../../error/QueryFailedError\"\nimport { QueryRunnerAlreadyReleasedError } from \"../../error/QueryRunnerAlreadyReleasedError\"\nimport { QueryResult } from \"../../query-runner/QueryResult\"\nimport { Broadcaster } from \"../../subscriber/Broadcaster\"\nimport { BroadcasterResult } from \"../../subscriber/BroadcasterResult\"\nimport { AbstractSqliteQueryRunner } from \"../sqlite-abstract/AbstractSqliteQueryRunner\"\nimport { ReactNativeDriver } from \"./ReactNativeDriver\"\n\n/*\n Runs queries on a single sqlite database connection.\n /\nexport class ReactNativeQueryRunner extends AbstractSqliteQueryRunner {\n /\n Database driver used by connection.\n /\n // @ts-ignore temporary, we need to fix the issue with the AbstractSqliteDriver and circular errors\n driver: ReactNativeDriver\n\n // -------------------------------------------------------------------------\n // Constructor\n // -------------------------------------------------------------------------\n\n constructor(driver: ReactNativeDriver) {\n super()\n this.driver = driver\n this.connection = driver.connection\n this.broadcaster = new Broadcaster(this)\n }\n\n /\n Called before migrations are run.\n /\n async beforeMigration(): Promise<void> {\n await this.query(`PRAGMA foreign_keys = OFF`)\n }\n\n /\n Called after migrations are run.\n /\n async afterMigration(): Promise<void> {\n await this.query(`PRAGMA foreign_keys = ON`)\n }\n\n /\n Executes a given SQL query.\n /\n async query(\n query: string,\n parameters?: any[],\n useStructuredResult = false,\n ): Promise<any> {\n if (this.isReleased) throw new QueryRunnerAlreadyReleasedError()\n\n const databaseConnection = await this.connect()\n\n this.driver.connection.logger.logQuery(query, parameters, this)\n await this.broadcaster.broadcast(\"BeforeQuery\", query, parameters)\n\n const broadcasterResult = new BroadcasterResult()\n\n const queryStartTime = Date.now()\n\n return new Promise(async (ok, fail) => {\n try {\n databaseConnection.executeSql(\n query,\n parameters,\n async (raw: any) => {\n // log slow queries if maxQueryExecution time is set\n const maxQueryExecutionTime =\n this.driver.options.maxQueryExecutionTime\n const queryEndTime = Date.now()\n const queryExecutionTime = queryEndTime - queryStartTime\n this.broadcaster.broadcastAfterQueryEvent(\n broadcasterResult,\n query,\n parameters,\n true,\n queryExecutionTime,\n raw,\n undefined,\n )\n\n if (\n maxQueryExecutionTime &&\n queryExecutionTime > maxQueryExecutionTime\n )\n this.driver.connection.logger.logQuerySlow(\n queryExecutionTime,\n query,\n parameters,\n this,\n )\n\n if (broadcasterResult.promises.length > 0)\n await Promise.all(broadcasterResult.promises)\n\n const result = new QueryResult()\n\n if (raw?.hasOwnProperty(\"rowsAffected\")) {\n result.affected = raw.rowsAffected\n }\n\n if (raw?.hasOwnProperty(\"rows\")) {\n const records = []\n for (let i = 0; i < raw.rows.length; i++) {\n records.push(raw.rows.item(i))\n }\n\n result.raw = records\n result.records = records\n }\n\n // return id of inserted row, if query was insert statement.\n if (query.substr(0, 11) === \"INSERT INTO\") {\n result.raw = raw.insertId\n }\n\n if (useStructuredResult) {\n ok(result)\n } else {\n ok(result.raw)\n }\n },\n ~~async~~ (err: any) => {\n this.driver.connection.logger.logQueryError(\n err,\n query,\n parameters,\n this,\n )\n this.broadcaster.broadcastAfterQueryEvent(\n broadcasterResult,\n query,\n parameters,\n false,\n undefined,\n undefined,\n err,\n )\n\n fail(new QueryFailedError(query, parameters, err))\n },\n )\n } catch (err) {\n fail(err)\n } finally {\n await broadcasterResult.wait()\n }\n })\n }\n\n // -------------------------------------------------------------------------\n // Protected Methods\n // -------------------------------------------------------------------------\n\n /\n Parametrizes given object of values. Used to create column=value queries.\n */\n protected parametrize(\n objectLiteral: ObjectLiteral,\n startIndex: number = 0,\n ): string[] {\n return Object.keys(objectLiteral).map((key, index) => `\"${key}\"` + \"=?\")\n }\n}\n"],"sourceRoot":"../.."}
1	+ {"version":3,"sources":["../browser/src/driver/react-native/ReactNativeQueryRunner.ts"],"names":[],"mappings":"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","file":"ReactNativeQueryRunner.js","sourcesContent":["import { ObjectLiteral } from \"../../common/ObjectLiteral\"\nimport { QueryFailedError } from \"../../error/QueryFailedError\"\nimport { QueryRunnerAlreadyReleasedError } from \"../../error/QueryRunnerAlreadyReleasedError\"\nimport { QueryResult } from \"../../query-runner/QueryResult\"\nimport { Broadcaster } from \"../../subscriber/Broadcaster\"\nimport { BroadcasterResult } from \"../../subscriber/BroadcasterResult\"\nimport { AbstractSqliteQueryRunner } from \"../sqlite-abstract/AbstractSqliteQueryRunner\"\nimport { ReactNativeDriver } from \"./ReactNativeDriver\"\n\n/*\n Runs queries on a single sqlite database connection.\n /\nexport class ReactNativeQueryRunner extends AbstractSqliteQueryRunner {\n /\n Database driver used by connection.\n /\n // @ts-ignore temporary, we need to fix the issue with the AbstractSqliteDriver and circular errors\n driver: ReactNativeDriver\n\n // -------------------------------------------------------------------------\n // Constructor\n // -------------------------------------------------------------------------\n\n constructor(driver: ReactNativeDriver) {\n super()\n this.driver = driver\n this.connection = driver.connection\n this.broadcaster = new Broadcaster(this)\n }\n\n /\n Called before migrations are run.\n /\n async beforeMigration(): Promise<void> {\n await this.query(`PRAGMA foreign_keys = OFF`)\n }\n\n /\n Called after migrations are run.\n /\n async afterMigration(): Promise<void> {\n await this.query(`PRAGMA foreign_keys = ON`)\n }\n\n /\n Executes a given SQL query.\n /\n async query(\n query: string,\n parameters?: any[],\n useStructuredResult = false,\n ): Promise<any> {\n if (this.isReleased) throw new QueryRunnerAlreadyReleasedError()\n\n const databaseConnection = await this.connect()\n\n this.driver.connection.logger.logQuery(query, parameters, this)\n await this.broadcaster.broadcast(\"BeforeQuery\", query, parameters)\n\n const broadcasterResult = new BroadcasterResult()\n\n const queryStartTime = Date.now()\n\n return new Promise(async (ok, fail) => {\n try {\n databaseConnection.executeSql(\n query,\n parameters,\n async (raw: any) => {\n // log slow queries if maxQueryExecution time is set\n const maxQueryExecutionTime =\n this.driver.options.maxQueryExecutionTime\n const queryEndTime = Date.now()\n const queryExecutionTime = queryEndTime - queryStartTime\n this.broadcaster.broadcastAfterQueryEvent(\n broadcasterResult,\n query,\n parameters,\n true,\n queryExecutionTime,\n raw,\n undefined,\n )\n\n if (\n maxQueryExecutionTime &&\n queryExecutionTime > maxQueryExecutionTime\n )\n this.driver.connection.logger.logQuerySlow(\n queryExecutionTime,\n query,\n parameters,\n this,\n )\n\n if (broadcasterResult.promises.length > 0)\n await Promise.all(broadcasterResult.promises)\n\n const result = new QueryResult()\n\n if (raw?.hasOwnProperty(\"rowsAffected\")) {\n result.affected = raw.rowsAffected\n }\n\n if (raw?.hasOwnProperty(\"rows\")) {\n const records = []\n for (let i = 0; i < raw.rows.length; i++) {\n records.push(raw.rows.item(i))\n }\n\n result.raw = records\n result.records = records\n }\n\n // return id of inserted row, if query was insert statement.\n if (query.substr(0, 11) === \"INSERT INTO\") {\n result.raw = raw.insertId\n }\n\n if (useStructuredResult) {\n ok(result)\n } else {\n ok(result.raw)\n }\n },\n (err: any) => {\n this.driver.connection.logger.logQueryError(\n err,\n query,\n parameters,\n this,\n )\n this.broadcaster.broadcastAfterQueryEvent(\n broadcasterResult,\n query,\n parameters,\n false,\n undefined,\n undefined,\n err,\n )\n\n fail(new QueryFailedError(query, parameters, err))\n },\n )\n } catch (err) {\n fail(err)\n } finally {\n await broadcasterResult.wait()\n }\n })\n }\n\n // -------------------------------------------------------------------------\n // Protected Methods\n // -------------------------------------------------------------------------\n\n /\n Parametrizes given object of values. Used to create column=value queries.\n */\n protected parametrize(\n objectLiteral: ObjectLiteral,\n startIndex: number = 0,\n ): string[] {\n return Object.keys(objectLiteral).map((key, index) => `\"${key}\"` + \"=?\")\n }\n}\n"],"sourceRoot":"../.."}

package/browser/driver/sap/SapConnectionOptions.d.ts CHANGED Viewed

@@ -14,40 +14,66 @@ export interface SapConnectionOptions extends BaseDataSourceOptions, SapConnecti
     readonly schema?: string;
     /**
      * The driver objects
-     * This defaults to require("hdb-pool")
+     * This defaults to require("@sap/hana-client")
      */
     readonly driver?: any;
     /**
-     * The driver objects
-     * This defaults to require("@sap/hana-client")
+     * @deprecated Use {@link driver} instead.
      */
     readonly hanaClientDriver?: any;
     /**
      * Pool options.
      */
     readonly pool?: {
+        /**
+         * Maximum number of open connections created by the pool, each of which
+         * may be in the pool waiting to be reused or may no longer be in the
+         * pool and actively being used (default: 10).
+         */
+        readonly maxConnectedOrPooled?: number;
+        /**
+         * Defines the maximum time, in seconds, that connections are allowed to
+         * remain in the pool before being marked for eviction (default: 30).
+         */
+        readonly maxPooledIdleTime?: number;
+        /**
+         * Determines whether or not the pooled connection should be tested for
+         * viability before being reused (default: false).
+         */
+        readonly pingCheck?: boolean;
+        /**
+         * Maximum number of connections allowed to be in the pool, waiting to
+         * be reused (default: 0, no limit).
+         */
+        readonly poolCapacity?: number;
         /**
          * Max number of connections.
+         * @deprecated Use {@link maxConnectedOrPooled} instead.
          */
         readonly max?: number;
         /**
          * Minimum number of connections.
+         * @deprecated Obsolete, no alternative exists.
          */
         readonly min?: number;
         /**
-         * Maximum number of waiting requests allowed. (default=0, no limit).
+         * Maximum number of waiting requests allowed.
+         * @deprecated Obsolete, no alternative exists.
          */
         readonly maxWaitingRequests?: number;
         /**
-         * Max milliseconds a request will wait for a resource before timing out. (default=5000)
+         * Max milliseconds a request will wait for a resource before timing out.
+         * @deprecated Obsolete, no alternative exists.
          */
         readonly requestTimeout?: number;
         /**
-         * How often to run resource timeout checks. (default=0, disabled)
+         * How often to run resource timeout checks.
+         * @deprecated Obsolete, no alternative exists.
          */
         readonly checkInterval?: number;
         /**
-         * Idle timeout
+         * Idle timeout (in milliseconds).
+         * @deprecated Use {@link maxPooledIdleTime} (in seconds) instead .
          */
         readonly idleTimeout?: number;
         /**
@@ -56,5 +82,4 @@ export interface SapConnectionOptions extends BaseDataSourceOptions, SapConnecti
          */
         readonly poolErrorHandler?: (err: any) => any;
     };
-    readonly poolSize?: never;
 }

package/browser/driver/sap/SapConnectionOptions.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"sources":["../browser/src/driver/sap/SapConnectionOptions.ts"],"names":[],"mappings":"","file":"SapConnectionOptions.js","sourcesContent":["import { BaseDataSourceOptions } from \"../../data-source/BaseDataSourceOptions\"\nimport { SapConnectionCredentialsOptions } from \"./SapConnectionCredentialsOptions\"\n\n/*\n SAP Hana specific connection options.\n /\nexport interface SapConnectionOptions\n extends BaseDataSourceOptions,\n SapConnectionCredentialsOptions {\n /\n Database type.\n /\n readonly type: \"sap\"\n\n /\n Database schema.\n /\n readonly schema?: string\n\n /\n The driver objects\n * This defaults to require(\"~~hdb~~-~~pool~~\")\n /\n readonly driver?: any\n\n /\n ~~The~~ driver ~~objects~~\n * ~~This~~ ~~defaults~~ to ~~require~~(\~~"@sap/hana-client~~\")\n /\n readonly ~~hanaClientDriver~~?: ~~any~~\n\n /\n ~~Pool~~ ~~options~~.\n /\n readonly ~~pool~~?: {\n /\n Max number of connections.\n /\n readonly max?: number\n\n /\n Minimum number of connections.\n /\n readonly min?: number\n\n /\n Maximum number of waiting requests allowed. ~~(default=0~~, no ~~limit)~~.\n /\n readonly maxWaitingRequests?: number\n /\n Max milliseconds a request will wait for a resource before timing out. ~~(default=5000)\~~n /\n readonly requestTimeout?: number\n /\n How often to run resource timeout checks. ~~(default=0~~, ~~disabled)\~~n /\n readonly checkInterval?: number\n /\n Idle timeout\n /\n readonly idleTimeout?: number\n\n /\n Function handling errors thrown by drivers pool.\n * Defaults to logging error with `warn` level.\n */\n readonly poolErrorHandler?: (err: any) => any\n }\n~~\n readonly poolSize?: never\n~~}\n"],"sourceRoot":"../.."}
1	+ {"version":3,"sources":["../browser/src/driver/sap/SapConnectionOptions.ts"],"names":[],"mappings":"","file":"SapConnectionOptions.js","sourcesContent":["import { BaseDataSourceOptions } from \"../../data-source/BaseDataSourceOptions\"\nimport { SapConnectionCredentialsOptions } from \"./SapConnectionCredentialsOptions\"\n\n/*\n SAP Hana specific connection options.\n /\nexport interface SapConnectionOptions\n extends BaseDataSourceOptions,\n SapConnectionCredentialsOptions {\n /\n Database type.\n /\n readonly type: \"sap\"\n\n /\n Database schema.\n /\n readonly schema?: string\n\n /\n The driver objects\n * This defaults to require(\"@sap/hana-client\")\n /\n readonly driver?: any\n\n /\n @deprecated Use {@link driver} instead.\n /\n readonly hanaClientDriver?: any\n\n /\n Pool options.\n /\n readonly pool?: {\n /\n Maximum number of open connections created by the pool, each of which\n * may be in the pool waiting to be reused or may no longer be in the\n * pool and actively being used (default: 10).\n /\n readonly maxConnectedOrPooled?: number\n\n /\n Defines the maximum time, in seconds, that connections are allowed to\n * remain in the pool before being marked for eviction (default: 30).\n /\n readonly maxPooledIdleTime?: number\n\n /\n Determines whether or not the pooled connection should be tested for\n * viability before being reused (default: false).\n /\n readonly pingCheck?: boolean\n\n /\n Maximum number of connections allowed to be in the pool, waiting to\n * be reused (default: 0, no limit).\n /\n readonly poolCapacity?: number\n\n /\n Max number of connections.\n * @deprecated Use {@link maxConnectedOrPooled} instead.\n /\n readonly max?: number\n\n /\n Minimum number of connections.\n * @deprecated Obsolete, no alternative exists.\n /\n readonly min?: number\n\n /\n Maximum number of waiting requests allowed.\n * @deprecated Obsolete, no alternative exists.\n /\n readonly maxWaitingRequests?: number\n\n /\n Max milliseconds a request will wait for a resource before timing out.\n * @deprecated Obsolete, no alternative exists.\n /\n readonly requestTimeout?: number\n\n /\n How often to run resource timeout checks.\n * @deprecated Obsolete, no alternative exists.\n /\n readonly checkInterval?: number\n\n /\n Idle timeout (in milliseconds).\n * @deprecated Use {@link maxPooledIdleTime} (in seconds) instead .\n /\n readonly idleTimeout?: number\n\n /\n Function handling errors thrown by drivers pool.\n * Defaults to logging error with `warn` level.\n */\n readonly poolErrorHandler?: (err: any) => any\n }\n}\n"],"sourceRoot":"../.."}

package/browser/driver/sap/SapDriver.d.ts CHANGED Viewed

@@ -1,15 +1,15 @@
 import { ColumnType, DataSource, EntityMetadata, ObjectLiteral, Table, TableColumn, TableForeignKey } from "../..";
 import { ColumnMetadata } from "../../metadata/ColumnMetadata";
 import { RdbmsSchemaBuilder } from "../../schema-builder/RdbmsSchemaBuilder";
+import { View } from "../../schema-builder/view/View";
 import { Driver } from "../Driver";
 import { CteCapabilities } from "../types/CteCapabilities";
 import { DataTypeDefaults } from "../types/DataTypeDefaults";
 import { MappedColumnTypes } from "../types/MappedColumnTypes";
-import { SapConnectionOptions } from "./SapConnectionOptions";
-import { SapQueryRunner } from "./SapQueryRunner";
 import { ReplicationMode } from "../types/ReplicationMode";
-import { View } from "../../schema-builder/view/View";
 import { UpsertType } from "../types/UpsertType";
+import { SapConnectionOptions } from "./SapConnectionOptions";
+import { SapQueryRunner } from "./SapQueryRunner";
 /**
  * Organizes communication with SAP Hana DBMS.
  *
@@ -21,11 +21,11 @@ export declare class SapDriver implements Driver {
      */
     connection: DataSource;
     /**
-     * Hana Pool instance.
+     * SAP HANA Client Pool instance.
      */
     client: any;
     /**
-     * Hana Client streaming extension.
+     * SAP HANA Client streaming extension.
      */
     streamClient: any;
     /**
@@ -33,10 +33,9 @@ export declare class SapDriver implements Driver {
      */
     master: any;
     /**
-     * Pool for slave databases.
-     * Used in replication.
+     * Function handling errors thrown by drivers pool.
      */
-    slaves: any[];
+    poolErrorHandler: (error: any) => void;
     /**
      * Connection options.
      */
@@ -104,7 +103,7 @@ export declare class SapDriver implements Driver {
     dataTypeDefaults: DataTypeDefaults;
     /**
      * Max length allowed by SAP HANA for aliases (identifiers).
-     * @see https://help.sap.com/viewer/4fe29514fd584807ac9f2a04f6754767/2.0.03/en-US/20a760537519101497e3cfe07b348f3c.html
+     * @see https://help.sap.com/docs/hana-cloud-database/sap-hana-cloud-sap-hana-database-sql-reference-guide/system-limitations
      */
     maxAliasLength: number;
     cteCapabilities: CteCapabilities;
@@ -124,6 +123,18 @@ export declare class SapDriver implements Driver {
      * Closes connection with the database.
      */
     disconnect(): Promise<void>;
+    /**
+     * Obtains a new database connection to a master server.
+     * Used for replication.
+     * If replication is not setup then returns default connection's database connection.
+     */
+    obtainMasterConnection(): Promise<any>;
+    /**
+     * Obtains a new database connection to a slave server.
+     * Used for replication.
+     * If replication is not setup then returns master (default) connection's database connection.
+     */
+    obtainSlaveConnection(): Promise<any>;
     /**
      * Creates a schema builder used to build and sync a schema.
      */
@@ -187,22 +198,10 @@ export declare class SapDriver implements Driver {
      * Creates column type definition including length, precision and scale
      */
     createFullType(column: TableColumn): string;
-    /**
-     * Obtains a new database connection to a master server.
-     * Used for replication.
-     * If replication is not setup then returns default connection's database connection.
-     */
-    obtainMasterConnection(): Promise<any>;
-    /**
-     * Obtains a new database connection to a slave server.
-     * Used for replication.
-     * If replication is not setup then returns master (default) connection's database connection.
-     */
-    obtainSlaveConnection(): Promise<any>;
     /**
      * Creates generated map of values generated or returned by database after INSERT query.
      */
-    createGeneratedMap(metadata: EntityMetadata, insertResult: ObjectLiteral): any;
+    createGeneratedMap(metadata: EntityMetadata, insertResult: ObjectLiteral): ObjectLiteral | undefined;
     /**
      * Differentiate columns of this table and columns from the given column metadatas columns
      * and returns only changed.

package/browser/driver/sap/SapDriver.js CHANGED Viewed

@@ -1,3 +1,4 @@
+import { promisify } from "node:util";
 import { ConnectionIsNotSetError, } from "../..";
 import { DriverPackageNotInstalledError } from "../../error/DriverPackageNotInstalledError";
 import { TypeORMError } from "../../error/TypeORMError";
@@ -5,10 +6,10 @@ import { PlatformTools } from "../../platform/PlatformTools";
 import { RdbmsSchemaBuilder } from "../../schema-builder/RdbmsSchemaBuilder";
 import { ApplyValueTransformers } from "../../util/ApplyValueTransformers";
 import { DateUtils } from "../../util/DateUtils";
+import { InstanceChecker } from "../../util/InstanceChecker";
 import { OrmUtils } from "../../util/OrmUtils";
-import { SapQueryRunner } from "./SapQueryRunner";
 import { DriverUtils } from "../DriverUtils";
-import { InstanceChecker } from "../../util/InstanceChecker";
+import { SapQueryRunner } from "./SapQueryRunner";
 /**
  * Organizes communication with SAP Hana DBMS.
  *
@@ -19,11 +20,6 @@ export class SapDriver {
     // Constructor
     // -------------------------------------------------------------------------
     constructor(connection) {
-        /**
-         * Pool for slave databases.
-         * Used in replication.
-         */
-        this.slaves = [];
         /**
          * Indicates if replication is enabled.
          */
@@ -151,7 +147,7 @@ export class SapDriver {
         };
         /**
          * Max length allowed by SAP HANA for aliases (identifiers).
-         * @see https://help.sap.com/viewer/4fe29514fd584807ac9f2a04f6754767/2.0.03/en-US/20a760537519101497e3cfe07b348f3c.html
+         * @see https://help.sap.com/docs/hana-cloud-database/sap-hana-cloud-sap-hana-database-sql-reference-guide/system-limitations
          */
         this.maxAliasLength = 128;
         this.cteCapabilities = {
@@ -174,50 +170,55 @@ export class SapDriver {
      */
     async connect() {
         // HANA connection info
-        const dbParams = {
-            hostName: this.options.host,
+        const connectionOptions = {
+            host: this.options.host,
             port: this.options.port,
-            userName: this.options.username,
+            user: this.options.username,
             password: this.options.password,
-            ...this.options.extra,
+            database: this.options.database,
+            currentSchema: this.options.schema,
+            encrypt: this.options.encrypt,
+            sslValidateCertificate: this.options.sslValidateCertificate,
+            key: this.options.key,
+            cert: this.options.cert,
+            ca: this.options.ca,
         };
-        if (this.options.database)
-            dbParams.databaseName = this.options.database;
-        if (this.options.schema)
-            dbParams.currentSchema = this.options.schema;
-        if (this.options.encrypt)
-            dbParams.encrypt = this.options.encrypt;
-        if (this.options.sslValidateCertificate)
-            dbParams.validateCertificate = this.options.sslValidateCertificate;
-        if (this.options.key)
-            dbParams.key = this.options.key;
-        if (this.options.cert)
-            dbParams.cert = this.options.cert;
-        if (this.options.ca)
-            dbParams.ca = this.options.ca;
+        Object.keys(connectionOptions).forEach((key) => {
+            if (connectionOptions[key] === undefined) {
+                delete connectionOptions[key];
+            }
+        });
+        Object.assign(connectionOptions, this.options.extra ?? {});
         // pool options
-        const options = {
-            min: this.options.pool && this.options.pool.min
-                ? this.options.pool.min
-                : 1,
-            max: this.options.pool && this.options.pool.max
-                ? this.options.pool.max
-                : 10,
+        const poolOptions = {
+            maxConnectedOrPooled: this.options.pool?.maxConnectedOrPooled ??
+                this.options.pool?.max ??
+                this.options.poolSize ??
+                10,
+            maxPooledIdleTime: this.options.pool?.maxPooledIdleTime ??
+                (this.options.pool?.idleTimeout
+                    ? this.options.pool.idleTimeout / 1000
+                    : 30),
         };
-        if (this.options.pool && this.options.pool.checkInterval)
-            options.checkInterval = this.options.pool.checkInterval;
-        if (this.options.pool && this.options.pool.maxWaitingRequests)
-            options.maxWaitingRequests = this.options.pool.maxWaitingRequests;
-        if (this.options.pool && this.options.pool.requestTimeout)
-            options.requestTimeout = this.options.pool.requestTimeout;
-        if (this.options.pool && this.options.pool.idleTimeout)
-            options.idleTimeout = this.options.pool.idleTimeout;
-        const { logger } = this.connection;
-        const poolErrorHandler = options.poolErrorHandler ||
-            ((error) => logger.log("warn", `SAP Hana pool raised an error. ${error}`));
-        this.client.eventEmitter.on("poolError", poolErrorHandler);
+        if (this.options.pool?.pingCheck) {
+            poolOptions.pingCheck = this.options.pool.pingCheck;
+        }
+        if (this.options.pool?.poolCapacity) {
+            poolOptions.poolCapacity = this.options.pool.poolCapacity;
+        }
+        this.poolErrorHandler =
+            this.options.pool?.poolErrorHandler ??
+                ((error) => {
+                    this.connection.logger.log("warn", `SAP HANA pool raised an error: ${error}`);
+                });
         // create the pool
-        this.master = this.client.createPool(dbParams, options);
+        try {
+            this.master = this.client.createPool(connectionOptions, poolOptions);
+        }
+        catch (error) {
+            this.poolErrorHandler(error);
+            throw error;
+        }
         const queryRunner = this.createQueryRunner("master");
         const { version, database } = await queryRunner.getDatabaseAndVersion();
         this.version = version;
@@ -242,7 +243,39 @@ export class SapDriver {
             throw new ConnectionIsNotSetError("sap");
         }
         this.master = undefined;
-        await pool.clear();
+        try {
+            await promisify(pool.clear).call(pool);
+        }
+        catch (error) {
+            this.poolErrorHandler(error);
+            throw error;
+        }
+    }
+    /**
+     * Obtains a new database connection to a master server.
+     * Used for replication.
+     * If replication is not setup then returns default connection's database connection.
+     */
+    async obtainMasterConnection() {
+        const pool = this.master;
+        if (!pool) {
+            throw new TypeORMError("Driver not Connected");
+        }
+        try {
+            return await promisify(pool.getConnection).call(pool);
+        }
+        catch (error) {
+            this.poolErrorHandler(error);
+            throw error;
+        }
+    }
+    /**
+     * Obtains a new database connection to a slave server.
+     * Used for replication.
+     * If replication is not setup then returns master (default) connection's database connection.
+     */
+    async obtainSlaveConnection() {
+        return this.obtainMasterConnection();
     }
     /**
      * Creates a schema builder used to build and sync a schema.
@@ -553,25 +586,6 @@ export class SapDriver {
             type += " array";
         return type;
     }
-    /**
-     * Obtains a new database connection to a master server.
-     * Used for replication.
-     * If replication is not setup then returns default connection's database connection.
-     */
-    obtainMasterConnection() {
-        if (!this.master) {
-            throw new TypeORMError("Driver not Connected");
-        }
-        return this.master.getConnection();
-    }
-    /**
-     * Obtains a new database connection to a slave server.
-     * Used for replication.
-     * If replication is not setup then returns master (default) connection's database connection.
-     */
-    obtainSlaveConnection() {
-        return this.obtainMasterConnection();
-    }
     /**
      * Creates generated map of values generated or returned by database after INSERT query.
      */
@@ -651,21 +665,16 @@ export class SapDriver {
      * If driver dependency is not given explicitly, then try to load it via "require".
      */
     loadDependencies() {
-        try {
-            const client = this.options.driver || PlatformTools.load("hdb-pool");
+        const client = this.options.driver ?? this.options.hanaClientDriver;
+        if (client) {
             this.client = client;
-        }
-        catch (e) {
-            // todo: better error for browser env
-            throw new DriverPackageNotInstalledError("SAP Hana", "hdb-pool");
+            return;
         }
         try {
-            if (!this.options.hanaClientDriver) {
-                PlatformTools.load("@sap/hana-client");
-                this.streamClient = PlatformTools.load("@sap/hana-client/extension/Stream");
-            }
+            this.client = PlatformTools.load("@sap/hana-client");
+            this.streamClient = PlatformTools.load("@sap/hana-client/extension/Stream");
         }
-        catch (e) {
+        catch {
             // todo: better error for browser env
             throw new DriverPackageNotInstalledError("SAP Hana", "@sap/hana-client");
         }