From b721f937760de5299f8daf02bfeceda3d9fe7d0a Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Fri, 26 Feb 2010 18:13:57 -0800 Subject: 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.) --- sql/src/test/java/tests/SQLite/DatabaseTest.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'sql/src/test/java/tests/SQLite/DatabaseTest.java') diff --git a/sql/src/test/java/tests/SQLite/DatabaseTest.java b/sql/src/test/java/tests/SQLite/DatabaseTest.java index 95ce7c8..12a556d 100644 --- a/sql/src/test/java/tests/SQLite/DatabaseTest.java +++ b/sql/src/test/java/tests/SQLite/DatabaseTest.java @@ -1069,7 +1069,7 @@ public class DatabaseTest extends SQLiteTest { db.exec("insert into TEST values(4, 'Fiona', 'Apple'); ", null); db.trace((Trace) t); db.create_aggregate("myaggfunc", 1, aggFunction); - db.function_type("myaggfunc", Constants.SQLITE_TEXT); + db.function_type("myaggfunc", Constants.SQLITE3_TEXT); db.exec("PRAGMA show_datatypes = on", null); assertFalse(aggFunction.functionCalled); @@ -1125,7 +1125,7 @@ public class DatabaseTest extends SQLiteTest { null); db.create_function("sin", 1, sinFunc); - db.function_type("sin", Constants.SQLITE_NUMERIC); + db.function_type("sin", Constants.SQLITE_FLOAT); res = db.get_table("select sin(res) from TEST WHERE res = " + Double.toString(input)); @@ -2036,4 +2036,3 @@ public class DatabaseTest extends SQLiteTest { } } - -- cgit v1.1