summaryrefslogtreecommitdiffstats
path: root/sqlite-jdbc/src
Commit message (Collapse)AuthorAgeFilesLines
* Remove sqlite-jdbc sources that moved to external/javasqliteBrian Carlstrom2011-03-1729-14702/+0
| | | | Change-Id: I1782aa53b05b959100c9fe3a55a718121e3b0f58
* Update us to the 2010-07-27 release of the sqlite JDBC driver.Elliott Hughes2010-09-266-8/+594
| | | | | | | | | | | | | | I've added the Backup and Profile classes, even though we don't need them, to minimize our differences from upstream (since these are referenced by classes that we do use, and from JNI). I'm still keeping out the separate little programs that live in the same package. I'm sending our performance changes upstream (we've switched to Java 6 JDBC since last time, so we need the changes in the JDBC2z near-duplicates; Android only ships the single version it needs). Bug: 3003930 Change-Id: Ia34a622e881e2a222f844130a1ac311eeded4a46
* fix testSetQueryTimeout test by fixing SQLite JDBC driver in a few ways to ↵Jeremy Sharpe2010-06-041-6/+16
| | | | | | | | | | | conform to the spec. There's some other goofy stuff there, like unlimited timeouts, for instance, don't seem to be implemented at all. Also enhance the test to more completely cover the different failure cases. Change-Id: I4f4f1074c6673011039f3d0f8a07d8c753c825d7
* Update sqlite java 6 driver to coincide with changes made upstream.Jeremy Sharpe2010-06-024-84/+93
| | | | | | | | | | | Some of these changes are kind of arbitrary, but where it didn't matter I went with the upstream version to make future merges easier. Changes NOT made upstream are still marked with android-changed, but I updated the rest of them. Tried to fix whitespace as much as possible. Tell me if I missed any. Change-Id: I3396bd26d2cc00306b3867cea49d100430691bd1
* Implement Java 6 SQL API. Javadoc is still messy and some unit testsJeremy Sharpe2010-05-259-95/+704
| | | | | | need to be updated to reflect newly implemented parts of the API. Change-Id: Icee718ef997d29aa08fc78b101f87532dc89167f
* resolved conflicts for merge of dd53c703 to dalvik-devElliott Hughes2010-04-051-5/+1
| | | | Change-Id: Ia95af76e2995ce7fb0778b020baf2882a8b0a3dd
* Fix all instances of "new Integer" (et cetera).Elliott Hughes2010-03-112-13/+12
| | | | | | (This doesn't include libcore/xml/ because I don't want to get in the way there.) Change-Id: I46f638105d26e82d09128fca605117322229e146
* Add a missing android-changed marker, fix a half-finished one.Elliott Hughes2010-03-012-1/+3
|
* Use more efficient idioms for converting types.Elliott Hughes2010-03-013-7/+6
| | | | | (Because we only include the Java 5 JDBC driver, there was less to fix than I thought; this code is copy & pasted into the other drivers.)
* Upgrade our sqlite JDBC driver to version 20100131.Elliott Hughes2010-02-2621-3732/+4995
| | | | | | | | | | | | | | | | | | | | This fixes a bunch of KnownFailures, and adds a bunch of new features. I've updated the tests correspondingly (though doubtless we could add a lot more tests now, if we wanted to). I regenerated Constants.java manually, and explained how in its javadoc. I've added the upstream VERSION file so it's easier to see what upstream version we're at. (Constants now contains the version number too, but that's less obvious.) All our changes now have android-changed markers. I'll see about getting them pushed upstream next week. (This change best reviewed with "ignore whitespace". It looks like we made a bunch of whitespace "corrections" when we imported this source, which just makes it harder to stay in sync. I've taken the upstream copies of files that only had whitespace differences.)
* Break the sqlite JDBC driver out from our JDBC implementation.Elliott Hughes2010-02-2627-0/+12229
The JDBC driver is from a different source (http://www.ch-werner.de/javasqlite/overview-summary.html) and is only really needed for testing. Bug 2468870 asks that we don't eagerly register the native methods for these classes. That bug is fixed by this change. Bug 2198667 asks that we stop shipping this JDBC driver as part of the base system. That bug is not addressed by this change: the classes and native code are now in their own, separate, .jar and .so files -- so they'll be easier to remove in future -- but for now those files are still in /system/framework and /system/lib respectively. Bug: 2468870 Bug: 2198667