diff --git a/CHANGELOG.md b/CHANGELOG.md index d228b08f..724f8849 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,15 @@ +# 5.5.1-1 (2023-12-15) + +### Chore + + - Update to @capacitor/core@5.5.1 + - Update to @capacitor/ios@5.5.1 + - Update to @capacitor/android@5.5.1 + +### Bug Fixes + + - Fix importFromJson on android fails to build SQL Statement with ' in values. issue#492 + # 5.5.0 (2023-12-13) ### Chore diff --git a/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 7c38d47a..2757fc1d 100644 Binary files a/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/android/src/main/java/com/getcapacitor/community/database/sqlite/SQLite/ImportExportJson/ImportFromJson.java b/android/src/main/java/com/getcapacitor/community/database/sqlite/SQLite/ImportExportJson/ImportFromJson.java index 060603b5..327d20e4 100644 --- a/android/src/main/java/com/getcapacitor/community/database/sqlite/SQLite/ImportExportJson/ImportFromJson.java +++ b/android/src/main/java/com/getcapacitor/community/database/sqlite/SQLite/ImportExportJson/ImportFromJson.java @@ -458,9 +458,12 @@ private JSONObject generateInsertAndDeletedStrings(ArrayList tColNames, String formattedRow = null; formattedRow = String.join(", ", rowIndex.stream().map(item -> { if (item instanceof String) { - StringBuilder formattedValue = new StringBuilder(); - formattedValue.append('"').append(item).append('"'); - return formattedValue.toString(); + String val = (String) item; + String rVal = val; + if(val.contains("'")) { + rVal = val.replace("'","''"); + } + return "'" + rVal + "'"; } else { return item.toString(); } @@ -474,7 +477,12 @@ private JSONObject generateInsertAndDeletedStrings(ArrayList tColNames, } Object item = rowIndex.get(i); if (item instanceof String) { - formattedRow.append('"').append(item).append('"'); + String val = (String) item; + String rVal = val; + if(val.contains("'")) { + rVal = val.replace("'","''"); + } + formattedRow.append("'").append(rVal).append("'"); } else { formattedRow.append(item); } diff --git a/package-lock.json b/package-lock.json index 3c5d0687..1d89cd5e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,11 +12,11 @@ "jeep-sqlite": "^2.5.4" }, "devDependencies": { - "@capacitor/android": "^5.5.0", - "@capacitor/cli": "^5.5.0", - "@capacitor/core": "^5.5.0", + "@capacitor/android": "^5.5.1", + "@capacitor/cli": "^5.5.1", + "@capacitor/core": "^5.5.1", "@capacitor/docgen": "^0.0.17", - "@capacitor/ios": "^5.5.0", + "@capacitor/ios": "^5.5.1", "@ionic/eslint-config": "^0.3.0", "@ionic/prettier-config": "^1.0.1", "@ionic/swiftlint-config": "^1.1.2", @@ -150,18 +150,18 @@ } }, "node_modules/@capacitor/android": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/@capacitor/android/-/android-5.5.0.tgz", - "integrity": "sha512-ipJijb3M0FA6DvotS9zrbJ8p/mTEVg9EVtBmvUexogm8g5se1mc7i1gvOr3MQ/iTZ3PnNrRC/P7kHxa2R55iqg==", + "version": "5.5.1", + "resolved": "https://registry.npmjs.org/@capacitor/android/-/android-5.5.1.tgz", + "integrity": "sha512-WTnPnpaEvTtaEtTNRbh06Y1afF7A4plY/4uajAL0WW8tdR1FxieadF357yKGiAT6CudI/B+eOu6rxn6qWuphKg==", "dev": true, "peerDependencies": { "@capacitor/core": "^5.5.0" } }, "node_modules/@capacitor/cli": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/@capacitor/cli/-/cli-5.5.0.tgz", - "integrity": "sha512-JkF7p+EV1mEFObp3e/3snKZiiDPbHTAXlch9jKcvvuCjm92Be7ka8sG4M3fH8BPajSE3jRNPZa/xt7bITDvAAA==", + "version": "5.5.1", + "resolved": "https://registry.npmjs.org/@capacitor/cli/-/cli-5.5.1.tgz", + "integrity": "sha512-/oGd2IIc+k1H/fc7tUzP7vqMtZi0gNcJ4/4wUE2kzAnETxxxHXMM/2V62KfjCby/OOAzJbtI7n5OPlnWE9un1A==", "dev": true, "dependencies": { "@ionic/cli-framework-output": "^2.2.5", @@ -260,9 +260,9 @@ } }, "node_modules/@capacitor/core": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/@capacitor/core/-/core-5.5.0.tgz", - "integrity": "sha512-w59io0ctwnb7JRng7yO2H0YLHG8uz7XARUugRfp5aYTNiG55FqdSmSMOOqGCMPRg4sEnKjJTvAa4ImCYh3Kk1w==", + "version": "5.5.1", + "resolved": "https://registry.npmjs.org/@capacitor/core/-/core-5.5.1.tgz", + "integrity": "sha512-VG6Iv8Q7ZAbvjodxpvjcSe0jfxUwZXnvjbi93ehuJ6eYP8U926qLSXyrT/DToZq+F6v/HyGyVgn3mrE/9jW2Tg==", "dev": true, "dependencies": { "tslib": "^2.1.0" @@ -301,9 +301,9 @@ } }, "node_modules/@capacitor/ios": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/@capacitor/ios/-/ios-5.5.0.tgz", - "integrity": "sha512-kApjblUOlLY91+1OrWIx+vaVfEN1bl1kh1jSgK1/IdGfS9kFs1hxUE/okRoLJGT6tYeSOa6GA/19MLOs64wb6A==", + "version": "5.5.1", + "resolved": "https://registry.npmjs.org/@capacitor/ios/-/ios-5.5.1.tgz", + "integrity": "sha512-h00qt8u32t8eEbIkuG4IjR0r34YZC0sIXglDH8fRDdA84xDkTybmz3WtdpRWDzh6ukE2RIY7rmD7p410WSJ2yA==", "dev": true, "peerDependencies": { "@capacitor/core": "^5.5.0" diff --git a/package.json b/package.json index d55cd4c4..07e33bea 100644 --- a/package.json +++ b/package.json @@ -59,11 +59,11 @@ "prepublishOnly": "npm run build && npm run build-electron && npm run docgen" }, "devDependencies": { - "@capacitor/android": "^5.5.0", - "@capacitor/cli": "^5.5.0", - "@capacitor/core": "^5.5.0", + "@capacitor/android": "^5.5.1", + "@capacitor/cli": "^5.5.1", + "@capacitor/core": "^5.5.1", "@capacitor/docgen": "^0.0.17", - "@capacitor/ios": "^5.5.0", + "@capacitor/ios": "^5.5.1", "@ionic/eslint-config": "^0.3.0", "@ionic/prettier-config": "^1.0.1", "@ionic/swiftlint-config": "^1.1.2",