@mikro-orm/oracledb 7.3.0-dev.1 → 7.3.0-dev.11

package/OracleQueryBuilder.js

@@ -58,7 +58,9 @@ export class OracleQueryBuilder extends QueryBuilder {
         }
         if (this.type === QueryType.INSERT) {
             const returningProps = meta.hydrateProps
-                .filter(prop => prop.returning || (prop.persist !== false && ((prop.primary && prop.autoincrement) || prop.defaultRaw)))
+                .filter(prop => prop.returning || (prop.persist !== false && (prop.autoincrement || prop.generated || prop.defaultRaw)))
+                // a TPT table can only return its own columns
+                .filter(prop => meta.inheritanceType !== 'tpt' || prop.primary || meta.ownProps.some(p => p.name === prop.name))
                 .filter(prop => !(prop.fieldNames[0] in arr[0]) || isRaw(arr[0][prop.fieldNames[0]]));
             if (returningProps.length > 0) {
                 qb.returning(returningProps.map(prop => [prop.fieldNames[0], prop.runtimeType]));

package/OracleSchemaGenerator.js

@@ -369,8 +369,10 @@ export class OracleSchemaGenerator extends SchemaGenerator {
                 .join('.');
             // Use DELETE instead of TRUNCATE to avoid ORA-02266 (FK constraint check regardless of data)
             stmts.push(`begin execute immediate 'delete from ${quoted}'; exception when others then if sqlcode != -942 then raise; end if; end;`);
-            for (const pk of meta.getPrimaryProps().filter(p => p.autoincrement)) {
-                stmts.push(`begin execute immediate 'alter table ${quoted} modify ${this.platform.quoteIdentifier(pk.fieldNames[0])} generated by default as identity (start with limit value)'; exception when others then null; end;`);
+            // non-PK identity columns are only reset when they declare `sequence`
+            for (const prop of meta.props.filter(p => p.autoincrement && (p.primary || p.sequence))) {
+                const startWith = prop.sequence?.startWith ?? 'limit value';
+                stmts.push(`begin execute immediate 'alter table ${quoted} modify ${this.platform.quoteIdentifier(prop.fieldNames[0])} generated by default as identity (start with ${startWith})'; exception when others then null; end;`);
             }
         }
         /* v8 ignore next 5: empty stmts branch */

package/OracleSchemaHelper.js

@@ -145,9 +145,12 @@ export class OracleSchemaHelper extends SchemaHelper {
       atc.data_length as data_length,
       atc.identity_column as is_identity,
       atc.column_id as ordinal_position,
-      atc.collation as collation_name
+      atc.collation as collation_name,
+      regexp_substr(aic.identity_options, 'START WITH: (-?\\d+)', 1, 1, null, 1) as sequence_start,
+      regexp_substr(aic.identity_options, 'INCREMENT BY: (-?\\d+)', 1, 1, null, 1) as sequence_increment
       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
+      left join all_tab_identity_cols aic on atc.owner = aic.owner and atc.table_name = aic.table_name and atc.column_name = aic.column_name
       where atc.hidden_column = 'NO'
       and (${[...tablesBySchemas.entries()].map(([schema, tables]) => `(atc.table_name in (${tables.map(t => this.platform.quoteValue(t.table_name)).join(', ')}) and atc.owner = ${this.platform.quoteValue(schema)})`).join(' or ')})
       order by atc.owner, atc.table_name, atc.column_id`;
@@ -198,6 +201,7 @@ export class OracleSchemaHelper extends SchemaHelper {
                 default: increments ? undefined : this.wrap(defaultValue, mappedType),
                 nullable: col.is_nullable === 'Y',
                 autoincrement: increments,
+                sequence: increments ? this.getIntrospectedSequence(col.sequence_start, col.sequence_increment) : undefined,
                 precision: col.numeric_precision,
                 scale: col.numeric_scale,
                 comment: col.column_comment,
@@ -234,17 +238,12 @@ export class OracleSchemaHelper extends SchemaHelper {
             const isPrimary = index.constraint_type === 'P';
             const isUniqueConstraint = index.constraint_type === 'U';
             const isConstraintIndex = isPrimary || isUniqueConstraint;
-            // Skip indexes that back PRIMARY KEY constraints - they're handled as part of the table definition
-            // and should not be managed as separate indexes
-            if (isPrimary) {
-                continue;
-            }
             const partialMatch = typeof index.expression === 'string' ? OracleSchemaHelper.PARTIAL_INDEX_RE.exec(index.expression) : null;
             const indexDef = {
                 columnNames: [partialMatch ? partialMatch[2] : index.column_name],
                 keyName: index.index_name,
                 unique: index.is_unique === 'YES',
-                primary: false,
+                primary: isPrimary,
                 constraint: isConstraintIndex || index.is_unique === 'YES',
             };
             /* v8 ignore start: function-based (non-partial) index branches */
@@ -412,7 +411,8 @@ export class OracleSchemaHelper extends SchemaHelper {
         const changedTypes = Object.values(tableDiff.changedColumns).filter(col => col.changedProperties.has('type'));
         for (const col of changedTypes) {
             for (const index of indexes) {
-                if (index.columnNames.includes(col.column.name)) {
+                // the index backing the primary key can't be dropped, the key constraint stays in place
+                if (!index.primary && index.columnNames.includes(col.column.name)) {
                     ret.push(this.getDropIndexSQL(name, index));
                 }
             }
@@ -430,7 +430,7 @@ export class OracleSchemaHelper extends SchemaHelper {
         const changedTypes = Object.values(tableDiff.changedColumns).filter(col => col.changedProperties.has('type'));
         for (const col of changedTypes) {
             for (const index of indexes) {
-                if (index.columnNames.includes(col.column.name)) {
+                if (!index.primary && index.columnNames.includes(col.column.name)) {
                     this.append(ret, this.getCreateIndexSQL(name, index));
                 }
             }
@@ -457,8 +457,9 @@ export class OracleSchemaHelper extends SchemaHelper {
         return `drop index ${this.quote(index.keyName)}`;
     }
     dropIndex(table, index, oldIndexName = index.keyName) {
+        // the primary key constraint name is system generated unless named explicitly
         if (index.primary) {
-            return `alter table ${this.quote(table)} drop constraint ${this.quote(oldIndexName)}`;
+            return `alter table ${this.quote(table)} drop primary key`;
         }
         return `drop index ${this.quote(oldIndexName)}`;
     }
@@ -496,7 +497,8 @@ export class OracleSchemaHelper extends SchemaHelper {
         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);
+        const sequenceOptions = this.getSequenceOptionsSQL(column);
+        Utils.runIfNotEmpty(() => col.push(`generated by default as identity${sequenceOptions ? ` (${sequenceOptions})` : ''}`), column.autoincrement);
         /* v8 ignore next 3: default value branch */
         const useDefault = changedProperties
             ? false
@@ -568,7 +570,7 @@ export class OracleSchemaHelper extends SchemaHelper {
     }
     createIndex(index, table, createPrimary = false) {
         if (index.primary) {
-            return '';
+            return createPrimary ? super.createIndex(index, table, true) : '';
         }
         if (index.expression) {
             return index.expression;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/oracledb",
-  "version": "7.3.0-dev.1",
+  "version": "7.3.0-dev.11",
   "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.3.0-dev.1",
+    "@mikro-orm/sql": "7.3.0-dev.11",
     "kysely": "0.29.6",
     "oracledb": "7.0.1"
   },
   "devDependencies": {
-    "@mikro-orm/core": "^7.2.1"
+    "@mikro-orm/core": "^7.2.2"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.3.0-dev.1"
+    "@mikro-orm/core": "7.3.0-dev.11"
   },
   "engines": {
     "node": ">= 22.17.0"