@@ -6,9 +6,10 @@ import { Injectable, Injector, Optional } from "@angular/core";
66import { DatabaseTransaction , Ddl } from "database-builder" ;
77import { DatabaseMigrationContract } from "./database-migration-contract" ;
88import { DatabaseMigrationBase } from "../utils/database-migration-base" ;
9+ import { DatabaseResettableContract } from "./database-resettable-contract" ;
910
1011@Injectable ( )
11- export class DatabaseMigration extends DatabaseMigrationBase {
12+ export class DatabaseMigration extends DatabaseMigrationBase implements DatabaseResettableContract {
1213
1314 private _settings : DatabaseSettingsFactoryContract ;
1415
@@ -20,7 +21,7 @@ export class DatabaseMigration extends DatabaseMigrationBase {
2021 this . _settings = _injector . get ( DatabaseSettingsFactoryContract ) ;
2122 }
2223
23- public databaseReset ( transation : DatabaseTransaction ) : Observable < any > {
24+ public reset ( transation : DatabaseTransaction ) : Observable < any > {
2425
2526 // tslint:disable-next-line:no-console
2627 console . info ( "database reset" ) ;
@@ -47,15 +48,18 @@ export class DatabaseMigration extends DatabaseMigrationBase {
4748 let observablesNested : Array < Observable < any > > = [ ] ;
4849 if ( this . _databaseMigrationContract ) {
4950 const toObservables = this . _databaseMigrationContract . to (
50- version , transation , this . _settings . mapper ( this . _injector )
51+ version ,
52+ transation ,
53+ this . _settings . mapper ( this . _injector ) ,
54+ this
5155 ) ;
5256 if ( toObservables && toObservables . length > 0 ) {
5357 observablesNested = observablesNested . concat ( toObservables ) ;
5458 }
5559 }
5660
5761 if ( observablesNested . length === 0 && version . oldVersion < 1 ) {
58- observablesNested . push ( this . databaseReset ( transation ) ) ;
62+ observablesNested . push ( this . reset ( transation ) ) ;
5963 }
6064
6165 this . callNested ( observablesNested , 0 ) . subscribe ( result => {
0 commit comments