git-svn-id: http://www.xerial.org/svn/project/XerialJ/trunk/sqlite-jdbc@3590 ae02f08e...

diff --git a/sqlitejdbc/Makefile.nested b/sqlitejdbc/Makefile.nested
index e3313c7..47fcbe9 100644 (file)
--- a/sqlitejdbc/Makefile.nested
+++ b/sqlitejdbc/Makefile.nested
@@ -54,7 +54,9 @@ build/SQLite.mips: $(nestedvm)/Makefile $(nestedvm)/env.sh dl/$(sqlite)-amal.zip
        echo 'int main() { return 0; }' >> build/$(sqlite)-nestedvm/sqlite3.c
        # remove utimes
        perl -npe '$$_ =~ s/utimes.*//g;' -i build/$(sqlite)-nestedvm/sqlite3.c 
-
+       # insert a code for loading extension functions
+       perl -pi -e "s/^opendb_out:/  if(!db->mallocFailed && rc==SQLITE_OK){ rc = RegisterExtensionFunctions(db); }\nopendb_out:/;" \
+           build/$(sqlite)-nestedvm/sqlite3.c
        (. ./$(nestedvm)/env.sh; cd build/$(sqlite)-nestedvm; \
        $$CC -c $$CFLAGS -I. -o sqlite3.o \
            -DSQLITE_THREADSAFE=0 \

diff --git a/src/test/java/org/sqlite/ExtensionTest.java b/src/test/java/org/sqlite/ExtensionTest.java
index 6eaee8d..2878bae 100644 (file)
--- a/src/test/java/org/sqlite/ExtensionTest.java
+++ b/src/test/java/org/sqlite/ExtensionTest.java
@@ -40,8 +40,6 @@ public class ExtensionTest {
 \r
     @Test\r
     public void extFTS3() throws Exception {\r
-        if (!SQLiteJDBCLoader.isNativeMode())\r
-            return;\r
 \r
         stat.execute("create virtual table recipe using fts3(name, ingredients)");\r
         stat\r
@@ -58,8 +56,6 @@ public class ExtensionTest {
 \r
     @Test\r
     public void extFunctions() throws Exception {\r
-        if (!SQLiteJDBCLoader.isNativeMode())\r
-            return;\r
 \r
         {\r
             ResultSet rs = stat.executeQuery("select cos(radians(45))");\r