Merge pull request #1 from GeoTecINIT/nsql-fix

Fix conflicts with plugins using nSQL

Author: agonper

README.md

@@ -332,6 +332,19 @@ Before requesting user's current location some options can be customized in orde
 | acquireLocation(options: [AcquireOptions](#geolocation-acquire-options) | `Promise<Geolocation>` | Allows to obtain user's current location |
 | locationStream(options: [StreamOptions](#geolocation-stream-options) | `Observable<Geolocation>` | Allows to actively obtain user's location updates |
 
+## Known issues
+
+### nanoSQL2
+
+If your application depends on [nanoSQL 2](https://www.npmjs.com/package/@nano-sql/adapter-sqlite-nativescript) for data persistence, you should check which database is in use (and change it, if applicable) before running a query against your database. You can do it as follows:
+
+```ts
+if (nSQL().selectedDB !== dbName) {
+  nSQL().useDatabase(dbName);
+}
+nSQL(tableName).query(...);
+```
+
 ## Plugin authors
 
 <a href="https://github.com/agonper" title="Alberto González Pérez">

src/internal/activity-recognition/recognizers/state/store.ts

@@ -1,5 +1,3 @@
-import { nSQL } from "@nano-sql/core/lib";
-
 import { HumanActivity, Resolution } from "../../index";
 import { pluginDb } from "../../../persistence/plugin-db";
 import { recognizersStateModel } from "./model";
@@ -19,8 +17,8 @@ class RecognizersStateStoreDb implements RecognizerStateStore {
   private tableName = recognizersStateModel.name;
 
   async isActive(recognizer: Resolution): Promise<boolean> {
-    await pluginDb.createDB();
-    const rows = await nSQL(this.tableName)
+    const instance = await this.db();
+    const rows = await instance
       .query("select")
       .where(["id", "=", recognizer])
       .exec();
@@ -39,8 +37,8 @@ class RecognizersStateStoreDb implements RecognizerStateStore {
   }
 
   async getLastActivity(recognizer: Resolution): Promise<HumanActivity> {
-    await pluginDb.createDB();
-    const rows = await nSQL(this.tableName)
+    const instance = await this.db();
+    const rows = await instance
       .query("select")
       .where(["id", "=", recognizer])
       .exec();
@@ -55,23 +53,27 @@ class RecognizersStateStoreDb implements RecognizerStateStore {
     recognizer: Resolution,
     activity: HumanActivity
   ): Promise<void> {
-    await pluginDb.createDB();
     const isActive = await this.isActive(recognizer);
     if (!isActive) {
       return null;
     }
-    await nSQL(`${this.tableName}.lastActivity`)
+    const instance = await this.db(`${this.tableName}.lastActivity`);
+    await instance
       .query("upsert", activity)
       .where(["id", "=", recognizer])
       .exec();
   }
 
   private async updateStatus(recognizer: Resolution, active: boolean) {
-    await pluginDb.createDB();
-    await nSQL(this.tableName)
+    const instance = await this.db();
+    await instance
       .query("upsert", { id: recognizer, active, lastActivity: null })
       .exec();
   }
+
+  private db(tableName = this.tableName) {
+    return pluginDb.instance(tableName);
+  }
 }
 
 export const recognizersStateStoreDb = new RecognizersStateStoreDb();

src/internal/persistence/plugin-db.ts

@@ -22,6 +22,14 @@ class PluginDb {
     await this.createDBProcedure;
     this.dbInitialized = true;
   }
+
+  async instance(tableName: string) {
+    await this.createDB();
+    if (nSQL().selectedDB !== dbName) {
+      nSQL().useDatabase(dbName);
+    }
+    return nSQL(tableName);
+  }
 }
 
 export const pluginDb = new PluginDb();

src/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "nativescript-context-apis",
-	"version": "1.0.0",
+	"version": "1.0.1",
 	"description": "Painless access to contextual information for your NativeScript apps",
 	"main": "context-apis",
 	"typings": "index.d.ts",