@mikro-orm/postgresql 7.0.0-dev.4 → 7.0.0-dev.41

package/PostgreSqlConnection.js

@@ -1,5 +1,5 @@
-import TypeOverrides from 'pg/lib/type-overrides.js';
-import { Pool } from 'pg';
+import { Pool, TypeOverrides } from 'pg';
+import Cursor from 'pg-cursor';
 import { PostgresDialect } from 'kysely';
 import array from 'postgres-array';
 import { AbstractSqlConnection, Utils } from '@mikro-orm/knex';
@@ -8,15 +8,15 @@ export class PostgreSqlConnection extends AbstractSqlConnection {
         const options = this.mapOptions(overrides);
         return new PostgresDialect({
             pool: new Pool(options),
+            cursor: Cursor,
             onCreateConnection: this.options.onCreateConnection ?? this.config.get('onCreateConnection'),
         });
     }
     mapOptions(overrides) {
         const ret = { ...this.getConnectionOptions() };
         const pool = this.config.get('pool');
-        ret.min = pool?.min;
-        ret.max = pool?.max;
-        ret.idleTimeoutMillis = pool?.idleTimeoutMillis;
+        Utils.defaultValue(ret, 'max', pool?.max);
+        Utils.defaultValue(ret, 'idleTimeoutMillis', pool?.idleTimeoutMillis);
         // use `select typname, oid, typarray from pg_type order by oid` to get the list of OIDs
         const types = new TypeOverrides();
         [

package/PostgreSqlMikroORM.d.ts

@@ -1,19 +1,19 @@
-import { MikroORM, type Options, type IDatabaseDriver, type EntityManager, type EntityManagerType } from '@mikro-orm/core';
+import { type AnyEntity, type EntityClass, type EntityClassGroup, type EntitySchema, MikroORM, type Options, type IDatabaseDriver, type EntityManager, type EntityManagerType } from '@mikro-orm/core';
 import { PostgreSqlDriver } from './PostgreSqlDriver.js';
 import type { SqlEntityManager } from '@mikro-orm/knex';
 /**
  * @inheritDoc
  */
-export declare class PostgreSqlMikroORM<EM extends EntityManager = SqlEntityManager> extends MikroORM<PostgreSqlDriver, EM> {
+export declare class PostgreSqlMikroORM<EM extends EntityManager = SqlEntityManager> extends MikroORM<PostgreSqlDriver, EM, any> {
     private static DRIVER;
     /**
      * @inheritDoc
      */
-    static init<D extends IDatabaseDriver = PostgreSqlDriver, EM extends EntityManager = D[typeof EntityManagerType] & EntityManager>(options?: Options<D, EM>): Promise<MikroORM<D, EM>>;
+    static init<D extends IDatabaseDriver = PostgreSqlDriver, EM extends EntityManager = D[typeof EntityManagerType] & EntityManager, Entities extends (string | EntityClass<AnyEntity> | EntityClassGroup<AnyEntity> | EntitySchema)[] = (string | EntityClass<AnyEntity> | EntityClassGroup<AnyEntity> | EntitySchema)[]>(options?: Options<D, EM, Entities>): Promise<MikroORM<D, EM, Entities>>;
     /**
      * @inheritDoc
      */
-    static initSync<D extends IDatabaseDriver = PostgreSqlDriver, EM extends EntityManager = D[typeof EntityManagerType] & EntityManager>(options: Options<D, EM>): MikroORM<D, EM>;
+    static initSync<D extends IDatabaseDriver = PostgreSqlDriver, EM extends EntityManager = D[typeof EntityManagerType] & EntityManager, Entities extends (string | EntityClass<AnyEntity> | EntityClassGroup<AnyEntity> | EntitySchema)[] = (string | EntityClass<AnyEntity> | EntityClassGroup<AnyEntity> | EntitySchema)[]>(options: Options<D, EM, Entities>): MikroORM<D, EM, Entities>;
 }
 export type PostgreSqlOptions = Options<PostgreSqlDriver>;
-export declare function definePostgreSqlConfig(options: PostgreSqlOptions): Options<PostgreSqlDriver, SqlEntityManager<PostgreSqlDriver> & EntityManager<IDatabaseDriver<import("@mikro-orm/core").Connection>>>;
+export declare function definePostgreSqlConfig(options: PostgreSqlOptions): Options<PostgreSqlDriver, SqlEntityManager<PostgreSqlDriver> & EntityManager<IDatabaseDriver<import("@mikro-orm/core").Connection>>, (string | EntityClass<Partial<any>> | EntityClassGroup<Partial<any>> | EntitySchema<any, never>)[]>;

package/PostgreSqlPlatform.d.ts

@@ -81,7 +81,9 @@ export declare class PostgreSqlPlatform extends AbstractSqlPlatform {
     getJsonDeclarationSQL(): string;
     getSearchJsonPropertyKey(path: string[], type: string | undefined | Type, aliased: boolean, value?: unknown): string;
     getJsonIndexDefinition(index: IndexDef): string[];
-    quoteIdentifier(id: string, quote?: string): string;
+    quoteIdentifier(id: string | {
+        toString: () => string;
+    }, quote?: string): string;
     escape(value: any): string;
     private pad;
     /** @internal */

package/PostgreSqlPlatform.js

@@ -258,7 +258,7 @@ export class PostgreSqlPlatform extends AbstractSqlPlatform {
         if (RawQueryFragment.isKnownFragment(id)) {
             return super.quoteIdentifier(id);
         }
-        return `${quote}${id.replace('.', `${quote}.${quote}`)}${quote}`;
+        return `${quote}${id.toString().replace('.', `${quote}.${quote}`)}${quote}`;
     }
     escape(value) {
         if (typeof value === 'string') {
@@ -270,6 +270,9 @@ export class PostgreSqlPlatform extends AbstractSqlPlatform {
         if (ArrayBuffer.isView(value)) {
             return `E'\\\\x${value.toString('hex')}'`;
         }
+        if (Array.isArray(value)) {
+            return value.map(v => this.escape(v)).join(', ');
+        }
         return super.escape(value);
     }
     pad(number, digits) {
@@ -347,15 +350,17 @@ export class PostgreSqlPlatform extends AbstractSqlPlatform {
     getIndexName(tableName, columns, type) {
         const indexName = super.getIndexName(tableName, columns, type);
         if (indexName.length > 63) {
+            const hashAlgorithm = this.config.get('hashAlgorithm');
             const suffix = type === 'primary' ? 'pkey' : type;
-            return `${indexName.substring(0, 55 - type.length)}_${Utils.hash(indexName, 5)}_${suffix}`;
+            return `${indexName.substring(0, 55 - type.length)}_${Utils.hash(indexName, 5, hashAlgorithm)}_${suffix}`;
         }
         return indexName;
     }
     getDefaultPrimaryName(tableName, columns) {
         const indexName = `${tableName}_pkey`;
         if (indexName.length > 63) {
-            return `${indexName.substring(0, 55 - 'pkey'.length)}_${Utils.hash(indexName, 5)}_pkey`;
+            const hashAlgorithm = this.config.get('hashAlgorithm');
+            return `${indexName.substring(0, 55 - 'pkey'.length)}_${Utils.hash(indexName, 5, hashAlgorithm)}_pkey`;
         }
         return indexName;
     }

package/PostgreSqlSchemaHelper.js

@@ -68,7 +68,9 @@ export class PostgreSqlSchemaHelper extends SchemaHelper {
             const table = schema.addTable(t.table_name, t.schema_name, t.table_comment);
             const pks = await this.getPrimaryKeys(connection, indexes[key], table.name, table.schema);
             const enums = this.getEnumDefinitions(checks[key] ?? []);
-            table.init(columns[key], indexes[key], checks[key], pks, fks[key], enums);
+            if (columns[key]) {
+                table.init(columns[key], indexes[key], checks[key], pks, fks[key], enums);
+            }
         }
     }
     async getAllIndexes(connection, tables) {
@@ -250,10 +252,14 @@ export class PostgreSqlSchemaHelper extends SchemaHelper {
             if (row.schema_name && row.schema_name !== this.platform.getDefaultSchemaName()) {
                 name = row.schema_name + '.' + name;
             }
+            let items = row.enum_value;
+            if (!Array.isArray(items)) {
+                items = this.platform.unmarshallArray(row.enum_value);
+            }
             o[name] = {
                 name: row.enum_name,
                 schema: row.schema_name,
-                items: this.platform.unmarshallArray(row.enum_value),
+                items,
             };
             return o;
         }, {});
@@ -317,7 +323,8 @@ export class PostgreSqlSchemaHelper extends SchemaHelper {
         }, {});
     }
     createTableColumn(column, table) {
-        const compositePK = table.getPrimaryKey()?.composite;
+        const pk = table.getPrimaryKey();
+        const compositePK = pk?.composite;
         const primaryKey = !this.hasNonDefaultPrimaryKeyName(table);
         const col = [this.quote(column.name)];
         if (column.autoincrement && !column.generated && !compositePK) {
@@ -347,7 +354,7 @@ export class PostgreSqlSchemaHelper extends SchemaHelper {
             Utils.runIfNotEmpty(() => col.push('null'), column.nullable);
             Utils.runIfNotEmpty(() => col.push('not null'), !column.nullable);
         }
-        if (column.autoincrement && !column.generated && !compositePK) {
+        if (column.autoincrement && !compositePK) {
             Utils.runIfNotEmpty(() => col.push('primary key'), primaryKey && column.primary);
         }
         const useDefault = column.default != null && column.default !== 'null' && !column.autoincrement;

package/README.md

@@ -11,7 +11,6 @@ TypeScript ORM for Node.js based on Data Mapper, [Unit of Work](https://mikro-or
 [![Chat on discord](https://img.shields.io/discord/1214904142443839538?label=discord&color=blue)](https://discord.gg/w8bjxFHS7X)
 [![Downloads](https://img.shields.io/npm/dm/@mikro-orm/core.svg)](https://www.npmjs.com/package/@mikro-orm/core)
 [![Coverage Status](https://img.shields.io/coveralls/mikro-orm/mikro-orm.svg)](https://coveralls.io/r/mikro-orm/mikro-orm?branch=master)
-[![Maintainability](https://api.codeclimate.com/v1/badges/27999651d3adc47cfa40/maintainability)](https://codeclimate.com/github/mikro-orm/mikro-orm/maintainability)
 [![Build Status](https://github.com/mikro-orm/mikro-orm/workflows/tests/badge.svg?branch=master)](https://github.com/mikro-orm/mikro-orm/actions?workflow=tests)
 
 ## 🤔 Unit of What?
@@ -141,7 +140,7 @@ There is also auto-generated [CHANGELOG.md](CHANGELOG.md) file based on commit m
 - [Composite and Foreign Keys as Primary Key](https://mikro-orm.io/docs/composite-keys)
 - [Filters](https://mikro-orm.io/docs/filters)
 - [Using `QueryBuilder`](https://mikro-orm.io/docs/query-builder)
-- [Preloading Deeply Nested Structures via populate](https://mikro-orm.io/docs/nested-populate)
+- [Populating relations](https://mikro-orm.io/docs/populating-relations)
 - [Property Validation](https://mikro-orm.io/docs/property-validation)
 - [Lifecycle Hooks](https://mikro-orm.io/docs/events#hooks)
 - [Vanilla JS Support](https://mikro-orm.io/docs/usage-with-js)
@@ -382,6 +381,8 @@ See also the list of contributors who [participated](https://github.com/mikro-or
 
 Please ⭐️ this repository if this project helped you!
 
+> If you'd like to support my open-source work, consider sponsoring me directly at [github.com/sponsors/b4nan](https://github.com/sponsors/b4nan).
+
 ## 📝 License
 
 Copyright © 2018 [Martin Adámek](https://github.com/b4nan).

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mikro-orm/postgresql",
   "type": "module",
-  "version": "7.0.0-dev.4",
+  "version": "7.0.0-dev.41",
   "description": "TypeScript ORM for Node.js based on Data Mapper, Unit of Work and Identity Map patterns. Supports MongoDB, MySQL, PostgreSQL and SQLite databases as well as usage with vanilla JavaScript.",
   "exports": {
     "./package.json": "./package.json",
@@ -50,18 +50,19 @@
     "access": "public"
   },
   "dependencies": {
-    "@mikro-orm/knex": "7.0.0-dev.4",
-    "pg": "8.13.3",
-    "postgres-array": "3.0.2",
+    "@mikro-orm/knex": "7.0.0-dev.41",
+    "pg": "8.16.3",
+    "pg-cursor": "2.15.3",
+    "postgres-array": "3.0.4",
     "postgres-date": "2.1.0",
     "postgres-interval": "4.0.2"
   },
   "devDependencies": {
-    "@mikro-orm/core": "^6.4.7",
-    "kysely": "https://pkg.pr.new/kysely-org/kysely/kysely@2b7007e"
+    "@mikro-orm/core": "^6.6.0",
+    "kysely": "0.28.7"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.0.0-dev.4",
+    "@mikro-orm/core": "7.0.0-dev.41",
     "kysely": "*"
   }
 }