Update SQLite to a thin wrapper over capacitor-community/sqlite (#55)

* Implement new driver `@derme302/localforage-capacitorsqlitedriver`

Author: derme302

android/app/capacitor.build.gradle

@@ -14,7 +14,7 @@ dependencies {
     implementation project(':capacitor-haptics')
     implementation project(':capacitor-keyboard')
     implementation project(':capacitor-status-bar')
-    implementation project(':capacitor-sqlite-storage')
+    implementation project(':capacitor-community-sqlite')
 
 }
 

android/capacitor.settings.gradle

@@ -17,5 +17,5 @@ project(':capacitor-keyboard').projectDir = new File('../node_modules/@capacitor
 include ':capacitor-status-bar'
 project(':capacitor-status-bar').projectDir = new File('../node_modules/@capacitor/status-bar/android')
 
-include ':capacitor-sqlite-storage'
-project(':capacitor-sqlite-storage').projectDir = new File('../node_modules/capacitor-sqlite-storage/android')
+include ':capacitor-community-sqlite'
+project(':capacitor-community-sqlite').projectDir = new File('../node_modules/@capacitor-community/sqlite/android')

ios/App/Podfile

@@ -16,7 +16,7 @@ def capacitor_pods
   pod 'CapacitorHaptics', :path => '../../node_modules/@capacitor/haptics'
   pod 'CapacitorKeyboard', :path => '../../node_modules/@capacitor/keyboard'
   pod 'CapacitorStatusBar', :path => '../../node_modules/@capacitor/status-bar'
-  pod 'CapacitorSqliteStorage', :path => '../../node_modules/capacitor-sqlite-storage'
+  pod 'CapacitorCommunitySqlite', :path => '../../node_modules/@capacitor-community/sqlite'
 end
 
 target 'App' do

ios/App/Podfile.lock

@@ -5,54 +5,69 @@ PODS:
     - Capacitor
   - CapacitorBrowser (7.0.1):
     - Capacitor
+  - CapacitorCommunitySqlite (7.0.0):
+    - Capacitor
+    - SQLCipher
+    - ZIPFoundation
   - CapacitorCordova (7.3.0)
   - CapacitorHaptics (7.0.1):
     - Capacitor
   - CapacitorKeyboard (7.0.1):
     - Capacitor
-  - CapacitorSqliteStorage (0.0.3):
-    - Capacitor
   - CapacitorStatusBar (7.0.1):
     - Capacitor
+  - SQLCipher (4.9.0):
+    - SQLCipher/standard (= 4.9.0)
+  - SQLCipher/common (4.9.0)
+  - SQLCipher/standard (4.9.0):
+    - SQLCipher/common
+  - ZIPFoundation (0.9.19)
 
 DEPENDENCIES:
   - "Capacitor (from `../../node_modules/@capacitor/ios`)"
   - "CapacitorApp (from `../../node_modules/@capacitor/app`)"
   - "CapacitorBrowser (from `../../node_modules/@capacitor/browser`)"
+  - "CapacitorCommunitySqlite (from `../../node_modules/@capacitor-community/sqlite`)"
   - "CapacitorCordova (from `../../node_modules/@capacitor/ios`)"
   - "CapacitorHaptics (from `../../node_modules/@capacitor/haptics`)"
   - "CapacitorKeyboard (from `../../node_modules/@capacitor/keyboard`)"
-  - CapacitorSqliteStorage (from `../../node_modules/capacitor-sqlite-storage`)
   - "CapacitorStatusBar (from `../../node_modules/@capacitor/status-bar`)"
 
+SPEC REPOS:
+  trunk:
+    - SQLCipher
+    - ZIPFoundation
+
 EXTERNAL SOURCES:
   Capacitor:
     :path: "../../node_modules/@capacitor/ios"
   CapacitorApp:
     :path: "../../node_modules/@capacitor/app"
   CapacitorBrowser:
     :path: "../../node_modules/@capacitor/browser"
+  CapacitorCommunitySqlite:
+    :path: "../../node_modules/@capacitor-community/sqlite"
   CapacitorCordova:
     :path: "../../node_modules/@capacitor/ios"
   CapacitorHaptics:
     :path: "../../node_modules/@capacitor/haptics"
   CapacitorKeyboard:
     :path: "../../node_modules/@capacitor/keyboard"
-  CapacitorSqliteStorage:
-    :path: "../../node_modules/capacitor-sqlite-storage"
   CapacitorStatusBar:
     :path: "../../node_modules/@capacitor/status-bar"
 
 SPEC CHECKSUMS:
   Capacitor: 8585c18a230122906e114ba5f6325ec65ee1371f
   CapacitorApp: febecbb9582cb353aed037e18ec765141f880fe9
   CapacitorBrowser: 6299776d496e968505464884d565992faa20444a
+  CapacitorCommunitySqlite: b11e556cf5d149f9e0b6fbbb47959a6cd718c3d0
   CapacitorCordova: 2685f5c43675793b5f06dfd66b3b26268f003b97
   CapacitorHaptics: 1f1e17041f435d8ead9ff2a34edd592c6aa6a8d6
   CapacitorKeyboard: 09fd91dcde4f8a37313e7f11bde553ad1ed52036
-  CapacitorSqliteStorage: 7722f09c29d4d994d16a1db66d6cdb449521138c
   CapacitorStatusBar: 6e7af040d8fc4dd655999819625cae9c2d74c36f
+  SQLCipher: 31878d8ebd27e5c96db0b7cb695c96e9f8ad77da
+  ZIPFoundation: b8c29ea7ae353b309bc810586181fd073cb3312c
 
-PODFILE CHECKSUM: 6c2c6f6143679df0d0045483a1342e448bb923ce
+PODFILE CHECKSUM: 35cf255c7b0d226be99a527c81471ab76befcd86
 
 COCOAPODS: 1.16.2

package-lock.json

@@ -31,11 +31,11 @@
     "@capacitor/ios": "^7.0.0",
     "@capacitor/keyboard": "^7.0.0",
     "@capacitor/status-bar": "^7.0.0",
+    "@capacitor-community/sqlite": "^7.0.0",
+    "@derme302/localforage-capacitorsqlitedriver": "^1.1.2",
     "@ionic/angular": "8.6.1",
     "@ionic/storage-angular": "^4.0.0",
-    "capacitor-sqlite-storage": "^0.0.3",
     "ionicons": "^7.2.2",
-    "localforage-cordovasqlitedriver": "^1.8.0",
     "rxjs": "7.8.2",
     "tslib": "2.8.1",
     "zone.js": "~0.14.6"

package.json

@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { Storage } from '@ionic/storage-angular';
-import * as CordovaSQLiteDriver from 'localforage-cordovasqlitedriver';
+import { SQLiteDriver } from '@derme302/localforage-capacitorsqlitedriver';
 import { BehaviorSubject } from 'rxjs';
 
 
@@ -17,7 +17,7 @@ export class StorageService {
   }
 
   async init() {
-    await this.storage.defineDriver(CordovaSQLiteDriver);
+    await this.storage.defineDriver(new SQLiteDriver());
     const storage = await this.storage.create();
     this._storage = storage;
     this.isReady = true;

src/app/services/storage.service.ts

@@ -9,7 +9,7 @@ import { environment } from './environments/environment';
 import { Drivers } from '@ionic/storage';
 import { IonicStorageModule } from '@ionic/storage-angular';
 
-import { SQLite } from 'capacitor-sqlite-storage';
+import { CAPACITOR_SQLITE_DRIVER } from '@derme302/localforage-capacitorsqlitedriver';
 import { PlatformService } from './app/services/platform.service';
 import { StorageService } from './app/services/storage.service';
 import { SourcesService } from './app/services/sources.service';
@@ -25,7 +25,7 @@ bootstrapApplication(AppComponent, {
     { provide: RouteReuseStrategy, useClass: IonicRouteStrategy },
     provideIonicAngular(),
     importProvidersFrom(IonicStorageModule.forRoot({
-      driverOrder: [SQLite, Drivers.IndexedDB, Drivers.LocalStorage]
+      driverOrder: [CAPACITOR_SQLITE_DRIVER, Drivers.IndexedDB, Drivers.LocalStorage]
     })),
     provideRouter(routes),
     PlatformService,