typeorm 0.3.18-dev.ff6e875 → 0.3.19-dev.633c4e3

package/driver/postgres/PostgresConnectionCredentialsOptions.d.ts

@@ -32,4 +32,9 @@ export interface PostgresConnectionCredentialsOptions {
      * Object with ssl parameters
      */
     readonly ssl?: boolean | TlsOptions;
+    /**
+     * sets the application_name var to help db administrators identify
+     * the service using this connection. Defaults to 'undefined'
+     */
+    readonly applicationName?: string;
 }

package/driver/postgres/PostgresConnectionCredentialsOptions.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/driver/postgres/PostgresConnectionCredentialsOptions.ts"],"names":[],"mappings":"","file":"PostgresConnectionCredentialsOptions.js","sourcesContent":["import { TlsOptions } from \"tls\"\n\n/**\n * Postgres specific connection credential options.\n */\nexport interface PostgresConnectionCredentialsOptions {\n    /**\n     * Connection url where perform connection to.\n     */\n    readonly url?: string\n\n    /**\n     * Database host.\n     */\n    readonly host?: string\n\n    /**\n     * Database host port.\n     */\n    readonly port?: number\n\n    /**\n     * Database username.\n     */\n    readonly username?: string\n\n    /**\n     * Database password.\n     */\n    readonly password?: string | (() => string) | (() => Promise<string>)\n\n    /**\n     * Database name to connect to.\n     */\n    readonly database?: string\n\n    /**\n     * Object with ssl parameters\n     */\n    readonly ssl?: boolean | TlsOptions\n}\n"],"sourceRoot":"../.."}
+{"version":3,"sources":["../../src/driver/postgres/PostgresConnectionCredentialsOptions.ts"],"names":[],"mappings":"","file":"PostgresConnectionCredentialsOptions.js","sourcesContent":["import { TlsOptions } from \"tls\"\n\n/**\n * Postgres specific connection credential options.\n */\nexport interface PostgresConnectionCredentialsOptions {\n    /**\n     * Connection url where perform connection to.\n     */\n    readonly url?: string\n\n    /**\n     * Database host.\n     */\n    readonly host?: string\n\n    /**\n     * Database host port.\n     */\n    readonly port?: number\n\n    /**\n     * Database username.\n     */\n    readonly username?: string\n\n    /**\n     * Database password.\n     */\n    readonly password?: string | (() => string) | (() => Promise<string>)\n\n    /**\n     * Database name to connect to.\n     */\n    readonly database?: string\n\n    /**\n     * Object with ssl parameters\n     */\n    readonly ssl?: boolean | TlsOptions\n\n    /**\n     * sets the application_name var to help db administrators identify\n     * the service using this connection. Defaults to 'undefined'\n     */\n    readonly applicationName?: string\n}\n"],"sourceRoot":"../.."}

package/driver/postgres/PostgresConnectionOptions.d.ts

@@ -1,4 +1,5 @@
 import { BaseDataSourceOptions } from "../../data-source/BaseDataSourceOptions";
+import { ReplicationMode } from "../types/ReplicationMode";
 import { PostgresConnectionCredentialsOptions } from "./PostgresConnectionCredentialsOptions";
 /**
  * Postgres-specific connection options.
@@ -38,6 +39,11 @@ export interface PostgresConnectionOptions extends BaseDataSourceOptions, Postgr
          * List of read-from severs (slaves).
          */
         readonly slaves: PostgresConnectionCredentialsOptions[];
+        /**
+         * Default connection pool to use for SELECT queries
+         * @default "slave"
+         */
+        readonly defaultMode?: ReplicationMode;
     };
     /**
      * The milliseconds before a timeout occurs during the initial connection to the postgres
@@ -59,11 +65,6 @@ export interface PostgresConnectionOptions extends BaseDataSourceOptions, Postgr
      * Automatically install postgres extensions
      */
     readonly installExtensions?: boolean;
-    /**
-     * sets the application_name var to help db administrators identify
-     * the service using this connection. Defaults to 'undefined'
-     */
-    readonly applicationName?: string;
     /**
      * Return 64-bit integers (int8) as JavaScript integers.
      *

package/driver/postgres/PostgresConnectionOptions.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/driver/postgres/PostgresConnectionOptions.ts"],"names":[],"mappings":"","file":"PostgresConnectionOptions.js","sourcesContent":["import { BaseDataSourceOptions } from \"../../data-source/BaseDataSourceOptions\"\nimport { PostgresConnectionCredentialsOptions } from \"./PostgresConnectionCredentialsOptions\"\n\n/**\n * Postgres-specific connection options.\n */\nexport interface PostgresConnectionOptions\n    extends BaseDataSourceOptions,\n        PostgresConnectionCredentialsOptions {\n    /**\n     * Database type.\n     */\n    readonly type: \"postgres\"\n\n    /**\n     * Schema name.\n     */\n    readonly schema?: string\n\n    /**\n     * The driver object\n     * This defaults to `require(\"pg\")`.\n     */\n    readonly driver?: any\n\n    /**\n     * The driver object\n     * This defaults to `require(\"pg-native\")`.\n     */\n    readonly nativeDriver?: any\n\n    /**\n     * A boolean determining whether to pass time values in UTC or local time. (default: false).\n     */\n    readonly useUTC?: boolean\n\n    /**\n     * Replication setup.\n     */\n    readonly replication?: {\n        /**\n         * Master server used by orm to perform writes.\n         */\n        readonly master: PostgresConnectionCredentialsOptions\n\n        /**\n         * List of read-from severs (slaves).\n         */\n        readonly slaves: PostgresConnectionCredentialsOptions[]\n    }\n\n    /**\n     * The milliseconds before a timeout occurs during the initial connection to the postgres\n     * server. If undefined, or set to 0, there is no timeout. Defaults to undefined.\n     */\n    readonly connectTimeoutMS?: number\n\n    /**\n     * The Postgres extension to use to generate UUID columns. Defaults to uuid-ossp.\n     * If pgcrypto is selected, TypeORM will use the gen_random_uuid() function from this extension.\n     * If uuid-ossp is selected, TypeORM will use the uuid_generate_v4() function from this extension.\n     */\n    readonly uuidExtension?: \"pgcrypto\" | \"uuid-ossp\"\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     * Include notification messages from Postgres server in client logs\n     */\n    readonly logNotifications?: boolean\n\n    /**\n     * Automatically install postgres extensions\n     */\n    readonly installExtensions?: boolean\n\n    /**\n     * sets the application_name var to help db administrators identify\n     * the service using this connection. Defaults to 'undefined'\n     */\n    readonly applicationName?: string\n\n    /**\n     * Return 64-bit integers (int8) as JavaScript integers.\n     *\n     * Because JavaScript doesn't have support for 64-bit integers node-postgres cannot confidently\n     * parse int8 data type results as numbers because if you have a huge number it will overflow\n     * and the result you'd get back from node-postgres would not be the result in the database.\n     * That would be a very bad thing so node-postgres just returns int8 results as strings and leaves the parsing up to you.\n     *\n     * Enabling parseInt8 will cause node-postgres to parse int8 results as numbers.\n     * Note: the maximum safe integer in js is: Number.MAX_SAFE_INTEGER (`+2^53`)\n     *\n     * @see [JavaScript Number objects](http://ecma262-5.com/ELS5_HTML.htm#Section_8.5)\n     * @see [node-postgres int8 explanation](https://github.com/brianc/node-pg-types#:~:text=on%20projects%3A%20return-,64%2Dbit%20integers,-(int8)%20as)\n     * @see [node-postgres defaults.parseInt8 implementation](https://github.com/brianc/node-postgres/blob/pg%408.8.0/packages/pg/lib/defaults.js#L80)\n     */\n    readonly parseInt8?: boolean\n}\n"],"sourceRoot":"../.."}
+{"version":3,"sources":["../../src/driver/postgres/PostgresConnectionOptions.ts"],"names":[],"mappings":"","file":"PostgresConnectionOptions.js","sourcesContent":["import { BaseDataSourceOptions } from \"../../data-source/BaseDataSourceOptions\"\nimport { ReplicationMode } from \"../types/ReplicationMode\"\nimport { PostgresConnectionCredentialsOptions } from \"./PostgresConnectionCredentialsOptions\"\n\n/**\n * Postgres-specific connection options.\n */\nexport interface PostgresConnectionOptions\n    extends BaseDataSourceOptions,\n        PostgresConnectionCredentialsOptions {\n    /**\n     * Database type.\n     */\n    readonly type: \"postgres\"\n\n    /**\n     * Schema name.\n     */\n    readonly schema?: string\n\n    /**\n     * The driver object\n     * This defaults to `require(\"pg\")`.\n     */\n    readonly driver?: any\n\n    /**\n     * The driver object\n     * This defaults to `require(\"pg-native\")`.\n     */\n    readonly nativeDriver?: any\n\n    /**\n     * A boolean determining whether to pass time values in UTC or local time. (default: false).\n     */\n    readonly useUTC?: boolean\n\n    /**\n     * Replication setup.\n     */\n    readonly replication?: {\n        /**\n         * Master server used by orm to perform writes.\n         */\n        readonly master: PostgresConnectionCredentialsOptions\n\n        /**\n         * List of read-from severs (slaves).\n         */\n        readonly slaves: PostgresConnectionCredentialsOptions[]\n\n        /**\n         * Default connection pool to use for SELECT queries\n         * @default \"slave\"\n         */\n        readonly defaultMode?: ReplicationMode\n    }\n\n    /**\n     * The milliseconds before a timeout occurs during the initial connection to the postgres\n     * server. If undefined, or set to 0, there is no timeout. Defaults to undefined.\n     */\n    readonly connectTimeoutMS?: number\n\n    /**\n     * The Postgres extension to use to generate UUID columns. Defaults to uuid-ossp.\n     * If pgcrypto is selected, TypeORM will use the gen_random_uuid() function from this extension.\n     * If uuid-ossp is selected, TypeORM will use the uuid_generate_v4() function from this extension.\n     */\n    readonly uuidExtension?: \"pgcrypto\" | \"uuid-ossp\"\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     * Include notification messages from Postgres server in client logs\n     */\n    readonly logNotifications?: boolean\n\n    /**\n     * Automatically install postgres extensions\n     */\n    readonly installExtensions?: boolean\n\n    /**\n     * Return 64-bit integers (int8) as JavaScript integers.\n     *\n     * Because JavaScript doesn't have support for 64-bit integers node-postgres cannot confidently\n     * parse int8 data type results as numbers because if you have a huge number it will overflow\n     * and the result you'd get back from node-postgres would not be the result in the database.\n     * That would be a very bad thing so node-postgres just returns int8 results as strings and leaves the parsing up to you.\n     *\n     * Enabling parseInt8 will cause node-postgres to parse int8 results as numbers.\n     * Note: the maximum safe integer in js is: Number.MAX_SAFE_INTEGER (`+2^53`)\n     *\n     * @see [JavaScript Number objects](http://ecma262-5.com/ELS5_HTML.htm#Section_8.5)\n     * @see [node-postgres int8 explanation](https://github.com/brianc/node-pg-types#:~:text=on%20projects%3A%20return-,64%2Dbit%20integers,-(int8)%20as)\n     * @see [node-postgres defaults.parseInt8 implementation](https://github.com/brianc/node-postgres/blob/pg%408.8.0/packages/pg/lib/defaults.js#L80)\n     */\n    readonly parseInt8?: boolean\n}\n"],"sourceRoot":"../.."}

package/driver/postgres/PostgresDriver.d.ts

@@ -111,6 +111,10 @@ export declare class PostgresDriver implements Driver {
      * Column types are driver dependant.
      */
     mappedDataTypes: MappedColumnTypes;
+    /**
+     * The prefix used for the parameters
+     */
+    parametersPrefix: string;
     /**
      * Default values of length, precision and scale depends on column data type.
      * Used in the cases when length/precision/scale is not specified by user.

package/driver/postgres/PostgresDriver.js

@@ -180,6 +180,10 @@ class PostgresDriver {
             metadataName: "varchar",
             metadataValue: "text",
         };
+        /**
+         * The prefix used for the parameters
+         */
+        this.parametersPrefix = "$";
         /**
          * Default values of length, precision and scale depends on column data type.
          * Used in the cases when length/precision/scale is not specified by user.
@@ -595,10 +599,14 @@ class PostgresDriver {
         const escapedParameters = Object.keys(nativeParameters).map((key) => nativeParameters[key]);
         if (!parameters || !Object.keys(parameters).length)
             return [sql, escapedParameters];
+        const parameterIndexMap = new Map();
         sql = sql.replace(/:(\.\.\.)?([A-Za-z0-9_.]+)/g, (full, isArray, key) => {
             if (!parameters.hasOwnProperty(key)) {
                 return full;
             }
+            if (parameterIndexMap.has(key)) {
+                return this.parametersPrefix + parameterIndexMap.get(key);
+            }
             let value = parameters[key];
             if (isArray) {
                 return value
@@ -612,6 +620,7 @@ class PostgresDriver {
                 return value();
             }
             escapedParameters.push(value);
+            parameterIndexMap.set(key, escapedParameters.length);
             return this.createParameter(key, escapedParameters.length - 1);
         }); // todo: make replace only in value statements, otherwise problems
         return [sql, escapedParameters];
@@ -738,7 +747,7 @@ class PostgresDriver {
      */
     normalizeDefault(columnMetadata) {
         const defaultValue = columnMetadata.default;
-        if (defaultValue === null) {
+        if (defaultValue === null || defaultValue === undefined) {
             return undefined;
         }
         if (columnMetadata.isArray && Array.isArray(defaultValue)) {
@@ -763,9 +772,6 @@ class PostgresDriver {
         if (typeof defaultValue === "object") {
             return `'${JSON.stringify(defaultValue)}'`;
         }
-        if (defaultValue === undefined) {
-            return undefined;
-        }
         return `${defaultValue}`;
     }
     /**
@@ -1081,7 +1087,7 @@ class PostgresDriver {
      * Creates an escaped parameter.
      */
     createParameter(parameterName, index) {
-        return "$" + (index + 1);
+        return this.parametersPrefix + (index + 1);
     }
     // -------------------------------------------------------------------------
     // Public Methods
@@ -1124,7 +1130,7 @@ class PostgresDriver {
      * Creates a new connection pool for a given database credentials.
      */
     async createPool(options, credentials) {
-        var _a;
+        var _a, _b;
         const { logger } = this.connection;
         credentials = Object.assign({}, credentials);
         // build connection options for the driver
@@ -1138,12 +1144,12 @@ class PostgresDriver {
             port: credentials.port,
             ssl: credentials.ssl,
             connectionTimeoutMillis: options.connectTimeoutMS,
-            application_name: options.applicationName,
+            application_name: (_a = options.applicationName) !== null && _a !== void 0 ? _a : credentials.applicationName,
             max: options.poolSize,
         }, options.extra || {});
         if (options.parseInt8 !== undefined) {
             if (this.postgres.defaults &&
-                ((_a = Object.getOwnPropertyDescriptor(this.postgres.defaults, "parseInt8")) === null || _a === void 0 ? void 0 : _a.set)) {
+                ((_b = Object.getOwnPropertyDescriptor(this.postgres.defaults, "parseInt8")) === null || _b === void 0 ? void 0 : _b.set)) {
                 this.postgres.defaults.parseInt8 = options.parseInt8;
             }
             else {