diff --git a/AUTHORS.md b/AUTHORS.md index 7316b4b7..609aa558 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -19,11 +19,11 @@ - Original authors: @davibe (Davide Bertola ) and @joenoon (Joe Noon ) - Cordova 2.7+ port with background processing by @j3k0 (Jean-Christophe Hoelt ) -- Embedded public domain LIBB64 encoding routines from http://libb64.sourceforge.net by @tbbdeveloper (Chris Robertson ) - Maintained by @brodybits (Chris Brody) -## WP(8) version +## WP(7/8) version - Original author: @marcucio (Mike Arcucio ) - Enhancements for background processing & improved transaction support by @Gillardo (Darren Gillard ) - DB threading and open/close/delete fixes by Mark Oppenheim +- Uses csharp-sqlite library by Noah Hart and others (MIT license) diff --git a/LICENSE.md b/LICENSE.md index 304115c7..a1d001b5 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -8,40 +8,30 @@ MIT or Apache 2.0 MIT or Apache 2.0 -- Extracted from DroidGap by @brodybits (Chris Brody) -- Transaction batch processing of Android version by @marcucio -- Maintained by @brodybits (Chris Brody) - ## iOS version MIT only -## WP version +## WP(7/8) version MIT or Apache 2.0 -## DLLs for WP version - -### Newtonsoft.Json.dll: Json.NET - -MIT License - -Copyright (c) 2007 James Newton-King +## Class lib(s) used by WP(7/8) version -### SQLiteWPNative.DLL: C#-SQLite +### C#-SQLite -MIT License + MIT License -C#-SQLite is an independent reimplementation of the SQLite software library. -SQLite® is a registered trademark of Hipp, Wyrick & Company, Inc. + C#-SQLite is an independent reimplementation of the SQLite software library. + SQLite® is a registered trademark of Hipp, Wyrick & Company, Inc. -The overall C#-SQLite package is distributed under the terms of the MIT License, given below. Some parts are distributed under more permissive licenses, see individual source files for details. + The overall C#-SQLite package is distributed under the terms of the MIT License, given below. Some parts are distributed under more permissive licenses, see individual source files for details. -Copyright (c) 2009-2012 Noah Hart and others, see individual source files for details. + Copyright (c) 2009-2012 Noah Hart and others, see individual source files for details. -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/README.md b/README.md index 9e3f9868..5c4d4a98 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ # Cordova/PhoneGap SQLitePlugin -Native interface to sqlite in a Cordova/PhoneGap plugin for Android/iOS/WP(8), with API similar to HTML5/[Web SQL API](http://www.w3.org/TR/webdatabase/). +Native interface to sqlite in a Cordova/PhoneGap plugin for Android/iOS/WP(7/8), with API similar to HTML5/[Web SQL API](http://www.w3.org/TR/webdatabase/). -License for Android & WP(8) versions: MIT or Apache 2.0 +License for Android & WP(7/8) versions: MIT or Apache 2.0 License for iOS version: MIT only @@ -47,11 +47,11 @@ TBD - The sqlite plugin will not work before the callback for the "deviceready" event has been fired, as described in **Usage**. - The Android version cannot work with more than 100 open db files due to its threading model. - UNICODE line separator (`\u2028`) is currently not supported and known to be broken in iOS version. -- UNICODE characters not working with WP(8) version +- UNICODE characters not working with WP(7/8) version ## Limited support (testing needed) -- Multi-page apps on WP(8) +- Multi-page apps on WP(7/8) - DB Triggers (as described above - known to be broken for Android) ## Other versions and related projects @@ -131,7 +131,7 @@ db = sqlitePlugin.openDatabase({name: "my.db", location: 2, createFromLocation: ## Background processing The threading model depends on which version is used: -- For Android & WP(8), one background thread per db; +- For Android & WP(7/8), one background thread per db; - for iOS, background processing using a thread pool. # Sample with PRAGMA feature @@ -246,7 +246,7 @@ You can find more details at [this writeup](http://iphonedevlog.wordpress.com/20 - `SQLitePlugin.coffee.md`: platform-independent (Literate coffee-script, can be read by recent coffee-script compiler) - `www`: `SQLitePlugin.js` now platform-independent -- `src`: Java plugin code for Android; Objective-C plugin code for iOS; C-sharp code & DLLs for WP(8) +- `src`: Java plugin code for Android; Objective-C plugin code for iOS; C-sharp code & DLLs for WP(7/8) - `test-www`: simple testing in `index.html` using qunit 1.5.0 - `Lawnchair-adapter`: Lawnchair adaptor, based on the version from the Lawnchair repository, with the basic Lawnchair test suite in `test-www` subdirectory @@ -329,7 +329,7 @@ Enable the SQLitePlugin in `config.xml` (Cordova/PhoneGap 2.x): ``` -## Manual installation - WP(8) version +## Manual installation - WP(7/8) version TODO @@ -491,7 +491,7 @@ The adapter is now part of [PouchDB](http://pouchdb.com/) thanks to [@nolanlawso ## Major branches - `common-src` - source for Android & iOS versions -- `master-src` - source for Android, iOS, & WP(8) versions +- `wp-src` - source for Android, iOS, & WP(7/8) versions - `master-rc` - pre-release version, including source for CSharp-SQLite library classes - `master` - version for release, will be included in PhoneGap build.