| 5cd52ed8fd9244cbbb9c2553e58b511344f75d8b |
27-Sep-2010 |
Elliott Hughes <enh@google.com> |
Update us to the 2010-07-27 release of the sqlite JDBC driver.
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
ava/SQLite/Backup.java
ava/SQLite/Blob.java
ava/SQLite/Database.java
ava/SQLite/Profile.java
ava/SQLite/Stmt.java
ative/sqlite_jni.c
|
| 1eb14211d55adc833f0826ae7e96ff5478e7e3e6 |
04-Jun-2010 |
Jeremy Sharpe <jsharpe@google.com> |
fix testSetQueryTimeout test by fixing SQLite JDBC driver in a few ways to 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
ava/SQLite/JDBC2z/JDBCStatement.java
|
| 4538aff6d563d32cd1c5d2f7b349809384a0a540 |
29-May-2010 |
Jeremy Sharpe <jsharpe@google.com> |
Update sqlite java 6 driver to coincide with changes made upstream.
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
ava/SQLite/JDBC2z/JDBCDatabaseMetaData.java
ava/SQLite/JDBC2z/JDBCResultSet.java
ava/SQLite/JDBC2z/JDBCStatement.java
ative/sqlite_jni.c
|
| 17c83b1a74c906c9a36257a3a99cd1e3730b002e |
14-May-2010 |
Jeremy Sharpe <jsharpe@google.com> |
Implement Java 6 SQL API. Javadoc is still messy and some unit tests
need to be updated to reflect newly implemented parts of the API.
Change-Id: Icee718ef997d29aa08fc78b101f87532dc89167f
ava/SQLite/Database.java
ava/SQLite/JDBC2y/JDBCConnection.java
ava/SQLite/JDBC2y/JDBCDatabaseMetaData.java
ava/SQLite/JDBC2y/JDBCPreparedStatement.java
ava/SQLite/JDBC2y/JDBCResultSet.java
ava/SQLite/JDBC2y/JDBCResultSetMetaData.java
ava/SQLite/JDBC2y/JDBCStatement.java
ava/SQLite/JDBC2y/TableResultX.java
ava/SQLite/JDBC2z/JDBCConnection.java
ava/SQLite/JDBC2z/JDBCDatabaseMetaData.java
ava/SQLite/JDBC2z/JDBCPreparedStatement.java
ava/SQLite/JDBC2z/JDBCResultSet.java
ava/SQLite/JDBC2z/JDBCResultSetMetaData.java
ava/SQLite/JDBC2z/JDBCStatement.java
ava/SQLite/JDBC2z/TableResultX.java
ava/SQLite/Stmt.java
|
| 3a98daba3b693e2548d0a86c5f0ab606d2dce6f7 |
06-Apr-2010 |
Elliott Hughes <enh@google.com> |
resolved conflicts for merge of dd53c703 to dalvik-dev
Change-Id: Ia95af76e2995ce7fb0778b020baf2882a8b0a3dd
|
| b0164f69fd6c6b76b72c28c0bf0b876028515c04 |
12-Mar-2010 |
Elliott Hughes <enh@google.com> |
Fix all instances of "new Integer" (et cetera).
(This doesn't include libcore/xml/ because I don't want to get in the way there.)
Change-Id: I46f638105d26e82d09128fca605117322229e146
ava/SQLite/JDBC2y/JDBCDatabaseMetaData.java
ava/SQLite/Stmt.java
|
| dbc5b9d33658beb35fcf1b3389d34e00d43058e2 |
01-Mar-2010 |
Elliott Hughes <enh@google.com> |
Add a missing android-changed marker, fix a half-finished one.
ava/SQLite/JDBC2y/JDBCDatabaseMetaData.java
ava/SQLite/JDBC2y/JDBCStatement.java
|
| 885023a4cd04a95372ea38bf92516039666d67d7 |
01-Mar-2010 |
Elliott Hughes <enh@google.com> |
Use more efficient idioms for converting types.
(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.)
ava/SQLite/Database.java
ava/SQLite/JDBC2y/JDBCDatabaseMetaData.java
ava/SQLite/JDBC2y/JDBCResultSet.java
|
| 7a647e8547e57ca573541be55b3728ef7ce376fe |
27-Feb-2010 |
Elliott Hughes <enh@google.com> |
Upgrade our sqlite JDBC driver to version 20100131.
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.)
ava/SQLite/Authorizer.java
ava/SQLite/Blob.java
ava/SQLite/Constants.java
ava/SQLite/Database.java
ava/SQLite/Exception.java
ava/SQLite/FunctionContext.java
ava/SQLite/JDBC2y/JDBCConnection.java
ava/SQLite/JDBC2y/JDBCDatabaseMetaData.java
ava/SQLite/JDBC2y/JDBCPreparedStatement.java
ava/SQLite/JDBC2y/JDBCResultSet.java
ava/SQLite/JDBC2y/JDBCResultSetMetaData.java
ava/SQLite/JDBC2y/JDBCStatement.java
ava/SQLite/JDBC2y/TableResultX.java
ava/SQLite/JDBCDriver.java
ava/SQLite/Shell.java
ava/SQLite/Stmt.java
ava/SQLite/StringEncoder.java
ava/SQLite/TableResult.java
ava/SQLite/Vm.java
ative/sqlite_jni.c
ative/sqlite_jni_defs.h
|
| 417deb1db112103aff04231b6ca79772ff7d3a21 |
26-Feb-2010 |
Elliott Hughes <enh@google.com> |
Break the sqlite JDBC driver out from our JDBC implementation.
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
ava/SQLite/Authorizer.java
ava/SQLite/Blob.java
ava/SQLite/BusyHandler.java
ava/SQLite/Callback.java
ava/SQLite/Constants.java
ava/SQLite/Database.java
ava/SQLite/Exception.java
ava/SQLite/Function.java
ava/SQLite/FunctionContext.java
ava/SQLite/JDBC2y/JDBCConnection.java
ava/SQLite/JDBC2y/JDBCDatabaseMetaData.java
ava/SQLite/JDBC2y/JDBCPreparedStatement.java
ava/SQLite/JDBC2y/JDBCResultSet.java
ava/SQLite/JDBC2y/JDBCResultSetMetaData.java
ava/SQLite/JDBC2y/JDBCStatement.java
ava/SQLite/JDBC2y/TableResultX.java
ava/SQLite/JDBCDriver.java
ava/SQLite/ProgressHandler.java
ava/SQLite/Shell.java
ava/SQLite/Stmt.java
ava/SQLite/StringEncoder.java
ava/SQLite/TableResult.java
ava/SQLite/Trace.java
ava/SQLite/Vm.java
ative/sqlite_jni.c
ative/sqlite_jni.h
ative/sqlite_jni_defs.h
|