Merge tag '0.1.11'

# Conflicts: # package.json # plugin.xml # src/android/sqlcipher/libs/armeabi-v7a/libsqlcipher.so # src/android/sqlcipher/libs/armeabi/libsqlcipher.so # src/android/sqlcipher/libs/sqlcipher.jar # src/android/sqlcipher/libs/x86/libsqlcipher.so
usernuno · Dec 13, 2018 · d1e2eef · d1e2eef
2 parents 36ca346 + 313592d
commit d1e2eef
Show file tree

Hide file tree

Showing 82 changed files with 40,524 additions and 15,563 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,8 @@
 .DS_Store
-.plugin
 .metadata/*
 *.swp
 *~
+node_modules
+spec/myplugin
+spec/plugins
+spec/platforms
diff --git a/.travis.yml b/.travis.yml
@@ -10,10 +10,10 @@ git:
   depth: 2
 
 node_js:
-  - "4.4"
+  - "4.6"
 
 install:
-  - echo -e "Host github.com\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config 
+  - echo -e "Host github.com\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config
   - npm install -g cordova-paramedic
   - npm install -g cordova
   - npm install -g ios-sim
@@ -22,8 +22,17 @@ script:
   - date && cordova-paramedic --platform ios --plugin ${TRAVIS_BUILD_DIR} || echo error-ignored
   - date && cp ${SPEC_WWW_DIR}/spec/self-test.js ${TESTS_PATH} && ${CORDOVA_PARAMEDIC_CMD}
   - date && cp ${SPEC_WWW_DIR}/spec/db-tx-string-test.js ${TESTS_PATH} && ${CORDOVA_PARAMEDIC_CMD}
-  - date && cp ${SPEC_WWW_DIR}/spec/regexp-test.js ${TESTS_PATH} && ${CORDOVA_PARAMEDIC_CMD}
   - date && cp ${SPEC_WWW_DIR}/spec/cipher.js ${TESTS_PATH} && ${CORDOVA_PARAMEDIC_CMD}
-  - date && cp ${SPEC_WWW_DIR}/spec/basic-sql-tx-test.js ${TESTS_PATH} && ${CORDOVA_PARAMEDIC_CMD}
+  - date && cp ${SPEC_WWW_DIR}/spec/db-tx-sql-select-value-test.js ${TESTS_PATH} && ${CORDOVA_PARAMEDIC_CMD}
+  - date && cp ${SPEC_WWW_DIR}/spec/basic-db-tx-sql-storage-results.js ${TESTS_PATH} && ${CORDOVA_PARAMEDIC_CMD}
+  - date && cp ${SPEC_WWW_DIR}/spec/db-sql-operations-test.js ${TESTS_PATH} && ${CORDOVA_PARAMEDIC_CMD}
   - date && cp ${SPEC_WWW_DIR}/spec/sql-batch-test.js ${TESTS_PATH} && ${CORDOVA_PARAMEDIC_CMD}
+  - date && cp ${SPEC_WWW_DIR}/spec/db-tx-sql-features-test.js ${TESTS_PATH} && ${CORDOVA_PARAMEDIC_CMD}
+  - date && cp ${SPEC_WWW_DIR}/spec/regexp-test.js ${TESTS_PATH} && ${CORDOVA_PARAMEDIC_CMD}
+  - date && cp ${SPEC_WWW_DIR}/spec/db-simultaneous-tx-access-test.js ${TESTS_PATH} && ${CORDOVA_PARAMEDIC_CMD}
+  - date && cp ${SPEC_WWW_DIR}/spec/db-tx-multiple-update-test.js ${TESTS_PATH} && ${CORDOVA_PARAMEDIC_CMD}
+  - date && cp ${SPEC_WWW_DIR}/spec/tx-semantics-test.js ${TESTS_PATH} && ${CORDOVA_PARAMEDIC_CMD}
+  - date && cp ${SPEC_WWW_DIR}/spec/db-tx-error-handling-test.js ${TESTS_PATH} && ${CORDOVA_PARAMEDIC_CMD}
+  - date && cp ${SPEC_WWW_DIR}/spec/db-tx-value-bindings-test.js ${TESTS_PATH} && ${CORDOVA_PARAMEDIC_CMD}
+  - date && cp ${SPEC_WWW_DIR}/spec/db-tx-error-mapping-test.js ${TESTS_PATH} && ${CORDOVA_PARAMEDIC_CMD}
   - date
diff --git a/AUTHORS.md b/AUTHORS.md
@@ -16,7 +16,7 @@
 - Fixes to support old Android versions by @nolanlawson
 - Thanks to Mark Oppenheim <[email protected]> for fixes to open/close callbacks and repeated open/close/delete operations
 
-## iOS version
+## iOS/macOS version
 
 - Original authors: @davibe (Davide Bertola <[email protected]>) and @joenoon (Joe Noon <[email protected]>)
 - Cordova 2.7+ port with background processing by @j3k0 (Jean-Christophe Hoelt <[email protected]>)

diff --git a/CHANGES.md b/CHANGES.md
@@ -1,5 +1,168 @@
 # Changes
 
+## cordova-sqlcipher-adapter 0.1.11
+
+##### cordova-sqlite-legacy-core 1.0.6
+
+###### cordova-sqlite-legacy-express-core 1.0.4
+
+- Cleaned up workaround solution to BUG 666: close db before opening (ignore close error)
+- android.database end transaction if active before closing
+
+##### cordova-sqlite-legacy-core 1.0.5
+
+###### cordova-sqlite-legacy-express-core 1.0.3
+
+- Resolve Java 6/7/8 concurrent map compatibility issue reported in litehelpers/Cordova-sqlite-storage#726, THANKS to pointer by @NeoLSN (Jason Yang/楊朝傑) in litehelpers/Cordova-sqlite-storage#727.
+- selfTest database cleanup do not ignore close or delete error on any platforms
+
+## cordova-sqlcipher-adapter 0.1.10
+
+- Windows 8.1 and Windows Phone 8.1 supported again, NOW DEPRECATED
+
+##### cordova-sqlite-legacy-core 1.0.4
+
+- New workaround solution to BUG 666: close db before opening (ignore close error)
+
+##### cordova-sqlite-legacy-core 1.0.3
+
+- Suppress warnings when building sqlite3.c & PSPDFThreadSafeMutableDictionary.m on iOS/macOS
+
+##### cordova-sqlite-legacy-core 1.0.2
+
+- Fix log in case of transaction waiting for open to finish; doc fixes
+- SQLite 3.15.2 build with SQLITE_THREADSAFE=2 on iOS/macOS (SQLITE_THREADSAFE=1 on Android/Windows) and other flag fixes in this version branch to avoid possible malformed database due to multithreaded access ref: litehelpers/Cordova-sqlite-storage#703
+- Windows 10 (UWP) build with /SAFESEH flag on Win32 (x86) target
+
+###### cordova-sqlite-legacy-express-core 1.0.2
+
+- Use PSPDFThreadSafeMutableDictionary for iOS/macOS to avoid threading issue ref: litehelpers/Cordova-sqlite-storage#716
+
+###### cordova-sqlite-legacy-express-core 1.0.1
+
+- Fix bug 666 workaround to trigger ROLLBACK in the next event tick (needed to support version with pre-populated database on Windows)
+
+###### cordova-sqlite-legacy-express-core 1.0.0
+
+- Workaround solution to BUG litehelpers/Cordova-sqlite-storage#666 (hanging transaction in case of location reload/change)
+- selfTest simulate scenario & test solution to BUG litehelpers/Cordova-sqlite-storage#666 (also includes string test and test of effects of location reload/change in this version branch, along with another internal check)
+- Drop engine constraints in package.json & plugin.xml (in this version branch)
+- Remove Lawnchair adapter from this version branch
+- Support macOS platform with builtin libsqlite3.dylib framework in this version branch
+
+## cordova-sqlcipher-adapter 0.1.9
+
+- SQLCipher 3.4.1, SQLCipher for Android 3.5.6
+- Build flag fixes
+- minor test fixes
+- certain array and object tests disabled in this version branch due to testing issues on iOS with WKWebView
+- doc fixes
+
+### cordova-sqlite-storage 1.5.4
+
+- Fix iOS/macOS version to report undefined insertId in case INSERT OR IGNORE is ignored
+- Fix FIRST_WORD check for android.sqlite.database implementation
+- SQLite 3.15.2 build fixes
+- Doc updates
+
+### cordova-sqlite-storage 1.5.3
+
+- Fix merges to prevent possible conflicts with other plugins (Windows)
+- Fix handling of undefined SQL argument values (Windows)
+- Signal error in case of a failure opening the database file (iOS/macOS)
+- Doc fixes and updates
+
+### cordova-sqlite-storage 1.5.2
+
+- Check transaction callback functions to avoid crash on Windows
+- Fix echoTest callback handling
+- Fix openDatabase/deleteDatabase exception messages
+- Move Lawnchair adapter to a separate project
+- Doc updates
+
+### cordova-sqlite-storage 1.5.1
+
+- Minor test fixes
+
+### cordova-sqlite-storage 1.5.0
+
+- Drop support for Windows 8.1 & Windows Phone 8.1
+
+### cordova-sqlite-storage 1.4.9
+
+- Minor JavaScript fix (generated by CoffeeScript 1.11.1)
+- Update test due to issue with u2028/u2029 on cordova-android 6.0.0
+- doc fixes
+- Cleanup plugin.xml: remove old engine constraint that was already commented out
+- Fix LICENSE.md
+
+## cordova-sqlcipher-adapter 0.1.8
+
+- Android version with android-database-sqlcipher 3.5.4
+
+### cordova-sqlite-storage 1.4.8
+
+- selfTest function add string test and test of effects of location reload/change
+- Support macOS ("osx" platform)
+- Signal an error in case of SQL with too many parameter argument values on iOS (in addition to Android & Windows)
+- Include proper SQL error code on Android (in certain cases)
+- Fix reporting of SQL statement execution errors in Windows version
+- Fix Windows version to report errors with a valid error code (0)
+- Some doc fixes
+
+### cordova-sqlite-storage 1.4.7
+
+- Minor JavaScript fixes to pass @brodybits/Cordova-sql-test-app
+
+### cordova-sqlite-storage 1.4.6
+
+- Stop remaining transaction callback in case of an error with no error handler returning false
+- Expand selfTest function to cover CRUD with unique record keys
+- Fix readTransaction to reject ALTER, REINDEX, and REPLACE operations
+- Fix Windows 10 ARM Release Build of SQLite3 by disabling SDL check (ARM Release only)
+- Fix Windows 8.1/Windows Phone 8.1 Release Build of SQLite3 by disabling SDL check
+- Some documentation fixes
+
+### cordova-sqlite-storage 1.4.5
+
+- Log/error message fixes; remove extra qid from internal JSON interface
+
+### cordova-sqlite-storage 1.4.4
+
+- Fix readTransaction to reject modification statements with extra semicolon(s) in the beginning
+- Announce new Cordova-sqlite-evcore-extbuild-free version
+- Additional tests
+- Other doc fixes
+
+### cordova-sqlite-storage 1.4.3
+
+- Handle executeSql with object sql value (solves another possible crash on iOS)
+
+### cordova-sqlite-storage 1.4.2
+
+- Fix sqlitePlugin.openDatabase and sqlitePlugin.deleteDatabase to check location/iosDatabaseLocation values
+- Fix sqlitePlugin.deleteDatabase to check that db name is really a string (prevents possible crash on iOS)
+- Fix iOS version to use DLog macro to remove extra logging from release build
+- Fix Lawnchair adapter to use new mandatory "location" parameter
+- Remove special handling of Blob parameters, use toString for all non-value parameter objects
+- Minor cleanup of Android version code
+
+### cordova-sqlite-storage 1.4.1
+
+- Minimum Cordova version no longer enforced in this version
+
+### cordova-sqlite-storage 1.4.0
+
+- Now using cordova-sqlite-storage-dependencies for SQLite 3.8.10.2 Android/iOS/Windows
+- Android-sqlite-connector implementation supported by this version again
+- Enforce minimum cordova-windows version (should be OK in Cordova 6.x)
+- Support Windows 10 along with Windows 8.1/Windows Phone 8.1
+
+### cordova-sqlite-storage 1.2.2
+
+- Self-test function to verify ability to open/populate/read/delete a test database
+- Read BLOB as Base-64 DISABLED in Android version (was already disabled for iOS)
+
 ## cordova-sqlcipher-adapter 0.1.7
 
 - Fix Windows build
@@ -42,7 +205,6 @@
 
 ### cordova-sqlite-storage 0.8.2
 
-- Workaround fix for empty readTransaction issue (litehelpers/Cordova-sqlite-storage#409)
 - Split spec/www/spec/legacy.js into db-open-close-delete-test.js & tx-extended.js
 
 ### cordova-sqlite-storage 0.8.0
@@ -63,6 +225,20 @@
 - Android version with sqlite `3.8.10.2` embedded (with error messages fixed)
 - Pre-populated database support removed from this version branch
 - Amazon Fire-OS support removed
+- Fix conversion warnings in iOS version
+
+### cordova-sqlite-storage 0.7.12
+
+- Fix to Windows "Universal" version to support big integers
+- Implement database close and delete operations for Windows "Universal"
+- Fix readTransaction to skip BEGIN/COMMIT/ROLLBACK
+
+### cordova-sqlite-storage 0.7.11
+
+- Fix plugin ID in plugin.xml to match npm package ID
+- Unpacked sqlite-native-driver.so libraries from jar
+- Fix conversion of INTEGER type (iOS version)
+- Disable code to read BLOB as Base-64 (iOS version) due to https://issues.apache.org/jira/browse/CB-9638
 
 ## cordova-sqlcipher-adapter 0.1.4-rc
 

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -0,0 +1,21 @@
+## Bugs and other issues
+
+- Verify the results of calling the echoTest and selfTest functions as described in README.md
+- Check the pitfalls and other troubleshooting steps in README.md and [brodybits / Avoiding-some-Cordova-pitfalls](https://github.com/brodybits/Avoiding-some-Cordova-pitfalls)
+- Reproduce the issue in a fresh, clean project, ideally based on [brodybits / Cordova-sqlite-bootstrap-test](https://github.com/brodybits/Cordova-sqlite-bootstrap-test)
+
+Please see README.md for more details.
+
+## Contributing patches
+
+- Patches with bug fixes are helpful, especially when submitted with test code.
+- Other enhancements are welcome for consideration, when submitted with test code and are working for all supported platforms. Increase of complexity should be avoided.
+- All contributions may be reused by [@brodybits](https://github.com/brodybits) under another license in the future. Efforts will be taken to give credit for major contributions but it will not be guaranteed.
+- Project restructuring, i.e. moving files and/or directories around, should be avoided if possible.
+
+Please see README.md for more details.
+
+## Other
+
+- Testimonials of apps that are using this plugin would be especially helpful.
+- Reporting issues can help improve the quality of this plugin.
diff --git a/HISTORY.md b/HISTORY.md
@@ -115,21 +115,25 @@ Other major changes by @brodybits in 2015:
 - Introduction of other version projects:
   - Cordova-sqlcipher-adapter
   - cordova-sqlite-ext with REGEXP and pre-populated database support
-  - Cordova-sqlite-enterprise-free with memory fix and other enhancements,
+  - Enterprise version with memory fix and other enhancements,
     available under GPL or commercial licensing options
 - react-native-sqlite-storage version for Android and iOS developed and maintained
   by @andpor (Andrzej Porebski <[email protected]>), based on this project
 
 ## Major changes 2016
 
-Features removed from main version branch, available in cordova-sqlite-ext and Cordova-sqlite-legacy versions:
-- Windows version removed from this version branch
-- Android-sqlite-connector (NDK) support removed from this version branch
-
 New features:
 - Echo self-test function
 - Simple sql batch query interface
 
+Installation changes
+- Use of `before_plugin_install` hook to install external dependencies
+
+New versions introduced
+- Cordova-sqlite-evcore-extbuild-free with major performance and memory fixes for Android,
+  available under GPL or commercial licensing options with support for PhoneGap Build
+- Cordova-sqlite-evplus (legacy) versions with GPL or premium commercial licensing options
+
 ## Recent changes
 
 See CHANGES.md
diff --git a/LICENSE.md b/LICENSE.md
@@ -8,13 +8,15 @@ MIT or Apache 2.0
 
 MIT or Apache 2.0
 
-## iOS version
+## iOS/macOS version
 
 MIT only
 
 based on Phonegap-SQLitePlugin by @davibe (Davide Bertola <[email protected]>) and @joenoon (Joe Noon <[email protected]>)
 
-## Windows (8.1) version
+includes and uses PSPDFThreadSafeMutableDictionary (PSPDFThreadSafeMutableDictionary.m <https://gist.github.com/steipete/5928916>) MIT license by @steipete (<https://gist.github.com/steipete>)
+
+## Windows version
 
 MIT or Apache 2.0
 
@@ -24,3 +26,6 @@ by @doo (doo GmbH)
 
 MIT License
 
+## SQLite3
+
+Public domain