Changeset 3590 for XerialJ/trunk/sqlite-jdbc

Timestamp:

09/16/09 11:32:01 (3 years ago)

Author:

leo

Message:

 

Location:

XerialJ/trunk/sqlite-jdbc

Files:

• sqlitejdbc/Makefile.nested (modified) (1 diff)
• src/test/java/org/sqlite/ExtensionTest.java (modified) (2 diffs)

XerialJ/trunk/sqlite-jdbc/sqlitejdbc/Makefile.nested

@@ -55 +55 @@
         # 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 \

XerialJ/trunk/sqlite-jdbc/src/test/java/org/sqlite/ExtensionTest.java

@@ -41 +41 @@
     @Test
     public void extFTS3() throws Exception {
-        if (!SQLiteJDBCLoader.isNativeMode())
-            return;
 
         stat.execute("create virtual table recipe using fts3(name, ingredients)");
@@ -59 +57 @@
     @Test
     public void extFunctions() throws Exception {
-        if (!SQLiteJDBCLoader.isNativeMode())
-            return;
 
         {