@capacitor-community/sqlite 6.0.1 → 6.0.2-dev.ecc62b3.1738008093

package/android/src/main/java/com/getcapacitor/community/database/sqlite/SQLite/ImportExportJson/ImportFromJson.java

@@ -12,7 +12,6 @@ import com.getcapacitor.community.database.sqlite.SQLite.UtilsSQLite;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
-
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -166,8 +165,11 @@ public class ImportFromJson {
         for (int j = 0; j < mSchema.size(); j++) {
             if (j == mSchema.size() - 1) {
                 if (mSchema.get(j).getColumn() != null) {
-                    stmt =
-                        new StringBuilder(stmt).append(mSchema.get(j).getColumn()).append(" ").append(mSchema.get(j).getValue()).toString();
+                    stmt = new StringBuilder(stmt)
+                        .append(mSchema.get(j).getColumn())
+                        .append(" ")
+                        .append(mSchema.get(j).getValue())
+                        .toString();
                     if (mSchema.get(j).getColumn().equals("last_modified")) {
                         isLastModified = true;
                     }
@@ -175,31 +177,28 @@ public class ImportFromJson {
                         isSqlDeleted = true;
                     }
                 } else if (mSchema.get(j).getForeignkey() != null) {
-                    stmt =
-                        new StringBuilder(stmt)
-                            .append("FOREIGN KEY (")
-                            .append(mSchema.get(j).getForeignkey())
-                            .append(") ")
-                            .append(mSchema.get(j).getValue())
-                            .toString();
+                    stmt = new StringBuilder(stmt)
+                        .append("FOREIGN KEY (")
+                        .append(mSchema.get(j).getForeignkey())
+                        .append(") ")
+                        .append(mSchema.get(j).getValue())
+                        .toString();
                 } else if (mSchema.get(j).getConstraint() != null) {
-                    stmt =
-                        new StringBuilder(stmt)
-                            .append("CONSTRAINT ")
-                            .append(mSchema.get(j).getConstraint())
-                            .append(" ")
-                            .append(mSchema.get(j).getValue())
-                            .toString();
+                    stmt = new StringBuilder(stmt)
+                        .append("CONSTRAINT ")
+                        .append(mSchema.get(j).getConstraint())
+                        .append(" ")
+                        .append(mSchema.get(j).getValue())
+                        .toString();
                 }
             } else {
                 if (mSchema.get(j).getColumn() != null) {
-                    stmt =
-                        new StringBuilder(stmt)
-                            .append(mSchema.get(j).getColumn())
-                            .append(" ")
-                            .append(mSchema.get(j).getValue())
-                            .append(",")
-                            .toString();
+                    stmt = new StringBuilder(stmt)
+                        .append(mSchema.get(j).getColumn())
+                        .append(" ")
+                        .append(mSchema.get(j).getValue())
+                        .append(",")
+                        .toString();
                     if (mSchema.get(j).getColumn().equals("last_modified")) {
                         isLastModified = true;
                     }
@@ -207,23 +206,21 @@ public class ImportFromJson {
                         isSqlDeleted = true;
                     }
                 } else if (mSchema.get(j).getForeignkey() != null) {
-                    stmt =
-                        new StringBuilder(stmt)
-                            .append("FOREIGN KEY (")
-                            .append(mSchema.get(j).getForeignkey())
-                            .append(") ")
-                            .append(mSchema.get(j).getValue())
-                            .append(",")
-                            .toString();
+                    stmt = new StringBuilder(stmt)
+                        .append("FOREIGN KEY (")
+                        .append(mSchema.get(j).getForeignkey())
+                        .append(") ")
+                        .append(mSchema.get(j).getValue())
+                        .append(",")
+                        .toString();
                 } else if (mSchema.get(j).getConstraint() != null) {
-                    stmt =
-                        new StringBuilder(stmt)
-                            .append("CONSTRAINT ")
-                            .append(mSchema.get(j).getConstraint())
-                            .append(" ")
-                            .append(mSchema.get(j).getValue())
-                            .append(",")
-                            .toString();
+                    stmt = new StringBuilder(stmt)
+                        .append("CONSTRAINT ")
+                        .append(mSchema.get(j).getConstraint())
+                        .append(" ")
+                        .append(mSchema.get(j).getValue())
+                        .append(",")
+                        .toString();
                 }
             }
         }
@@ -397,10 +394,10 @@ public class ImportFromJson {
             }
             if (isBlob(tColTypes)) {
                 // Old process flow
-                oldProcessFow(mDb, values, tableName,tColNames, tColTypes, mode);
+                oldProcessFow(mDb, values, tableName, tColNames, tColTypes, mode);
             } else {
                 // New process flow
-                newProcessFlow(mDb, values, tableName,tColNames);
+                newProcessFlow(mDb, values, tableName, tColNames);
             }
         } catch (JSONException e) {
             throw new Exception("CreateTableData: " + e.getMessage());
@@ -420,13 +417,17 @@ public class ImportFromJson {
      * @param mode
      * @throws Exception
      */
-    private void oldProcessFow( Database mDb, ArrayList<ArrayList<Object>> values,
-                                String tableName, ArrayList<String> tColNames,
-                                ArrayList<String> tColTypes, String mode) throws Exception {
+    private void oldProcessFow(
+        Database mDb,
+        ArrayList<ArrayList<Object>> values,
+        String tableName,
+        ArrayList<String> tColNames,
+        ArrayList<String> tColTypes,
+        String mode
+    ) throws Exception {
         try {
             // Loop on table's value
             for (int j = 0; j < values.size(); j++) {
-
                 // Check the row number of columns
                 ArrayList<Object> row = createRowValues(values.get(j));
                 //
@@ -452,8 +453,8 @@ public class ImportFromJson {
             throw new Exception("oldProcessFlow: " + e.getMessage());
         }
     }
-    private ArrayList<Object> createRowValues(ArrayList<Object> row )
-                                                throws Exception {
+
+    private ArrayList<Object> createRowValues(ArrayList<Object> row) throws Exception {
         try {
             // Iterate over the ArrayList and check for JSONArray objects
             for (int i = 0; i < row.size(); i++) {
@@ -472,6 +473,7 @@ public class ImportFromJson {
             throw new Exception("createRowValues: " + e.getMessage());
         }
     }
+
     private byte[] jsonArrayToByteArray(JSONArray jsonArray) throws JSONException {
         byte[] byteArray = new byte[jsonArray.length()];
         for (int i = 0; i < jsonArray.length(); i++) {
@@ -488,21 +490,21 @@ public class ImportFromJson {
      * @param tColNames
      * @throws Exception
      */
-    private void newProcessFlow(Database mDb, ArrayList<ArrayList<Object>> values,
-                                String tableName, ArrayList<String> tColNames) throws Exception {
+    private void newProcessFlow(Database mDb, ArrayList<ArrayList<Object>> values, String tableName, ArrayList<String> tColNames)
+        throws Exception {
         try {
             JSONObject retObjStrs = generateInsertAndDeletedStrings(tColNames, values);
             // Create the statement for INSERT
             String namesString = _uJson.convertToString(tColNames, ',');
             if (retObjStrs.has("insert")) {
                 String stmtInsert = new StringBuilder("INSERT OR REPLACE INTO ")
-                        .append(tableName)
-                        .append("(")
-                        .append(namesString)
-                        .append(") ")
-                        .append(retObjStrs.get("insert"))
-                        .append(";")
-                        .toString();
+                    .append(tableName)
+                    .append("(")
+                    .append(namesString)
+                    .append(") ")
+                    .append(retObjStrs.get("insert"))
+                    .append(";")
+                    .toString();
                 JSObject retObj = mDb.prepareSQL(stmtInsert, new ArrayList<>(), true, "no");
                 long lastId = retObj.getLong("lastId");
                 if (lastId < 0) {
@@ -511,13 +513,13 @@ public class ImportFromJson {
             }
             if (retObjStrs.has("delete")) {
                 String stmtDelete = new StringBuilder("DELETE FROM ")
-                        .append(tableName)
-                        .append(" WHERE ")
-                        .append(tColNames.get(0))
-                        .append(" ")
-                        .append(retObjStrs.get("delete"))
-                        .append(";")
-                        .toString();
+                    .append(tableName)
+                    .append(" WHERE ")
+                    .append(tColNames.get(0))
+                    .append(" ")
+                    .append(retObjStrs.get("delete"))
+                    .append(";")
+                    .toString();
                 JSObject retObj = mDb.prepareSQL(stmtDelete, new ArrayList<>(), true, "no");
                 long lastId = retObj.getLong("lastId");
                 if (lastId < 0) {
@@ -546,6 +548,7 @@ public class ImportFromJson {
         }
         return containsBlob;
     }
+
     /**
      * Create the Row Statement to load the data
      * @param mDb
@@ -558,13 +561,13 @@ public class ImportFromJson {
      * @return
      */
     private String createRowStatement(
-            Database mDb,
-            ArrayList<String> tColNames,
-            ArrayList<String> tColTypes,
-            ArrayList<Object> row,
-            int j,
-            String tableName,
-            String mode
+        Database mDb,
+        ArrayList<String> tColNames,
+        ArrayList<String> tColTypes,
+        ArrayList<Object> row,
+        int j,
+        String tableName,
+        String mode
     ) throws Exception {
         String msg = "CreateRowStatement: ";
         msg += "Table" + tableName + " values row";
@@ -582,16 +585,15 @@ public class ImportFromJson {
             if (questionMarkString.length() == 0) {
                 throw new Exception(msg + j + "questionMarkString is empty");
             }
-            stmt =
-                    new StringBuilder("INSERT INTO ")
-                            .append(tableName)
-                            .append("(")
-                            .append(namesString)
-                            .append(")")
-                            .append(" VALUES (")
-                            .append(questionMarkString)
-                            .append(");")
-                            .toString();
+            stmt = new StringBuilder("INSERT INTO ")
+                .append(tableName)
+                .append("(")
+                .append(namesString)
+                .append(")")
+                .append(" VALUES (")
+                .append(questionMarkString)
+                .append(");")
+                .toString();
         } else {
             Boolean isUpdate = true;
             Integer idxDelete = tColNames.indexOf("sql_deleted");
@@ -601,10 +603,10 @@ public class ImportFromJson {
                     isUpdate = false;
                     Object key = tColNames.get(0);
                     StringBuilder sbQuery = new StringBuilder("DELETE FROM ")
-                            .append(tableName)
-                            .append(" WHERE ")
-                            .append(tColNames.get(0))
-                            .append(" = ");
+                        .append(tableName)
+                        .append(" WHERE ")
+                        .append(tColNames.get(0))
+                        .append(" = ");
 
                     if (key instanceof Integer) sbQuery.append(row.get(0)).append(";");
                     if (key instanceof String) sbQuery.append("'").append(row.get(0)).append("';");
@@ -619,12 +621,12 @@ public class ImportFromJson {
                 }
                 Object key = tColNames.get(0);
                 StringBuilder sbQuery = new StringBuilder("UPDATE ")
-                        .append(tableName)
-                        .append(" SET ")
-                        .append(setString)
-                        .append(" WHERE ")
-                        .append(tColNames.get(0))
-                        .append(" = ");
+                    .append(tableName)
+                    .append(" SET ")
+                    .append(setString)
+                    .append(" WHERE ")
+                    .append(tColNames.get(0))
+                    .append(" = ");
 
                 if (key instanceof Integer) sbQuery.append(row.get(0)).append(";");
                 if (key instanceof String) sbQuery.append("'").append(row.get(0)).append("';");
@@ -646,12 +648,12 @@ public class ImportFromJson {
      * @throws Exception
      */
     private Boolean checkUpdate(
-            Database mDb,
-            String stmt,
-            ArrayList<Object> values,
-            String tableName,
-            ArrayList<String> tColNames,
-            ArrayList<String> tColTypes
+        Database mDb,
+        String stmt,
+        ArrayList<Object> values,
+        String tableName,
+        ArrayList<String> tColNames,
+        ArrayList<String> tColTypes
     ) throws Exception {
         Boolean isRun = true;
         if (stmt.substring(0, 6).equals("UPDATE")) {
@@ -677,6 +679,7 @@ public class ImportFromJson {
         }
         return isRun;
     }
+
     /**
      * Check Values
      * @param values
@@ -735,27 +738,24 @@ public class ImportFromJson {
             if (colIndex == -1 || (int) rowIndex.get(colIndex) == 0) {
                 if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N) {
                     String formattedRow = null;
-                    formattedRow =
-                        String.join(
-                            ", ",
-                            rowIndex
-                                .stream()
-                                .map(
-                                    item -> {
-                                        if (item instanceof String) {
-                                            String val = (String) item;
-                                            String rVal = val;
-                                            if (val.contains("'")) {
-                                                rVal = val.replace("'", "''");
-                                            }
-                                            return "'" + rVal + "'";
-                                        } else {
-                                            return item.toString();
-                                        }
+                    formattedRow = String.join(
+                        ", ",
+                        rowIndex
+                            .stream()
+                            .map(item -> {
+                                if (item instanceof String) {
+                                    String val = (String) item;
+                                    String rVal = val;
+                                    if (val.contains("'")) {
+                                        rVal = val.replace("'", "''");
                                     }
-                                )
-                                .toArray(String[]::new)
-                        );
+                                    return "'" + rVal + "'";
+                                } else {
+                                    return item.toString();
+                                }
+                            })
+                            .toArray(String[]::new)
+                    );
                     insertValues.append("(").append(formattedRow).append("), ");
                 } else {
                     StringBuilder formattedRow = new StringBuilder();

package/android/src/main/java/com/getcapacitor/community/database/sqlite/SQLite/UtilsBiometric.java

@@ -79,41 +79,37 @@ public class UtilsBiometric {
      */
     private void setupBiometricPrompt(String biometricTitle, String biometricSubTitle) {
         executor = ContextCompat.getMainExecutor(context);
-        biometricPrompt =
-            new BiometricPrompt(
-                (FragmentActivity) context,
-                executor,
-                new BiometricPrompt.AuthenticationCallback() {
-                    @Override
-                    public void onAuthenticationError(int errorCode, @NonNull CharSequence errString) {
-                        super.onAuthenticationError(errorCode, errString);
-                        Toast.makeText(context, "Authentication error: " + errString, Toast.LENGTH_SHORT).show();
-                        listener.onFailed();
-                    }
+        biometricPrompt = new BiometricPrompt(
+            (FragmentActivity) context,
+            executor,
+            new BiometricPrompt.AuthenticationCallback() {
+                @Override
+                public void onAuthenticationError(int errorCode, @NonNull CharSequence errString) {
+                    super.onAuthenticationError(errorCode, errString);
+                    Toast.makeText(context, "Authentication error: " + errString, Toast.LENGTH_SHORT).show();
+                    listener.onFailed();
+                }
 
-                    @Override
-                    public void onAuthenticationSucceeded(@NonNull BiometricPrompt.AuthenticationResult result) {
-                        super.onAuthenticationSucceeded(result);
-                        listener.onSuccess(result);
-                    }
+                @Override
+                public void onAuthenticationSucceeded(@NonNull BiometricPrompt.AuthenticationResult result) {
+                    super.onAuthenticationSucceeded(result);
+                    listener.onSuccess(result);
+                }
 
-                    @Override
-                    public void onAuthenticationFailed() {
-                        super.onAuthenticationFailed();
-                        Toast.makeText(context, "Authentication failed", Toast.LENGTH_SHORT).show();
-                        listener.onFailed();
-                    }
+                @Override
+                public void onAuthenticationFailed() {
+                    super.onAuthenticationFailed();
+                    Toast.makeText(context, "Authentication failed", Toast.LENGTH_SHORT).show();
+                    listener.onFailed();
                 }
-            );
+            }
+        );
 
         // Create prompt dialog
-        promptInfo =
-            new BiometricPrompt.PromptInfo.Builder()
-                .setTitle(biometricTitle)
-                .setSubtitle(biometricSubTitle)
-                .setAllowedAuthenticators(
-                    BiometricManager.Authenticators.BIOMETRIC_STRONG | BiometricManager.Authenticators.DEVICE_CREDENTIAL
-                )
-                .build();
+        promptInfo = new BiometricPrompt.PromptInfo.Builder()
+            .setTitle(biometricTitle)
+            .setSubtitle(biometricSubTitle)
+            .setAllowedAuthenticators(BiometricManager.Authenticators.BIOMETRIC_STRONG | BiometricManager.Authenticators.DEVICE_CREDENTIAL)
+            .build();
     }
 }

package/android/src/main/java/com/getcapacitor/community/database/sqlite/SQLite/UtilsDownloadFromHTTP.java

@@ -1,17 +1,17 @@
 package com.getcapacitor.community.database.sqlite.SQLite;
 
-import java.net.MalformedURLException;
 import android.content.Context;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
 import java.net.URL;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 import java.net.URLDecoder;
 import java.nio.charset.StandardCharsets;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 public class UtilsDownloadFromHTTP {
 
@@ -20,14 +20,14 @@ public class UtilsDownloadFromHTTP {
     private final UtilsFile _uFile = new UtilsFile();
 
     public void download(Context context, String fileUrl) throws Exception {
-         Boolean isZip = false;
+        Boolean isZip = false;
         String fileName = "";
         try {
             String[] fileDetails = getFileDetails(fileUrl);
             fileName = fileDetails[0];
             String extension = fileDetails[1];
             if (!fileName.contains("SQLite.db")) {
-                switch(extension) {
+                switch (extension) {
                     case "db":
                         fileName = fileName.substring(0, fileName.length() - 3) + "SQLite.db";
                         break;
@@ -38,12 +38,10 @@ public class UtilsDownloadFromHTTP {
                         throw new Exception("Unknown file type. Filename: " + fileName);
                 }
             }
-
         } catch (Exception e) {
             throw new Exception(e.getMessage());
         }
 
-
         File cacheDir = context.getCacheDir();
         String cachePath = cacheDir.getAbsolutePath();
         String tmpFilePath = cachePath + File.separator + fileName;
@@ -75,15 +73,16 @@ public class UtilsDownloadFromHTTP {
             String decodedPath = URLDecoder.decode(path, StandardCharsets.UTF_8.toString()); // Decode URL-encoded path
             String filename = decodedPath.substring(decodedPath.lastIndexOf('/') + 1); // Extract filename from decoded path
             String extension = getFileExtension(filename);
-            if(extension == null) {
+            if (extension == null) {
                 throw new Exception("extension db or zip not found");
             }
-            return new String[]{filename, extension};
+            return new String[] { filename, extension };
         } catch (MalformedURLException e) {
             e.printStackTrace();
             throw new Exception(e.getMessage());
         }
     }
+
     public static String getFileExtension(String filename) {
         Pattern pattern = Pattern.compile("\\.([a-zA-Z0-9]+)(?:[\\?#]|$)");
         Matcher matcher = pattern.matcher(filename);
@@ -94,6 +93,7 @@ public class UtilsDownloadFromHTTP {
 
         return null; // no extension found
     }
+
     public static void downloadFileToCache(String fileURL, String fileName, String cacheDir) throws Exception {
         HttpURLConnection httpConn = null;
         try {
@@ -113,9 +113,10 @@ public class UtilsDownloadFromHTTP {
                 // create temporary file path
                 String tmpFilePath = cacheDir + File.separator + dbName;
                 // opens input stream from the HTTP connection
-                try (InputStream inputStream = httpConn.getInputStream();
-                     FileOutputStream outputStream = new FileOutputStream(tmpFilePath)) {
-
+                try (
+                    InputStream inputStream = httpConn.getInputStream();
+                    FileOutputStream outputStream = new FileOutputStream(tmpFilePath)
+                ) {
                     byte[] buffer = new byte[1024];
                     int bytesRead;
                     while ((bytesRead = inputStream.read(buffer)) != -1) {

package/android/src/main/java/com/getcapacitor/community/database/sqlite/SQLite/UtilsFile.java

@@ -261,7 +261,8 @@ public class UtilsFile {
     }
 
     public String getFileExtension(String name) {
-        if (name.lastIndexOf(".") != -1 && name.lastIndexOf(".") != 0) return name.substring(name.lastIndexOf(".") + 1); else return "";
+        if (name.lastIndexOf(".") != -1 && name.lastIndexOf(".") != 0) return name.substring(name.lastIndexOf(".") + 1);
+        else return "";
     }
 
     public Boolean restoreDatabase(Context context, String databaseName) {

package/dist/esm/definitions.js

@@ -850,9 +850,7 @@ export class SQLiteDBConnection {
                         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';
+                        const retMode = task.statement.toUpperCase().includes('RETURNING') ? 'all' : 'no';
                         const ret = await this.sqlite.run({
                             database: this.dbName,
                             statement: task.statement,