summaryrefslogtreecommitdiffstats
path: root/sql/src/main/java
Commit message (Collapse)AuthorAgeFilesLines
* merge more modules into luniPeter Hallam2010-04-2743-14924/+0
|
* Remove "Messages" from the nio, prefs, sql, text, and x-net modules.Elliott Hughes2010-04-145-264/+42
| | | | | | | | | | Also remove an file of unused messages from luni, and inline one of luni's other files. (There are plenty more.) Also remove some German translations of bouncycastle messages (that are actually in English anyway). Change-Id: I9c565f6f2201a5d877eba5bf0af4ffad7b769984
* Remove all remaining "@since Android" tags.Elliott Hughes2010-03-221-2/+1
| | | | | | | I've fixed a few typos, and removed a few of the more egregiously nonsensical or incorrect comments that were nearby. Change-Id: I35851baebd532f949cc269f4738a26eeb9b6e697
* am a6d228d4: Merge "Minor documentation improvements."Elliott Hughes2010-03-091-7/+9
|\ | | | | | | | | | | | | Merge commit 'a6d228d44153ea2ee831eba1d41cd363989cdf7e' into dalvik-dev * commit 'a6d228d44153ea2ee831eba1d41cd363989cdf7e': Minor documentation improvements.
| * Minor documentation improvements.Elliott Hughes2010-03-091-7/+9
| | | | | | | | | | | | | | | | Based on user-submitted bugs that were just misunderstandings, plus implementation bugs caused by the intended behavior being somewhat subtle. Change-Id: Ic2606b5e57dadc95a35c2d0a977c01434a2fa28a
* | Break the sqlite JDBC driver out from our JDBC implementation.Elliott Hughes2010-02-2624-7129/+0
|/ | | | | | | | | | | | | | | | | | 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
* Update sql to Harmony 802921.Jesse Wilson2009-08-2643-1462/+288
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Notable changes - ConnectionEvent field changed for serialization - Date toString classes no longer use SimpleDateFormat - Timestamp doesn't call through an overridable method in its constructor - Timestamp now checks the String passed to valueOf() using a regex - Properties now specifies a buffer size to avoid a user-inescapable warning Squashed commit of the following: commit dd9926cddda4db0227adbc174070791e5a9afa72 Merge: 8be3b27 4bed1fc Author: Jesse Wilson <jessewilson@google.com> Date: Wed Aug 12 10:34:56 2009 -0700 Merge branch 'sql_802921' into sql_dalvik Conflicts: libcore/sql/.classpath libcore/sql/META-INF/MANIFEST.MF libcore/sql/build.xml libcore/sql/src/main/java/java/sql/Array.java libcore/sql/src/main/java/java/sql/BatchUpdateException.java libcore/sql/src/main/java/java/sql/Blob.java libcore/sql/src/main/java/java/sql/CallableStatement.java libcore/sql/src/main/java/java/sql/Clob.java libcore/sql/src/main/java/java/sql/Connection.java libcore/sql/src/main/java/java/sql/DataTruncation.java libcore/sql/src/main/java/java/sql/DatabaseMetaData.java libcore/sql/src/main/java/java/sql/Date.java libcore/sql/src/main/java/java/sql/Driver.java libcore/sql/src/main/java/java/sql/DriverManager.java libcore/sql/src/main/java/java/sql/DriverPropertyInfo.java libcore/sql/src/main/java/java/sql/ParameterMetaData.java libcore/sql/src/main/java/java/sql/PreparedStatement.java libcore/sql/src/main/java/java/sql/Ref.java libcore/sql/src/main/java/java/sql/ResultSet.java libcore/sql/src/main/java/java/sql/ResultSetMetaData.java libcore/sql/src/main/java/java/sql/SQLData.java libcore/sql/src/main/java/java/sql/SQLException.java libcore/sql/src/main/java/java/sql/SQLInput.java libcore/sql/src/main/java/java/sql/SQLOutput.java libcore/sql/src/main/java/java/sql/SQLPermission.java libcore/sql/src/main/java/java/sql/SQLWarning.java libcore/sql/src/main/java/java/sql/Savepoint.java libcore/sql/src/main/java/java/sql/Statement.java libcore/sql/src/main/java/java/sql/Struct.java libcore/sql/src/main/java/java/sql/Time.java libcore/sql/src/main/java/java/sql/Timestamp.java libcore/sql/src/main/java/java/sql/Types.java libcore/sql/src/main/java/javax/sql/ConnectionEvent.java libcore/sql/src/main/java/javax/sql/ConnectionEventListener.java libcore/sql/src/main/java/javax/sql/ConnectionPoolDataSource.java libcore/sql/src/main/java/javax/sql/DataSource.java libcore/sql/src/main/java/javax/sql/PooledConnection.java libcore/sql/src/main/java/javax/sql/RowSet.java libcore/sql/src/main/java/javax/sql/RowSetEvent.java libcore/sql/src/main/java/javax/sql/RowSetInternal.java libcore/sql/src/main/java/javax/sql/RowSetListener.java libcore/sql/src/main/java/javax/sql/RowSetMetaData.java libcore/sql/src/main/java/javax/sql/RowSetReader.java libcore/sql/src/main/java/javax/sql/RowSetWriter.java libcore/sql/src/main/java/javax/sql/rowset/BaseRowSet.java libcore/sql/src/main/java/javax/sql/rowset/WebRowSet.java libcore/sql/src/main/java/javax/sql/rowset/serial/SerialClob.java libcore/sql/src/main/java/javax/sql/rowset/serial/SerialDatalink.java libcore/sql/src/main/java/javax/sql/rowset/serial/SerialException.java libcore/sql/src/main/java/javax/sql/rowset/serial/SerialJavaObject.java libcore/sql/src/main/java/javax/sql/rowset/serial/SerialRef.java libcore/sql/src/main/java/javax/sql/rowset/serial/SerialStruct.java libcore/sql/src/main/java/javax/sql/rowset/spi/SyncFactory.java libcore/sql/src/main/java/javax/sql/rowset/spi/SyncProvider.java libcore/sql/src/main/java/javax/transaction/xa/XAException.java libcore/sql/src/main/java/org/apache/harmony/sql/internal/nls/Messages.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/BatchUpdateExceptionTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/ConnectionTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/DataTruncationTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/DatabaseMetaDataTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/DateTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/DriverManagerTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/DriverPropertyInfoTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/ParameterMetaDataTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/ResultSetMetaDataTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/ResultSetTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/SQLExceptionTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/SQLPermissionTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/SQLWarningTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/StatementTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_ClassLoader.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_DriverManager.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TimeTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TimestampTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TypesTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/ConnectionEventTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/rowset/BaseRowSetTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/rowset/serial/SerialClobTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/rowset/serial/SerialExceptionTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/rowset/serial/SerialJavaObjectTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/rowset/serial/SerialRefTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/rowset/serial/SerialStructTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/javax/transaction/InvalidTransactionExceptionTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/javax/transaction/TransactionRequiredExceptionTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/javax/transaction/TransactionRolledbackExceptionTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/javax/transaction/xa/XAExceptionTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/javax/transaction/xa/XAResourceTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/javax/transaction/xa/XidTest.java commit 8be3b27082122a5c5b650ad5aad6a70b45fd58d4 Author: Jesse Wilson <jessewilson@google.com> Date: Wed Aug 12 09:39:01 2009 -0700 Dalvik SQL commit 4bed1fc3972b50198299137dc152d46dd9d5d532 Author: Jesse Wilson <jessewilson@google.com> Date: Wed Aug 12 09:38:11 2009 -0700 SQL 802921 commit 82f57ed5049955585aecfae659310b6bde3354d8 Author: Jesse Wilson <jessewilson@google.com> Date: Wed Aug 12 09:36:42 2009 -0700 SQL 527399
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-0369-0/+23448
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-0369-23448/+0
|
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-1744-5161/+6987
|
* Initial ContributionThe Android Open Source Project2008-10-2169-0/+21622