@capacitor-community/sqlite 4.1.0-4 → 4.1.0-5

package/electron/dist/plugin.js

@@ -43,10 +43,6 @@ class UtilsSQLite {
     password: string,*/) {
         const msg = 'OpenOrCreateDatabase: ';
         // open sqlite3 database
-        /*    const mDB: any = new this.JSQlite.Database(pathDB, {
-          verbose: console.log,
-        });
-        */
         const mDB = new this.SQLite3.Database(pathDB, {
             verbose: console.log,
         });
@@ -345,9 +341,7 @@ class UtilsSQLite {
                     if (trimStmt === 'DELETE FROM' &&
                         stmt.toLowerCase().includes('WHERE'.toLowerCase())) {
                         const whereStmt = `${stmt.trim()};`;
-                        console.log(`in utilsSQLite execute whereStmt ${whereStmt}`);
                         const rStmt = await this.deleteSQL(mDB, whereStmt, []);
-                        console.log(`in utilsSQLite execute rStmt ${rStmt}`);
                         resArr.push(rStmt);
                     }
                     else {
@@ -356,7 +350,6 @@ class UtilsSQLite {
                 }
                 sqlStmt = resArr.join(';');
             }
-            console.log(`in utilsSQLite execute sqlStmt ${sqlStmt}`);
             await this.execDB(mDB, sqlStmt);
             changes = (await this.dbChanges(mDB)) - initChanges;
             return Promise.resolve(changes);
@@ -448,7 +441,6 @@ class UtilsSQLite {
     async runExec(db, stmt, values = []) {
         return new Promise((resolve, reject) => {
             if (values != null && values.length > 0) {
-                console.log(`in runExec stmt: ${stmt} values: ${values}`);
                 db.run(stmt, values, (err) => {
                     if (err) {
                         console.log(`in runExec err1: ${JSON.stringify(err)}`);
@@ -512,7 +504,6 @@ class UtilsSQLite {
                     .substring('DELETE FROM'.length)
                     .trim();
                 sqlStmt = `UPDATE ${tableName} SET sql_deleted = 1 ${clauseStmt}`;
-                console.log(`in deleteSQL sqlStmt: ${sqlStmt}`);
                 // Find REFERENCES if any and update the sql_deleted column
                 await this.findReferencesAndUpdate(db, tableName, clauseStmt, values);
             }
@@ -537,31 +528,24 @@ class UtilsSQLite {
                 return;
             }
             const tableNameWithRefs = references.pop();
-            console.log(`references: ${references}`);
-            console.log(`tableNameWithRefs: ${tableNameWithRefs}`);
             for (const refe of references) {
                 // get the tableName of the reference
                 const refTable = await this.getReferenceTableName(refe);
                 if (refTable.length <= 0) {
                     continue;
                 }
-                console.log(`refTable: ${refTable}`);
                 // get the with references columnName
                 const withRefsNames = await this.getWithRefsColumnName(refe);
-                console.log(`withRefsNames: ${withRefsNames}`);
                 if (withRefsNames.length <= 0) {
                     continue;
                 }
                 // get the referenced columnName
                 const colNames = await this.getReferencedColumnName(refe);
-                console.log(`colNames: ${colNames}`);
                 if (colNames.length <= 0) {
                     continue;
                 }
                 // update the where clause
                 const uWhereStmt = await this.updateWhere(whereStmt, withRefsNames, colNames);
-                console.log(`whereStmt: ${whereStmt}`);
-                console.log(`uWhereStmt: ${uWhereStmt}`);
                 if (uWhereStmt.length <= 0) {
                     continue;
                 }
@@ -571,31 +555,22 @@ class UtilsSQLite {
                     updTableName = refTable;
                     updColNames = withRefsNames;
                 }
-                console.log(`updTableName: ${updTableName}`);
-                console.log(`updColNames: ${updColNames}`);
                 //update sql_deleted for this reference
                 const stmt = 'UPDATE ' + updTableName + ' SET sql_deleted = 1 ' + uWhereStmt;
-                console.log(`stmt: ${stmt}`);
-                console.log(`values: ${values}`);
                 if (values != null && values.length > 0) {
                     const mVal = await this.replaceUndefinedByNull(values);
                     let arrVal = whereStmt.split('?');
                     if (arrVal[arrVal.length - 1] === ';')
                         arrVal = arrVal.slice(0, -1);
-                    console.log(`arrVal: ${arrVal}`);
                     const selValues = [];
                     for (const [j, val] of arrVal.entries()) {
-                        console.log(`j: ${j} val: ${val}`);
                         for (const updVal of updColNames) {
                             const idxVal = val.indexOf(updVal);
-                            console.log(`updVal: ${updVal} idxVal ${idxVal}`);
                             if (idxVal > -1) {
                                 selValues.push(mVal[j]);
                             }
                         }
                     }
-                    console.log(`*** stmt: ${selValues}`);
-                    console.log(`*** selValues: ${selValues}`);
                     await db.run(stmt, selValues);
                 }
                 else {
@@ -2808,10 +2783,13 @@ class UtilsFile {
      */
     getAssetsDatabasesPath() {
         let retPath = '';
-        const rawdata = this.NodeFs.readFileSync(this.Path.resolve(this.appPath, 'capacitor.config.json'));
-        const webDir = JSON.parse(rawdata).webDir;
+        const webDir = this.capConfig.webDir;
         const dir = webDir === 'www' ? 'src' : 'public';
-        retPath = this.Path.resolve(this.appPath, dir, 'assets', this.pathDB.toLowerCase());
+        let mAppPath = this.appPath;
+        if (this.Path.basename(this.appPath) === "electron") {
+            mAppPath = this.Path.dirname(this.appPath);
+        }
+        retPath = this.Path.resolve(mAppPath, dir, 'assets', 'databases');
         return retPath;
     }
     /**