@capacitor-community/sqlite 3.4.2-2 → 3.4.2-5

package/electron/dist/plugin.js

@@ -495,6 +495,7 @@ class UtilsDrop {
      */
     async dropElements(db, type) {
         let msg = '';
+        let stmt1 = `AND name NOT LIKE ('sqlite_%')`;
         switch (type) {
             case 'index':
                 msg = 'DropIndexes';
@@ -504,6 +505,7 @@ class UtilsDrop {
                 break;
             case 'table':
                 msg = 'DropTables';
+                stmt1 += ` AND name NOT IN ('sync_table')`;
                 break;
             case 'view':
                 msg = 'DropViews';
@@ -513,7 +515,7 @@ class UtilsDrop {
         }
         // get the element's names
         let stmt = 'SELECT name FROM sqlite_master WHERE ';
-        stmt += `type = '${type}' AND name NOT LIKE 'sqlite_%';`;
+        stmt += `type = '${type}' ${stmt1};`;
         try {
             const elements = await this._uSQLite.queryAll(db, stmt, []);
             if (elements.length > 0) {
@@ -589,12 +591,12 @@ utilsDrop.UtilsDrop = UtilsDrop;
 
 Object.defineProperty(utilsJson, "__esModule", { value: true });
 utilsJson.UtilsJson = void 0;
-const utilsDrop_1$2 = utilsDrop;
+const utilsDrop_1$3 = utilsDrop;
 const utilsSQLite_1$4 = utilsSQLite;
 class UtilsJson {
     constructor() {
         this._uSQLite = new utilsSQLite_1$4.UtilsSQLite();
-        this._uDrop = new utilsDrop_1$2.UtilsDrop();
+        this._uDrop = new utilsDrop_1$3.UtilsDrop();
     }
     /**
      * isLastModified
@@ -1026,6 +1028,7 @@ class UtilsJson {
         const keyFirstLevel = [
             'database',
             'version',
+            'overwrite',
             'encrypted',
             'mode',
             'tables',
@@ -1041,6 +1044,8 @@ class UtilsJson {
                 return false;
             if (key === 'version' && typeof obj[key] != 'number')
                 return false;
+            if (key === 'overwrite' && typeof obj[key] != 'boolean')
+                return false;
             if (key === 'encrypted' && typeof obj[key] != 'boolean')
                 return false;
             if (key === 'mode' && typeof obj[key] != 'string')
@@ -1999,14 +2004,14 @@ var importFromJson = {};
 
 Object.defineProperty(importFromJson, "__esModule", { value: true });
 importFromJson.ImportFromJson = void 0;
-const utilsDrop_1$1 = utilsDrop;
+const utilsDrop_1$2 = utilsDrop;
 const utilsSQLite_1$2 = utilsSQLite;
 const utilsJson_1$3 = utilsJson;
 class ImportFromJson {
     constructor() {
         this._uJson = new utilsJson_1$3.UtilsJson();
         this._uSQLite = new utilsSQLite_1$2.UtilsSQLite();
-        this._uDrop = new utilsDrop_1$1.UtilsDrop();
+        this._uDrop = new utilsDrop_1$2.UtilsDrop();
     }
     /**
      * CreateDatabaseSchema
@@ -2017,14 +2022,16 @@ class ImportFromJson {
         let changes = -1;
         const version = jsonData.version;
         try {
-            // set Foreign Keys On
-            await this._uSQLite.setForeignKeyConstraintsEnabled(mDB, true);
             // set User Version PRAGMA
             await this._uSQLite.setVersion(mDB, version);
             // DROP ALL when mode="full"
             if (jsonData.mode === 'full') {
+                // set Foreign Keys Off
+                await this._uSQLite.setForeignKeyConstraintsEnabled(mDB, false);
                 await this._uDrop.dropAll(mDB);
             }
+            // set Foreign Keys On
+            await this._uSQLite.setForeignKeyConstraintsEnabled(mDB, true);
             // create database schema
             changes = await this._uJson.createSchema(mDB, jsonData);
             return Promise.resolve(changes);
@@ -2580,14 +2587,14 @@ var utilsUpgrade = {};
 Object.defineProperty(utilsUpgrade, "__esModule", { value: true });
 utilsUpgrade.UtilsUpgrade = void 0;
 const utilsJson_1$2 = utilsJson;
-const utilsDrop_1 = utilsDrop;
+const utilsDrop_1$1 = utilsDrop;
 const utilsFile_1$2 = utilsFile;
 const utilsSQLite_1$1 = utilsSQLite;
 class UtilsUpgrade {
     constructor() {
         this._uSQLite = new utilsSQLite_1$1.UtilsSQLite();
         this._uFile = new utilsFile_1$2.UtilsFile();
-        this._uDrop = new utilsDrop_1.UtilsDrop();
+        this._uDrop = new utilsDrop_1$1.UtilsDrop();
         this._uJson = new utilsJson_1$2.UtilsJson();
         this._alterTables = {};
         this._commonColumns = {};
@@ -2899,6 +2906,7 @@ const exportToJson_1 = exportToJson;
 const importFromJson_1 = importFromJson;
 const utilsJson_1$1 = utilsJson;
 //import { UtilsEncryption } from './utilsEncryption';
+const utilsDrop_1 = utilsDrop;
 const utilsFile_1$1 = utilsFile;
 const utilsSQLite_1 = utilsSQLite;
 const utilsUpgrade_1 = utilsUpgrade;
@@ -2910,6 +2918,7 @@ class Database {
         this._uFile = new utilsFile_1$1.UtilsFile();
         this._uSQLite = new utilsSQLite_1.UtilsSQLite();
         this._uJson = new utilsJson_1$1.UtilsJson();
+        this._uDrop = new utilsDrop_1.UtilsDrop();
         //  private _uGlobal: GlobalSQLite = new GlobalSQLite();
         //  private _uEncrypt: UtilsEncryption = new UtilsEncryption();
         this._uUpg = new utilsUpgrade_1.UtilsUpgrade();
@@ -2968,31 +2977,21 @@ class Database {
             password,*/);
             const curVersion = await this._uSQLite.getVersion(this._mDB);
             this._isDBOpen = true;
-            if (this._version > curVersion) {
-                const keys = Object.keys(this._vUpgDict);
-                if (keys.length > 0) {
-                    try {
-                        // execute the upgrade flow process
-                        await this._uUpg.onUpgrade(this._mDB, this._vUpgDict, this._dbName, curVersion, this._version);
-                        // delete the backup database
-                        await this._uFile.deleteFileName(`backup-${this._dbName}`);
-                    }
-                    catch (err) {
-                        // restore the database from backup
-                        try {
-                            await this._uFile.restoreFileName(this._dbName, 'backup');
-                        }
-                        catch (err) {
-                            return Promise.reject(`Open: ${err}`);
-                        }
-                    }
+            if (this._version > curVersion &&
+                Object.keys(this._vUpgDict).length > 0) {
+                try {
+                    // execute the upgrade flow process
+                    await this._uUpg.onUpgrade(this._mDB, this._vUpgDict, this._dbName, curVersion, this._version);
+                    // delete the backup database
+                    await this._uFile.deleteFileName(`backup-${this._dbName}`);
                 }
-                else {
+                catch (err) {
+                    // restore the database from backup
                     try {
-                        await this._uSQLite.setVersion(this._mDB, this._version);
+                        await this._uFile.restoreFileName(this._dbName, 'backup');
                     }
                     catch (err) {
-                        return Promise.reject(`SetVersion: ${this._version} ${err}`);
+                        return Promise.reject(`Open: ${err}`);
                     }
                 }
             }
@@ -3142,6 +3141,10 @@ class Database {
                     return Promise.reject('No last_modified column in tables');
                 }
             }
+            else {
+                changes = 0;
+            }
+            console.log(`>>> CreateSyncTable changes: ${changes}`);
             return Promise.resolve(changes);
         }
         catch (err) {
@@ -3348,6 +3351,20 @@ class Database {
             }
         }
     }
+    async getTableList() {
+        if (!this._isDBOpen) {
+            let msg = `GetTableList: Database ${this._dbName} `;
+            msg += `not opened`;
+            return Promise.reject(msg);
+        }
+        try {
+            const retArr = await this._uDrop.getTablesNames(this._mDB);
+            return Promise.resolve(retArr);
+        }
+        catch (err) {
+            return Promise.reject(`GetTableList: ${err}`);
+        }
+    }
     async importJson(jsonData) {
         let changes = 0;
         if (this._isDBOpen) {
@@ -3493,9 +3510,7 @@ class CapacitorSQLite {
         const dbName = options.database;
         keys = Object.keys(this._dbDict);
         if (!keys.includes(dbName)) {
-            return Promise.reject('CloseConnection command failed: No ' +
-                'available connection for ' +
-                dbName);
+            return Promise.resolve();
         }
         const mDB = this._dbDict[dbName];
         if (mDB.isDBOpen()) {
@@ -3583,7 +3598,28 @@ class CapacitorSQLite {
             return Promise.resolve(ret);
         }
         catch (err) {
-            return Promise.reject(`Open: ${err}`);
+            return Promise.reject(`GetVersion: ${err}`);
+        }
+    }
+    async getTableList(options) {
+        let keys = Object.keys(options);
+        if (!keys.includes('database')) {
+            return Promise.reject('Must provide a database name');
+        }
+        const dbName = options.database;
+        keys = Object.keys(this._dbDict);
+        if (!keys.includes(dbName)) {
+            return Promise.reject(`Open: No available connection for ${dbName}`);
+        }
+        const mDB = this._dbDict[dbName];
+        try {
+            const tableList = await mDB.getTableList();
+            const ret = {};
+            ret.values = tableList;
+            return Promise.resolve(ret);
+        }
+        catch (err) {
+            return Promise.reject(`GetTableList: ${err}`);
         }
     }
     async execute(options) {
@@ -3823,7 +3859,7 @@ class CapacitorSQLite {
         }
     }
     async importFromJson(options) {
-        var _a;
+        var _a, _b;
         const keys = Object.keys(options);
         if (!keys.includes('jsonstring')) {
             return Promise.reject('Must provide a json object');
@@ -3837,14 +3873,32 @@ class CapacitorSQLite {
         const vJsonObj = jsonObj;
         const dbName = `${vJsonObj.database}SQLite.db`;
         const dbVersion = (_a = vJsonObj.version) !== null && _a !== void 0 ? _a : 1;
+        const mode = vJsonObj.mode;
+        const overwrite = (_b = vJsonObj.overwrite) !== null && _b !== void 0 ? _b : false;
         //    const encrypted: boolean = vJsonObj.encrypted ?? false;
         //    const mode: string = encrypted ? 'secret' : 'no-encryption';
         // Create the database
         const mDb = new Database_1.Database(dbName, 
         /*encrypted, mode, */ dbVersion, {});
         try {
+            if (overwrite && mode === 'full') {
+                const isExists = this._uFile.isFileExists(dbName);
+                if (isExists) {
+                    await this._uFile.deleteFileName(dbName);
+                }
+            }
             // Open the database
             await mDb.open();
+            const tableList = await mDb.getTableList();
+            if (mode === 'full' && tableList.length > 0) {
+                const curVersion = await mDb.getVersion();
+                if (dbVersion < curVersion) {
+                    return Promise.reject(`ImportFromJson: Cannot import a version lower than ${curVersion}`);
+                }
+                if (curVersion === dbVersion) {
+                    return Promise.resolve({ changes: { changes: 0 } });
+                }
+            }
             // Import the JsonSQLite Object
             const changes = await mDb.importJson(vJsonObj);
             // Close the database