@capacitor-community/sqlite 5.6.2 → 5.6.4

package/ios/Plugin/Utils/UtilsSQLCipher.swift

@@ -455,6 +455,11 @@ class UtilsSQLCipher {
         var names: String = ""
         var result: [[String: Any]] = []
         var retMode: String
+        let stmtType = sqlStmt
+                .trimmingCharacters(in: .whitespacesAndNewlines)
+                .components(separatedBy: " ")
+                .first?.capitalized ?? ""
+
         if #available(iOS 15, *) {
             retMode = returnMode
         } else {
@@ -471,7 +476,7 @@ class UtilsSQLCipher {
             names = stmtNames["names"] ?? ""
         }
         // Check for DELETE statement
-        if !fromJson && sqlStmt.prefix(6).uppercased() == "DELETE" {
+        if !fromJson && stmtType == "DELETE" {
             do {
                 sqlStmt = try deleteSQL(mDB: mDB, sql: sqlStmt,
                                         values: values)
@@ -564,7 +569,12 @@ class UtilsSQLCipher {
     throws -> [[String: Any]] {
         var result: [[String: Any]] = []
         let initLastId = Int64(sqlite3_last_insert_rowid(mDB.mDb))
-        if sqlStmt.prefix(6).uppercased() == "DELETE" &&
+        let stmtType = sqlStmt
+                .trimmingCharacters(in: .whitespacesAndNewlines)
+                .components(separatedBy: " ")
+                .first?.capitalized ?? ""
+
+        if stmtType == "DELETE" &&
             names.count > 0 {
             do {
                 result = try UtilsDelete
@@ -587,7 +597,7 @@ class UtilsSQLCipher {
             .returningWorkAround(message: message)
 
         }
-        if sqlStmt.prefix(6).uppercased() == "INSERT" {
+        if stmtType == "INSERT" {
             let lastId = Int64(sqlite3_last_insert_rowid(mDB.mDb))
             let tableName = UtilsSQLStatement
                 .extractTableName(from: sqlStmt)
@@ -609,7 +619,7 @@ class UtilsSQLCipher {
 
             }
 
-        } else if sqlStmt.prefix(6).uppercased() == "UPDATE" {
+        } else if stmtType == "UPDATE" {
             do {
                 result = try UtilsDelete
                     .getUpdDelReturnedValues(mDB: mDB,

package/ios/Plugin/Utils/UtilsSQLStatement.swift

@@ -326,6 +326,10 @@ class UtilsSQLStatement {
     // MARK: - isReturning
 
     class func isReturning(sqlStmt: String) -> (Bool, String, String) {
+        let stmtType = sqlStmt
+                .trimmingCharacters(in: .whitespacesAndNewlines)
+                .components(separatedBy: " ")
+                .first?.capitalized ?? ""
         var stmt = sqlStmt.trimmingCharacters(in: .whitespacesAndNewlines)
         if stmt.hasSuffix(";") {
             // Remove the suffix
@@ -333,11 +337,13 @@ class UtilsSQLStatement {
                 .trimmingCharacters(in: .whitespacesAndNewlines)
         }
 
-        switch stmt.prefix(6).uppercased() {
+        switch stmtType {
 
         case "INSERT":
             if let valuesIndex = stmt.range(of: "VALUES", options: .caseInsensitive)?.lowerBound,
-               let closingParenthesisIndex = stmt.range(of: ")", options: .backwards, range: valuesIndex..<stmt.endIndex)?.upperBound {
+               let closingParenthesisIndex = stmt
+               .range(of: ")", options: .backwards, range: valuesIndex..<stmt.endIndex)?
+               .upperBound {
                 guard closingParenthesisIndex < stmt.endIndex else {
                     stmt += ";"
                     return (false, stmt, "")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor-community/sqlite",
-  "version": "5.6.2",
+  "version": "5.6.4",
   "description": "Community plugin for native & electron SQLite databases",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",
@@ -97,6 +97,6 @@
     }
   },
   "dependencies": {
-    "jeep-sqlite": "^2.6.0"
+    "jeep-sqlite": "^2.6.2"
   }
 }

package/src/definitions.ts

@@ -675,6 +675,20 @@ export interface capSQLiteQueryOptions {
    */
   isSQL92?: boolean;
 }
+export interface capTask {
+  /**
+   * define task for executeTransaction
+   * @since 5.6.3
+   */
+  /**
+   * A SQLite statement
+   */
+  statement: string;
+  /**
+   * A set of values to bind to the statement (optional)
+   */
+  values?: any[];
+}
 export interface capSQLiteImportOptions {
   /**
    * Set the JSON object to import
@@ -1123,16 +1137,13 @@ export interface ISQLiteConnection {
   /**
    * Add the upgrade Statement for database version upgrading
    * @param database
-   * @param toVersion
-   * @param statement
-   * @param set
+   * @param upgrade @since 5.6.4 
    * @returns Promise<void>
    * @since 2.9.0 refactor
    */
   addUpgradeStatement(
     database: string,
-    toVersion: number,
-    statements: string[],
+    upgrade: capSQLiteVersionUpgrade[]
   ): Promise<void>;
   /**
    * Create a connection to a database
@@ -1446,18 +1457,13 @@ export class SQLiteConnection implements ISQLiteConnection {
   }
   async addUpgradeStatement(
     database: string,
-    toVersion: number,
-    statements: string[],
+    upgrade: capSQLiteVersionUpgrade[]
   ): Promise<void> {
-    const upgrade: capSQLiteVersionUpgrade = {
-      toVersion,
-      statements,
-    };
     try {
       if (database.endsWith('.db')) database = database.slice(0, -3);
       await this.sqlite.addUpgradeStatement({
         database,
-        upgrade: [upgrade],
+        upgrade,
       });
       return Promise.resolve();
     } catch (err) {
@@ -2000,7 +2006,7 @@ export interface ISQLiteDBConnection {
    * @since 3.4.0
    */
   executeTransaction(
-    txn: { statement: string; values?: any[] }[],
+    txn: capTask[],
     isSQL92: boolean,
   ): Promise<capSQLiteChanges>;
 }
@@ -2389,30 +2395,29 @@ export class SQLiteDBConnection implements ISQLiteDBConnection {
   }
 
   async executeTransaction(
-    txn: { statement: string; values?: any[] }[],
+    txn: capTask[],
     isSQL92 = true,
   ): Promise<capSQLiteChanges> {
     let changes = 0;
     let isActive = false;
     if (!this.readonly) {
-      try {
-        await this.sqlite.beginTransaction({
-          database: this.dbName,
-        });
-        isActive = await this.sqlite.isTransactionActive({
-          database: this.dbName,
-        });
-        if (!isActive) {
-          return Promise.reject(
-            'After Begin Transaction, no transaction active',
-          );
-        }
-      } catch (err) {
-        return Promise.reject(err);
+      await this.sqlite.beginTransaction({
+        database: this.dbName,
+      });
+      isActive = await this.sqlite.isTransactionActive({
+        database: this.dbName,
+      });
+      if (!isActive) {
+        return Promise.reject(
+          'After Begin Transaction, no transaction active',
+        );
       }
       try {
         for (const task of txn) {
-          if (task.values && task.values.length > 0) {
+          if(typeof task !== 'object' || !('statement' in task)) {
+            throw new Error('Error a task.statement must be provided');
+          }
+          if ('values' in task && task.values && task.values.length > 0) {
             const retMode = task.statement.toUpperCase().includes('RETURNING')
               ? 'all'
               : 'no';
@@ -2436,36 +2441,25 @@ export class SQLiteDBConnection implements ISQLiteDBConnection {
               transaction: false,
               readonly: false,
             });
-            isActive = await this.sqlite.isTransactionActive({
-              database: this.dbName,
-            });
             if (ret.changes.changes < 0) {
               throw new Error('Error in transaction method execute ');
             }
             changes += ret.changes.changes;
           }
         }
-        isActive = await this.sqlite.isTransactionActive({
+        // commit
+        const retC = await this.sqlite.commitTransaction({
           database: this.dbName,
         });
-        if (isActive) {
-          const retC = await this.sqlite.commitTransaction({
-            database: this.dbName,
-          });
-          changes += retC.changes.changes;
-        }
+        changes += retC.changes.changes;
         const retChanges = { changes: { changes: changes } };
         return Promise.resolve(retChanges);
       } catch (err: any) {
+        // rollback
         const msg = err.message ? err.message : err;
-        isActive = await this.sqlite.isTransactionActive({
+        await this.sqlite.rollbackTransaction({
           database: this.dbName,
         });
-        if (isActive) {
-          await this.sqlite.rollbackTransaction({
-            database: this.dbName,
-          });
-        }
         return Promise.reject(msg);
       }
     } else {

package/src/web.ts

@@ -45,48 +45,48 @@ export class CapacitorSQLiteWeb
   private isWebStoreOpen = false;
 
   async initWebStore(): Promise<void> {
-    await customElements.whenDefined('jeep-sqlite');
-
-    this.jeepSqliteElement = document.querySelector('jeep-sqlite');
-
-    this.ensureJeepSqliteIsAvailable();
-
-    this.jeepSqliteElement.addEventListener(
-      'jeepSqliteImportProgress',
-      (event: CustomEvent) => {
-        this.notifyListeners('sqliteImportProgressEvent', event.detail);
-      },
-    );
-    this.jeepSqliteElement.addEventListener(
-      'jeepSqliteExportProgress',
-      (event: CustomEvent) => {
-        this.notifyListeners('sqliteExportProgressEvent', event.detail);
-      },
-    );
-    this.jeepSqliteElement.addEventListener(
-      'jeepSqliteHTTPRequestEnded',
-      (event: CustomEvent) => {
-        this.notifyListeners('sqliteHTTPRequestEndedEvent', event.detail);
-      },
-    );
-    this.jeepSqliteElement.addEventListener(
-      'jeepSqlitePickDatabaseEnded',
-      (event: CustomEvent) => {
-        this.notifyListeners('sqlitePickDatabaseEndedEvent', event.detail);
-      },
-    );
-    this.jeepSqliteElement.addEventListener(
-      'jeepSqliteSaveDatabaseToDisk',
-      (event: CustomEvent) => {
-        this.notifyListeners('sqliteSaveDatabaseToDiskEvent', event.detail);
-      },
-    );
+    customElements.whenDefined('jeep-sqlite').then(async () => {
 
-    if (!this.isWebStoreOpen) {
-      this.isWebStoreOpen = await this.jeepSqliteElement.isStoreOpen();
-    }
+      this.jeepSqliteElement = document.querySelector('jeep-sqlite');
+      this.ensureJeepSqliteIsAvailable();
 
-    return;
+      this.jeepSqliteElement.addEventListener(
+        'jeepSqliteImportProgress',
+        (event: CustomEvent) => {
+          this.notifyListeners('sqliteImportProgressEvent', event.detail);
+        },
+      );
+      this.jeepSqliteElement.addEventListener(
+        'jeepSqliteExportProgress',
+        (event: CustomEvent) => {
+          this.notifyListeners('sqliteExportProgressEvent', event.detail);
+        },
+      );
+      this.jeepSqliteElement.addEventListener(
+        'jeepSqliteHTTPRequestEnded',
+        (event: CustomEvent) => {
+          this.notifyListeners('sqliteHTTPRequestEndedEvent', event.detail);
+        },
+      );
+      this.jeepSqliteElement.addEventListener(
+        'jeepSqlitePickDatabaseEnded',
+        (event: CustomEvent) => {
+          this.notifyListeners('sqlitePickDatabaseEndedEvent', event.detail);
+        },
+      );
+      this.jeepSqliteElement.addEventListener(
+        'jeepSqliteSaveDatabaseToDisk',
+        (event: CustomEvent) => {
+          this.notifyListeners('sqliteSaveDatabaseToDiskEvent', event.detail);
+        },
+      );
+
+      if (!this.isWebStoreOpen) {
+        this.isWebStoreOpen = await this.jeepSqliteElement.isStoreOpen();
+      }
+
+      return;
+    });
   }
 
   async saveToStore(options: capSQLiteOptions): Promise<void> {