@mikro-orm/postgresql 6.3.5-dev.2 → 6.3.5-dev.21

package/PostgreSqlPlatform.d.ts

@@ -1,11 +1,12 @@
 import { type IPostgresInterval } from 'postgres-interval';
-import { type EntityProperty, Type, type SimpleColumnMeta } from '@mikro-orm/core';
+import { type EntityProperty, Type, type SimpleColumnMeta, type Configuration } from '@mikro-orm/core';
 import { AbstractSqlPlatform, type IndexDef } from '@mikro-orm/knex';
 import { PostgreSqlSchemaHelper } from './PostgreSqlSchemaHelper';
 import { PostgreSqlExceptionConverter } from './PostgreSqlExceptionConverter';
 export declare class PostgreSqlPlatform extends AbstractSqlPlatform {
     protected readonly schemaHelper: PostgreSqlSchemaHelper;
     protected readonly exceptionConverter: PostgreSqlExceptionConverter;
+    setConfig(config: Configuration): void;
     usesReturningStatement(): boolean;
     usesCascadeStatement(): boolean;
     supportsNativeEnums(): boolean;
@@ -37,6 +38,12 @@ export declare class PostgreSqlPlatform extends AbstractSqlPlatform {
     getFullTextWhereClause(prop: EntityProperty): string;
     supportsCreatingFullTextIndex(): boolean;
     getFullTextIndexExpression(indexName: string, schemaName: string | undefined, tableName: string, columns: SimpleColumnMeta[]): string;
+    normalizeColumnType(type: string, options?: {
+        length?: number;
+        precision?: number;
+        scale?: number;
+        autoincrement?: boolean;
+    }): string;
     getMappedType(type: string): Type<unknown>;
     getRegExpOperator(val?: unknown, flags?: string): string;
     getRegExpValue(val: RegExp): {
@@ -61,12 +68,18 @@ export declare class PostgreSqlPlatform extends AbstractSqlPlatform {
     getCharTypeDeclarationSQL(column: {
         length?: number;
     }): string;
+    getIntervalTypeDeclarationSQL(column: {
+        length?: number;
+    }): string;
     getBlobDeclarationSQL(): string;
     getJsonDeclarationSQL(): string;
     getSearchJsonPropertyKey(path: string[], type: string | undefined | Type, aliased: boolean, value?: unknown): string;
     getJsonIndexDefinition(index: IndexDef): string[];
     quoteIdentifier(id: string, quote?: string): string;
     quoteValue(value: any): string;
+    private pad;
+    /** @internal */
+    formatDate(date: Date): string;
     indexForeignKeys(): boolean;
     getDefaultMappedType(type: string): Type<unknown>;
     supportsSchemas(): boolean;

package/PostgreSqlPlatform.js

@@ -15,6 +15,12 @@ const FullTextType_1 = require("./types/FullTextType");
 class PostgreSqlPlatform extends knex_1.AbstractSqlPlatform {
     schemaHelper = new PostgreSqlSchemaHelper_1.PostgreSqlSchemaHelper(this);
     exceptionConverter = new PostgreSqlExceptionConverter_1.PostgreSqlExceptionConverter();
+    setConfig(config) {
+        if (config.get('forceUtcTimezone') == null) {
+            config.set('forceUtcTimezone', true);
+        }
+        super.setConfig(config);
+    }
     usesReturningStatement() {
         return true;
     }
@@ -35,7 +41,7 @@ class PostgreSqlPlatform extends knex_1.AbstractSqlPlatform {
         return 'timestamptz' + (column.length != null ? `(${column.length})` : '');
     }
     getDefaultDateTimeLength() {
-        return 6; // timestamptz actually means timestamptz(6)
+        return 6;
     }
     convertIntervalToJSValue(value) {
         return (0, postgres_interval_1.default)(value);
@@ -51,9 +57,9 @@ class PostgreSqlPlatform extends knex_1.AbstractSqlPlatform {
     }
     getIntegerTypeDeclarationSQL(column) {
         if (column.autoincrement && !column.generated) {
-            return `serial`;
+            return 'serial';
         }
-        return `int`;
+        return 'int';
     }
     getBigIntTypeDeclarationSQL(column) {
         /* istanbul ignore next */
@@ -91,6 +97,34 @@ class PostgreSqlPlatform extends knex_1.AbstractSqlPlatform {
         }
         return `create index ${quotedIndexName} on ${quotedTableName} using gin(to_tsvector('simple', ${quotedColumnNames.join(` || ' ' || `)}))`;
     }
+    normalizeColumnType(type, options = {}) {
+        const simpleType = this.extractSimpleType(type);
+        if (['int', 'int4', 'integer'].includes(simpleType)) {
+            return this.getIntegerTypeDeclarationSQL({});
+        }
+        if (['bigint', 'int8'].includes(simpleType)) {
+            return this.getBigIntTypeDeclarationSQL({});
+        }
+        if (['smallint', 'int2'].includes(simpleType)) {
+            return this.getSmallIntTypeDeclarationSQL({});
+        }
+        if (['boolean', 'bool'].includes(simpleType)) {
+            return this.getBooleanTypeDeclarationSQL();
+        }
+        if (['varchar', 'character varying'].includes(simpleType)) {
+            return this.getVarcharTypeDeclarationSQL(options);
+        }
+        if (['char', 'bpchar'].includes(simpleType)) {
+            return this.getCharTypeDeclarationSQL(options);
+        }
+        if (['decimal', 'numeric'].includes(simpleType)) {
+            return this.getDecimalTypeDeclarationSQL(options);
+        }
+        if (['interval'].includes(simpleType)) {
+            return this.getIntervalTypeDeclarationSQL(options);
+        }
+        return super.normalizeColumnType(type, options);
+    }
     getMappedType(type) {
         switch (this.extractSimpleType(type)) {
             case 'tsvector': return core_1.Type.getType(FullTextType_1.FullTextType);
@@ -167,6 +201,9 @@ class PostgreSqlPlatform extends knex_1.AbstractSqlPlatform {
         }
         return super.getCharTypeDeclarationSQL(column);
     }
+    getIntervalTypeDeclarationSQL(column) {
+        return 'interval' + (column.length != null ? `(${column.length})` : '');
+    }
     getBlobDeclarationSQL() {
         return 'bytea';
     }
@@ -221,13 +258,46 @@ class PostgreSqlPlatform extends knex_1.AbstractSqlPlatform {
             return pg_1.Client.prototype.escapeLiteral(value);
         }
         if (value instanceof Date) {
-            return `'${value.toISOString()}'`;
+            return `'${this.formatDate(value)}'`;
         }
         if (ArrayBuffer.isView(value)) {
             return `E'\\\\x${value.toString('hex')}'`;
         }
         return super.quoteValue(value);
     }
+    pad(number, digits) {
+        return String(number).padStart(digits, '0');
+    }
+    /** @internal */
+    formatDate(date) {
+        if (this.timezone === 'Z') {
+            return date.toISOString();
+        }
+        let offset = -date.getTimezoneOffset();
+        let year = date.getFullYear();
+        const isBCYear = year < 1;
+        /* istanbul ignore next */
+        if (isBCYear) {
+            year = Math.abs(year) + 1;
+        }
+        const datePart = `${this.pad(year, 4)}-${this.pad(date.getMonth() + 1, 2)}-${this.pad(date.getDate(), 2)}`;
+        const timePart = `${this.pad(date.getHours(), 2)}:${this.pad(date.getMinutes(), 2)}:${this.pad(date.getSeconds(), 2)}.${this.pad(date.getMilliseconds(), 3)}`;
+        let ret = `${datePart}T${timePart}`;
+        /* istanbul ignore if */
+        if (offset < 0) {
+            ret += '-';
+            offset *= -1;
+        }
+        else {
+            ret += '+';
+        }
+        ret += this.pad(Math.floor(offset / 60), 2) + ':' + this.pad(offset % 60, 2);
+        /* istanbul ignore next */
+        if (isBCYear) {
+            ret += ' BC';
+        }
+        return ret;
+    }
     indexForeignKeys() {
         return false;
     }
@@ -314,6 +384,7 @@ class PostgreSqlPlatform extends knex_1.AbstractSqlPlatform {
             return new Date(value);
         }
         const parsed = (0, postgres_date_1.default)(value);
+        /* istanbul ignore next */
         if (parsed === null) {
             return value;
         }

package/PostgreSqlSchemaHelper.js

@@ -130,10 +130,13 @@ class PostgreSqlSchemaHelper extends knex_1.SchemaHelper {
             let type = col.data_type.toLowerCase() === 'array'
                 ? col.udt_name.replace(/^_(.*)$/, '$1[]')
                 : col.udt_name;
+            if (type === 'bpchar') {
+                type = 'char';
+            }
             if (type === 'vector' && col.length == null && col.custom_length != null) {
                 col.length = col.custom_length;
             }
-            if (col.length != null && !type.endsWith(`(${col.length})`)) {
+            if (col.length != null && !type.endsWith(`(${col.length})`) && !['text', 'date'].includes(type)) {
                 type += `(${col.length})`;
             }
             if (type === 'numeric' && col.numeric_precision != null && col.numeric_scale != null) {
@@ -203,6 +206,7 @@ class PostgreSqlSchemaHelper extends knex_1.SchemaHelper {
             if (match) {
                 return match[1];
             }
+            /* istanbul ignore next */
             switch (value) {
                 case 'r': return 'RESTRICT';
                 case 'c': return 'CASCADE';
@@ -530,6 +534,7 @@ class PostgreSqlSchemaHelper extends knex_1.SchemaHelper {
                     return -1;
                 case 'interval':
                 case 'time':
+                case 'timestamp':
                 case 'timestamptz':
                     return this.platform.getDefaultDateTimeLength();
             }

package/README.md

@@ -143,7 +143,7 @@ There is also auto-generated [CHANGELOG.md](CHANGELOG.md) file based on commit m
 - [Using `QueryBuilder`](https://mikro-orm.io/docs/query-builder)
 - [Preloading Deeply Nested Structures via populate](https://mikro-orm.io/docs/nested-populate)
 - [Property Validation](https://mikro-orm.io/docs/property-validation)
-- [Lifecycle Hooks](https://mikro-orm.io/docs/lifecycle-hooks)
+- [Lifecycle Hooks](https://mikro-orm.io/docs/events#hooks)
 - [Vanilla JS Support](https://mikro-orm.io/docs/usage-with-js)
 - [Schema Generator](https://mikro-orm.io/docs/schema-generator)
 - [Entity Generator](https://mikro-orm.io/docs/entity-generator)
@@ -163,6 +163,7 @@ You can find example integrations for some popular frameworks in the [`mikro-orm
 - [NextJS + MySQL](https://github.com/jonahallibone/mikro-orm-nextjs)
 - [Accounts.js REST and GraphQL authentication + SQLite](https://github.com/darkbasic/mikro-orm-accounts-example)
 - [Nest + Shopify + PostgreSQL + GraphQL](https://github.com/Cloudshelf/Shopify_CSConnector)
+- [Elysia.js + libSQL + Bun](https://github.com/mikro-orm/elysia-bun-example-app)
 
 ### JavaScript Examples 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/postgresql",
-  "version": "6.3.5-dev.2",
+  "version": "6.3.5-dev.21",
   "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.",
   "main": "index.js",
   "module": "index.mjs",
@@ -58,7 +58,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@mikro-orm/knex": "6.3.5-dev.2",
+    "@mikro-orm/knex": "6.3.5-dev.21",
     "pg": "8.12.0",
     "postgres-array": "3.0.2",
     "postgres-date": "2.1.0",
@@ -68,6 +68,6 @@
     "@mikro-orm/core": "^6.3.4"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.3.5-dev.2"
+    "@mikro-orm/core": "6.3.5-dev.21"
   }
 }

package/types/FullTextType.js

@@ -9,7 +9,7 @@ class FullTextType extends core_1.Type {
         this.regconfig = regconfig;
     }
     compareAsType() {
-        return 'string';
+        return 'any';
     }
     getColumnType() {
         return 'tsvector';