feature - support soft remove recursively

docs/data-source-options.md

@@ -84,6 +84,8 @@ Different RDBMS-es have their own specific options.
  Note that for MongoDB database it does not create schema, because MongoDB is schemaless.
  Instead, it syncs just by creating indices.
 
+- `synchronizeWithoutDrops` - Indicates if synchronize should not drop columns, tables and more
+
 - `migrationsRun` - Indicates if migrations should be auto run on every application launch.
  As an alternative, you can use CLI and run migration:run command.
 

package.json

@@ -1,6 +1,6 @@
 {
- "name": "typeorm",
- "private": true,
+ "name": "@oxeye/typeorm",
+ "private": false,
  "version": "0.3.20",
  "description": "Data-Mapper ORM for TypeScript, ES7, ES6, ES5. Supports MySQL, PostgreSQL, MariaDB, SQLite, MS SQL Server, Oracle, MongoDB databases.",
  "license": "MIT",
@@ -66,10 +66,10 @@
  },
  "repository": {
  "type": "git",
- "url": "https://github.com/typeorm/typeorm.git"
+ "url": "https://github.com/ox-eye/ox-typeorm.git"
  },
  "bugs": {
- "url": "https://github.com/typeorm/typeorm/issues"
+ "url": "https://github.com/ox-eye/ox-typeorm/issues"
  },
  "homepage": "https://typeorm.io",
  "tags": [

src/connection/options-reader/ConnectionOptionsEnvReader.ts

@@ -45,6 +45,9 @@ export class ConnectionOptionsEnvReader {
  synchronize: OrmUtils.toBoolean(
  PlatformTools.getEnvVariable("TYPEORM_SYNCHRONIZE"),
  ),
+ synchronizeWithoutDrops: OrmUtils.toBoolean(
+ PlatformTools.getEnvVariable("TYPEORM_SYNCHRONIZE_WITHOUT_DROPS")
+ ),
  dropSchema: OrmUtils.toBoolean(
  PlatformTools.getEnvVariable("TYPEORM_DROP_SCHEMA"),
  ),

src/data-source/BaseDataSourceOptions.ts

@@ -102,6 +102,11 @@ export interface BaseDataSourceOptions {
  */
  readonly synchronize?: boolean
 
+ /**
+ * Indicates if synchronize should not drop columns and tables
+ */
+ readonly synchronizeWithoutDrops?: boolean;
+
  /**
  * Indicates if migrations should be auto run on every application launch.
  * Alternative to it, you can use CLI and run migrations:run command.

src/persistence/SubjectExecutor.ts

@@ -16,6 +16,8 @@ import { OrmUtils } from "../util/OrmUtils"
 import { UpdateResult } from "../query-builder/result/UpdateResult"
 import { ObjectUtils } from "../util/ObjectUtils"
 import { InstanceChecker } from "../util/InstanceChecker"
+import {RelationMetadata} from "../metadata/RelationMetadata";
+import {OracleDriver} from "../driver/oracle/OracleDriver";
 
 /**
  * Executes all database operations (inserts, updated, deletes) that must be executed
@@ -829,6 +831,10 @@ export class SubjectExecutor {
  }
 
  updateResult = await softDeleteQueryBuilder.execute()
+
+ for (const relation of subject.metadata.relations) {
+ await this.executeSoftRemoveRecursive(relation, [Reflect.get(subject.identifier, subject.metadata.primaryColumns[0].propertyName)]);
+ }
  }
 
  subject.generatedMap = updateResult.generatedMaps[0]
@@ -866,6 +872,39 @@ export class SubjectExecutor {
  )
  }
 
+ /**
+ * Execute soft remove recursively.
+ */
+ protected async executeSoftRemoveRecursive(relation: RelationMetadata, ids: any[]): Promise<void> {
+ if (relation.isCascadeSoftRemove){
+ let primaryPropertyName = relation.inverseEntityMetadata.primaryColumns[0].propertyName;
+ let updateResult: UpdateResult;
+ let softDeleteQueryBuilder = this.queryRunner
+ .manager
+ .createQueryBuilder()
+ .softDelete()
+ .from(relation.inverseEntityMetadata.target)
+ .returning([primaryPropertyName])
+ .updateEntity(this.options && this.options.reload === false ? false : true)
+ .callListeners(false);
+ softDeleteQueryBuilder.where(`${relation.inverseSidePropertyPath} in (:...ids)`, {ids: ids});
+ updateResult = await softDeleteQueryBuilder.execute();
+ let parentIds;
+ // Only in oracle the returning value is a list of the affected row primary keys and not list of dictionary
+ if (this.queryRunner.connection.driver instanceof OracleDriver){
+ parentIds = updateResult.raw[0];
+ }
+ else {
+ parentIds = updateResult.raw.map((row: any) => row[Object.keys(row)[0]]);
+ }
+ if (parentIds.length) {
+ for (const subRelation of relation.inverseEntityMetadata.relations) {
+ await this.executeSoftRemoveRecursive(subRelation, parentIds);
+ }
+ }
+ }
+ }
+
  /**
  * Recovers all given subjects in the database.
  */

src/schema-builder/RdbmsSchemaBuilder.ts

@@ -213,20 +213,27 @@ export class RdbmsSchemaBuilder implements SchemaBuilder {
  * Order of operations matter here.
  */
  protected async executeSchemaSyncOperationsInProperOrder(): Promise<void> {
- await this.dropOldViews()
- await this.dropOldForeignKeys()
- await this.dropOldIndices()
- await this.dropOldChecks()
- await this.dropOldExclusions()
- await this.dropCompositeUniqueConstraints()
+ if (!this.connection.options.synchronizeWithoutDrops) {
+ await this.dropOldViews()
+ await this.dropOldForeignKeys()
+ await this.dropOldIndices()
+ await this.dropOldChecks()
+ await this.dropOldExclusions()
+ await this.dropCompositeUniqueConstraints()
+ }
+
  // await this.renameTables();
  await this.renameColumns()
  await this.changeTableComment()
  await this.createNewTables()
- await this.dropRemovedColumns()
+ if (!this.connection.options.synchronizeWithoutDrops) {
+ await this.dropRemovedColumns();
+ }
  await this.addNewColumns()
  await this.updatePrimaryKeys()
- await this.updateExistColumns()
+ if (!this.connection.options.synchronizeWithoutDrops) {
+ await this.updateExistColumns()
+ }
  await this.createNewIndices()
  await this.createNewChecks()
  await this.createNewExclusions()