@mikro-orm/oracledb 7.1.0-dev.21 → 7.1.0-dev.23

package/OracleSchemaHelper.d.ts

@@ -21,6 +21,7 @@ export declare class OracleSchemaHelper extends SchemaHelper {
     private getEnumDefinitions;
     private getChecksSQL;
     getAllChecks(connection: AbstractSqlConnection, tablesBySchemas: Map<string | undefined, Table[]>, ctx?: Transaction): Promise<Dictionary<CheckDef[]>>;
+    getDatabaseCollation(connection: AbstractSqlConnection, ctx?: Transaction): Promise<string | undefined>;
     loadInformationSchema(schema: DatabaseSchema, connection: AbstractSqlConnection, tables: Table[], schemas?: string[], ctx?: Transaction): Promise<void>;
     getPreAlterTable(tableDiff: TableDifference, safe: boolean): string[];
     getPostAlterTable(tableDiff: TableDifference, safe: boolean): string[];

package/OracleSchemaHelper.js

@@ -127,7 +127,8 @@ export class OracleSchemaHelper extends SchemaHelper {
       atc.char_length as character_maximum_length,
       atc.data_length as data_length,
       atc.identity_column as is_identity,
-      atc.column_id as ordinal_position
+      atc.column_id as ordinal_position,
+      atc.collation as collation_name
       from all_tab_cols atc
       left join all_col_comments acc on atc.owner = acc.owner and atc.table_name = acc.table_name and atc.column_name = acc.column_name
       where atc.hidden_column = 'NO'
@@ -183,6 +184,11 @@ export class OracleSchemaHelper extends SchemaHelper {
                 precision: col.numeric_precision,
                 scale: col.numeric_scale,
                 comment: col.column_comment,
+                // `USING_NLS_COMP` is the Oracle sentinel for "inherit from the session NLS settings", so
+                // a column without an explicit `COLLATE` clause introspects as `USING_NLS_COMP` rather
+                // than NULL. Treat it as "no explicit collation" so the comparator doesn't flag every
+                // string column as changed when the database default is something else (e.g. `BINARY`).
+                collation: col.collation_name && col.collation_name !== 'USING_NLS_COMP' ? col.collation_name : undefined,
                 generated,
             });
         }
@@ -358,6 +364,10 @@ export class OracleSchemaHelper extends SchemaHelper {
         }
         return ret;
     }
+    async getDatabaseCollation(connection, ctx) {
+        const [row] = await connection.execute(`select property_value as collation from database_properties where property_name = 'DEFAULT_COLLATION'`, [], 'all', ctx);
+        return row?.collation;
+    }
     async loadInformationSchema(schema, connection, tables, schemas, ctx) {
         if (tables.length === 0) {
             return;
@@ -367,9 +377,11 @@ export class OracleSchemaHelper extends SchemaHelper {
         const indexes = await this.getAllIndexes(connection, tablesBySchema, ctx);
         const checks = await this.getAllChecks(connection, tablesBySchema, ctx);
         const fks = await this.getAllForeignKeys(connection, tablesBySchema, ctx);
+        const dbCollation = await this.getDatabaseCollation(connection, ctx);
         for (const t of tables) {
             const key = this.getTableKey(t);
             const table = schema.addTable(t.table_name, t.schema_name, t.table_comment);
+            table.collation = dbCollation;
             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);
@@ -470,6 +482,7 @@ export class OracleSchemaHelper extends SchemaHelper {
         /* v8 ignore next: generated column branch */
         const columnType = column.generated ? `as ${column.generated}` : column.type;
         const col = [this.quote(column.name), columnType];
+        Utils.runIfNotEmpty(() => col.push(this.getCollateSQL(column.collation)), column.collation);
         Utils.runIfNotEmpty(() => col.push('generated by default as identity'), column.autoincrement);
         /* v8 ignore next 3: default value branch */
         const useDefault = changedProperties
@@ -493,8 +506,15 @@ export class OracleSchemaHelper extends SchemaHelper {
         const parts = [];
         const quotedTableName = table.getQuotedName();
         // Oracle uses MODIFY for column changes, and always requires the column type
-        if (changedProperties.has('type') || changedProperties.has('nullable') || changedProperties.has('default')) {
+        if (changedProperties.has('type') ||
+            changedProperties.has('nullable') ||
+            changedProperties.has('default') ||
+            changedProperties.has('collation')) {
             const colParts = [this.quote(column.name), column.type];
+            // Oracle's MODIFY restates the column type, so re-emit COLLATE whenever the column has
+            // one — even if the trigger was a nullable/default change — so we can't accidentally
+            // drop the column collation by omitting it from the new type spec.
+            Utils.runIfNotEmpty(() => colParts.push(this.getCollateSQL(column.collation)), column.collation);
             if (changedProperties.has('default')) {
                 if (column.default != null && column.default !== 'null') {
                     colParts.push(`default ${column.default}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/oracledb",
-  "version": "7.1.0-dev.21",
+  "version": "7.1.0-dev.23",
   "description": "TypeScript ORM for Node.js based on Data Mapper, Unit of Work and Identity Map patterns. Supports MongoDB, MySQL, MariaDB, PostgreSQL, SQLite, MSSQL and Oracle databases.",
   "keywords": [
     "data-mapper",
@@ -42,15 +42,15 @@
     "copy": "node ../../scripts/copy.mjs"
   },
   "dependencies": {
-    "@mikro-orm/sql": "7.1.0-dev.21",
+    "@mikro-orm/sql": "7.1.0-dev.23",
     "kysely": "0.28.16",
     "oracledb": "6.10.0"
   },
   "devDependencies": {
-    "@mikro-orm/core": "^7.0.12"
+    "@mikro-orm/core": "^7.0.13"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.1.0-dev.21"
+    "@mikro-orm/core": "7.1.0-dev.23"
   },
   "engines": {
     "node": ">= 22.17.0"