add test in browser WebSQL

Author: fernandocode

package-lock.json

@@ -46,7 +46,7 @@
   "homepage": "https://github.com/fernandocode/ionic-database-builder#readme",
   "dependencies": {
     "@angular/core": ">=7.0.0",
-    "database-builder": ">=0.1.0-rc.11"
+    "database-builder": ">=0.1.0-rc.13"
   },
   "devDependencies": {
     "@angular-devkit/build-angular": "~0.10.0",

package.json

@@ -0,0 +1,62 @@
+import { Injectable } from '@angular/core';
+import { DatabaseBaseTransaction, DatabaseConfig, DatabaseCreatorContract, DatabaseObject, DatabaseResult } from 'database-builder';
+
+@Injectable()
+export class DatabaseBrowserProvider implements DatabaseCreatorContract {
+
+    create(config: DatabaseConfig): Promise<DatabaseObject> {
+        console.log("Database WebSQL! \\o/");
+        return new Promise<DatabaseObject>((resolve, reject) => {
+            // o método OpenDatabase precisa de 4 parametros; o nome do banco de dados, a versão, a descrição e o tamanho estimado (em bytes)
+            const db = (window as any).openDatabase(config.name, "1.0", config.name, 200000);
+
+            // de qualquer forma, sempre teste que o objeto foi instanciado direito antes de usá-lo
+            if (!db) {
+                reject("Não foi possivel iniciar o banco de dados no Browser!");
+            }
+            resolve(<DatabaseObject>{
+                executeSql: (statement: string, params: any): Promise<DatabaseResult> => {
+                    return new Promise<DatabaseResult>((resolve, reject) => {
+                        if (
+                            statement.toUpperCase().indexOf("TRANSACTION") > -1
+                            ||
+                            statement.toUpperCase().indexOf("COMMIT") > -1
+                        ) {
+                            console.warn(`command sql ignored: '${statement}'`);
+                            resolve({} as DatabaseResult);
+                            return;
+                        }
+                        db.transaction((transaction: any) => {
+                            transaction.executeSql(statement, Array.isArray(params) ? params : [],
+                                (s: any, r: any) => resolve(r),
+                                (e: any, err: any) => {
+                                    reject(err)
+                                });
+                        });
+                    });
+                },
+                transaction:
+                    (fn: (transaction: DatabaseBaseTransaction) => void): Promise<any> => {
+                        return db.transaction((transiction: any) => {
+                            fn({
+                                executeSql: (sql: string, values: any): Promise<DatabaseResult> => {
+                                    return new Promise<DatabaseResult>((resolve, reject) => {
+                                        transiction.executeSql(sql, Array.isArray(values) ? values : [],
+                                            (s: any, r: any) => {
+                                                resolve(r)
+                                            },
+                                            (e: any, err: any) => {
+                                                reject(err)
+                                            });
+                                    });
+                                }
+                            });
+                        });
+                    }
+            });
+        });
+    }
+
+
+
+}

src/test/factory/database-browser.ts

@@ -11,6 +11,7 @@ import { DatabaseMigrationService } from './provider/database-migration-service'
 import { DatabaseSettingsFactory } from './factory/database-settings-factory';
 import { TableMapper } from './mapper/table-mapper';
 import { DatabaseCreatorFake } from './factory/database-creator-fake';
+import { DatabaseBrowserProvider } from './factory/database-browser';
 
 describe('Mapper', () => {
 
@@ -32,7 +33,8 @@ describe('Mapper', () => {
                         // useValue: true
                     },
                     {
-                        useClass: DatabaseCreatorFake
+                        useClass: DatabaseBrowserProvider
+                        // useClass: DatabaseCreatorFake
                         // useClass: SQLite
                     },
                     {
@@ -77,7 +79,7 @@ describe('Mapper', () => {
 
     const clienteToSave = {
         codeImport: 1,
-        razaoSocial: 'Razão',
+        razaoSocial: void 0,
         apelido: 'Apelido',
         cidade: {
             codeImport: 2,
@@ -102,39 +104,46 @@ describe('Mapper', () => {
         desativo: false
     } as Cliente;
 
-    it('Test mapper insert T', async(() => {
+    it('Test mapper insert T', async () => {
         const database: Database = TestBed.get(Database);
-        database.crud().then(crud => {
+        const crud = await database.crud();
+        const insert = crud.insert(Cliente, clienteToSave);
+        const result = insert.compile();
+        expect(result[0].params.toString()).toEqual([
+            clienteToSave.codeImport, clienteToSave.razaoSocial, clienteToSave.apelido,
+            clienteToSave.desativo, clienteToSave.cidade.codeImport, clienteToSave.classificacao.codeImport
+        ].toString());
+        expect(result[0].query).toEqual('INSERT INTO Cliente (codeImport, razaoSocial, apelido, desativo, cidade_codeImport, classificacao_codeImport) VALUES (?, ?, ?, ?, ?, ?)');
+
+        const insertResult = await insert.execute();
+        console.log(insertResult);
+
+        const queryResultNull = await crud.query(Cliente)
+            .where(where => where.isNull(x => x.razaoSocial))
+            .toList();
+
+        expect(queryResultNull.length).toEqual(1);
+    });
+
+    it('Test transaction mapper insert T', async () => {
+        const database: Database = TestBed.get(Database);
+        let rollback = () => {
+            database.rollbackTransaction().then().catch();
+        }
+        const crud = await database.beginTransaction()
+        try {
             const result = crud.insert(Cliente, clienteToSave).compile();
             expect(result[0].params.toString()).toEqual([
                 clienteToSave.codeImport, clienteToSave.razaoSocial, clienteToSave.apelido,
                 clienteToSave.desativo, clienteToSave.cidade.codeImport, clienteToSave.classificacao.codeImport
             ].toString());
             expect(result[0].query).toEqual('INSERT INTO Cliente (codeImport, razaoSocial, apelido, desativo, cidade_codeImport, classificacao_codeImport) VALUES (?, ?, ?, ?, ?, ?)');
-        });
-    }));
-
-    it('Test transaction mapper insert T', async(() => {
-        const database: Database = TestBed.get(Database);
-        let rollback = () => {
-            database.rollbackTransaction().then().catch();
+            const commitResult = await database.commitTransaction()
+            expect(commitResult).toEqual(true);
         }
-        database.beginTransaction().then(crud => {
-            try {
-                const result = crud.insert(Cliente, clienteToSave).compile();
-                expect(result[0].params.toString()).toEqual([
-                    clienteToSave.codeImport, clienteToSave.razaoSocial, clienteToSave.apelido,
-                    clienteToSave.desativo, clienteToSave.cidade.codeImport, clienteToSave.classificacao.codeImport
-                ].toString());
-                expect(result[0].query).toEqual('INSERT INTO Cliente (codeImport, razaoSocial, apelido, desativo, cidade_codeImport, classificacao_codeImport) VALUES (?, ?, ?, ?, ?, ?)');
-                database.commitTransaction().then(x => {
-                    expect(x).toEqual(true);
-                }).catch(rollback);
-            }
-            catch (e) {
-                rollback();
-            }
-        });
-    }));
+        catch (e) {
+            rollback();
+        }
+    });
 
 });

src/test/mapper.spec.ts

@@ -28,7 +28,7 @@ export class TableMapper extends MapperBase {
         this.autoMapper(TestClazz, x => x.id, PrimaryKeyType.AutoIncrement);
         this.autoMapper(Regiao, x => x.codeImport, PrimaryKeyType.AutoIncrement);
         this.autoMapper(SubRegiao, x => x.codeImport, PrimaryKeyType.AutoIncrement);
-        this.autoMapper(Uf, x => x.codeImport, PrimaryKeyType.AutoIncrement);
+        this.autoMapper(Uf, x => x.codeImport, PrimaryKeyType.Guid);
         this.autoMapper(Cidade, x => x.codeImport, PrimaryKeyType.AutoIncrement);
         this.autoMapper(Classificacao, x => x.codeImport, PrimaryKeyType.AutoIncrement);
         this.autoMapper(Cliente, x => x.internalKey, PrimaryKeyType.AutoIncrement);

src/test/mapper/table-mapper.ts

@@ -3,13 +3,19 @@ import { Injectable } from '@angular/core';
 import { DatabaseTransaction } from 'database-builder';
 import { DatabaseMigrationContract, Version } from '../..';
 import { Observable } from 'rxjs';
+import { DatabaseResettableContract } from '../../providers/database-resettable-contract';
 
 @Injectable()
 export class DatabaseMigrationService extends DatabaseMigrationContract {
 
-    public to(version: Version, transation: DatabaseTransaction, mappers: GetMapper): Observable<any>[] {
+    public to(version: Version, transation: DatabaseTransaction, mappers: GetMapper, resettable: DatabaseResettableContract): Observable<any>[] {
         const observablesNested: Observable<any>[] = [];
 
+        if (!(window as any)._resetCalled) {
+            resettable.reset(transation);
+            (window as any)._resetCalled = true;
+        }
+
         // if (version.oldVersion < 2.0) {
         //     observablesNested.push(this.migration_v2_0(transation, version, mappers));
         // }